diff options
32 files changed, 1238 insertions, 201 deletions
| diff --git a/tex/context/base/mkii/cont-new.mkii b/tex/context/base/mkii/cont-new.mkii index 3729922c6..feec73f69 100644 --- a/tex/context/base/mkii/cont-new.mkii +++ b/tex/context/base/mkii/cont-new.mkii @@ -11,7 +11,7 @@  %C therefore copyrighted by \PRAGMA. See mreadme.pdf for  %C details. -\newcontextversion{2020.07.24 15:15} +\newcontextversion{2020.07.27 16:21}  %D This file is loaded at runtime, thereby providing an  %D excellent place for hacks, patches, extensions and new diff --git a/tex/context/base/mkii/context.mkii b/tex/context/base/mkii/context.mkii index 5c4c39b74..6e12a920d 100644 --- a/tex/context/base/mkii/context.mkii +++ b/tex/context/base/mkii/context.mkii @@ -20,7 +20,7 @@  %D your styles an modules.  \edef\contextformat {\jobname} -\edef\contextversion{2020.07.24 15:15} +\edef\contextversion{2020.07.27 16:21}  %D For those who want to use this: diff --git a/tex/context/base/mkii/mult-en.mkii b/tex/context/base/mkii/mult-en.mkii index 7737ae311..2c31fc95a 100644 --- a/tex/context/base/mkii/mult-en.mkii +++ b/tex/context/base/mkii/mult-en.mkii @@ -128,6 +128,9 @@  \setinterfacevariable{camel}{camel}  \setinterfacevariable{cap}{cap}  \setinterfacevariable{capital}{capital} +\setinterfacevariable{category}{category} +\setinterfacevariable{cd:character}{cd:character} +\setinterfacevariable{cd:font}{cd:font}  \setinterfacevariable{center}{center}  \setinterfacevariable{centerlast}{centerlast}  \setinterfacevariable{chapter}{chapter} @@ -186,6 +189,7 @@  \setinterfacevariable{external}{external}  \setinterfacevariable{extremestretch}{extremestretch}  \setinterfacevariable{fact}{fact} +\setinterfacevariable{fallback}{fallback}  \setinterfacevariable{february}{february}  \setinterfacevariable{field}{field}  \setinterfacevariable{figure}{figure} @@ -207,6 +211,7 @@  \setinterfacevariable{flushouter}{flushouter}  \setinterfacevariable{flushright}{flushright}  \setinterfacevariable{followingpage}{followingpage} +\setinterfacevariable{font}{font}  \setinterfacevariable{footer}{footer}  \setinterfacevariable{footnote}{footnote}  \setinterfacevariable{force}{force} @@ -804,8 +809,10 @@  \setinterfaceconstant{extras}{extras}  \setinterfaceconstant{factor}{factor}  \setinterfaceconstant{fallback}{fallback} +\setinterfaceconstant{fallbacks}{fallbacks}  \setinterfaceconstant{family}{family}  \setinterfaceconstant{features}{features} +\setinterfaceconstant{featureset}{featureset}  \setinterfaceconstant{fences}{fences}  \setinterfaceconstant{field}{field}  \setinterfaceconstant{fieldbackgroundcolor}{fieldbackgroundcolor} @@ -826,6 +833,7 @@  \setinterfaceconstant{focusin}{focusin}  \setinterfaceconstant{focusoffset}{focusoffset}  \setinterfaceconstant{focusout}{focusout} +\setinterfaceconstant{font}{font}  \setinterfaceconstant{footer}{footer}  \setinterfaceconstant{footerdistance}{footerdistance}  \setinterfaceconstant{footerstate}{footerstate} @@ -880,6 +888,7 @@  \setinterfaceconstant{increment}{increment}  \setinterfaceconstant{incrementnumber}{incrementnumber}  \setinterfaceconstant{indenting}{indenting} +\setinterfaceconstant{indentlist}{indentlist}  \setinterfaceconstant{indentnext}{indentnext}  \setinterfaceconstant{index}{index}  \setinterfaceconstant{indicator}{indicator} @@ -1084,6 +1093,7 @@  \setinterfaceconstant{period}{period}  \setinterfaceconstant{place}{place}  \setinterfaceconstant{placehead}{placehead} +\setinterfaceconstant{placeholder}{placeholder}  \setinterfaceconstant{placestopper}{placestopper}  \setinterfaceconstant{position}{position}  \setinterfaceconstant{prefix}{prefix} @@ -1367,8 +1377,18 @@  \setinterfacecommand{Word}{Word}  \setinterfacecommand{Words}{Words}  \setinterfacecommand{about}{about} +\setinterfacecommand{adaptfontfeature}{adaptfontfeature}  \setinterfacecommand{adaptlayout}{adaptlayout} +\setinterfacecommand{addfeature}{addfeature} +\setinterfacecommand{alignbottom}{alignbottom} +\setinterfacecommand{aligned}{aligned} +\setinterfacecommand{alignedbox}{alignedbox} +\setinterfacecommand{alignedline}{alignedline} +\setinterfacecommand{alignhere}{alignhere}  \setinterfacecommand{alignment}{alignment} +\setinterfacecommand{alignmentcharacter}{alignmentcharacter} +\setinterfacecommand{applytocharacters}{applytocharacters} +\setinterfacecommand{applytofirstcharacter}{applytofirstcharacter}  \setinterfacecommand{arg}{arg}  \setinterfacecommand{at}{at}  \setinterfacecommand{atleftmargin}{atleftmargin} @@ -1380,9 +1400,13 @@  \setinterfacecommand{blackrules}{blackrules}  \setinterfacecommand{blank}{blank}  \setinterfacecommand{bookmark}{bookmark} +\setinterfacecommand{bottombox}{bottombox}  \setinterfacecommand{bottomdistance}{bottomdistance}  \setinterfacecommand{bottomheight}{bottomheight} +\setinterfacecommand{bottomleftbox}{bottomleftbox} +\setinterfacecommand{bottomrightbox}{bottomrightbox}  \setinterfacecommand{bottomspace}{bottomspace} +\setinterfacecommand{buildtextbottomdot}{buildtextbottomdot}  \setinterfacecommand{but}{but}  \setinterfacecommand{button}{button}  \setinterfacecommand{bypassblocks}{bypassblocks} @@ -1421,8 +1445,11 @@  \setinterfacecommand{defineblock}{defineblock}  \setinterfacecommand{definebodyfont}{definebodyfont}  \setinterfacecommand{definebodyfontenvironment}{definebodyfontenvironment} +\setinterfacecommand{definebodyfontswitch}{definebodyfontswitch}  \setinterfacecommand{definebuffer}{definebuffer}  \setinterfacecommand{definecharacter}{definecharacter} +\setinterfacecommand{definecharacterkerning}{definecharacterkerning} +\setinterfacecommand{definecharacterspacing}{definecharacterspacing}  \setinterfacecommand{definecolor}{definecolor}  \setinterfacecommand{definecolorgroup}{definecolorgroup}  \setinterfacecommand{definecolumnbreak}{definecolumnbreak} @@ -1432,37 +1459,57 @@  \setinterfacecommand{definecommand}{definecommand}  \setinterfacecommand{defineconversion}{defineconversion}  \setinterfacecommand{definedescription}{definedescription} +\setinterfacecommand{definedfont}{definedfont}  \setinterfacecommand{defineenumeration}{defineenumeration} +\setinterfacecommand{definefallbackfamily}{definefallbackfamily}  \setinterfacecommand{definefield}{definefield}  \setinterfacecommand{definefieldstack}{definefieldstack}  \setinterfacecommand{definefiguresymbol}{definefiguresymbol} +\setinterfacecommand{definefilefallback}{definefilefallback} +\setinterfacecommand{definefirstline}{definefirstline}  \setinterfacecommand{definefloat}{definefloat}  \setinterfacecommand{definefont}{definefont} +\setinterfacecommand{definefontalternative}{definefontalternative} +\setinterfacecommand{definefontfallback}{definefontfallback} +\setinterfacecommand{definefontfamily}{definefontfamily} +\setinterfacecommand{definefontfamilypreset}{definefontfamilypreset} +\setinterfacecommand{definefontfeature}{definefontfeature} +\setinterfacecommand{definefontfile}{definefontfile} +\setinterfacecommand{definefontsize}{definefontsize} +\setinterfacecommand{definefontsolution}{definefontsolution}  \setinterfacecommand{definefontstyle}{definefontstyle}  \setinterfacecommand{definefontsynonym}{definefontsynonym}  \setinterfacecommand{defineframed}{defineframed}  \setinterfacecommand{defineframedtext}{defineframedtext} +\setinterfacecommand{definefrozenfont}{definefrozenfont}  \setinterfacecommand{definehbox}{definehbox}  \setinterfacecommand{definehead}{definehead} +\setinterfacecommand{definehyphenationfeatures}{definehyphenationfeatures}  \setinterfacecommand{defineindentedtext}{defineindentedtext}  \setinterfacecommand{defineinmargin}{defineinmargin}  \setinterfacecommand{defineinteractionmenu}{defineinteractionmenu}  \setinterfacecommand{defineitemgroup}{defineitemgroup} +\setinterfacecommand{defineitems}{defineitems}  \setinterfacecommand{definelabel}{definelabel}  \setinterfacecommand{definelayer}{definelayer}  \setinterfacecommand{definelayout}{definelayout} +\setinterfacecommand{definelinenote}{definelinenote}  \setinterfacecommand{definelist}{definelist}  \setinterfacecommand{definelogo}{definelogo}  \setinterfacecommand{definemainfield}{definemainfield}  \setinterfacecommand{definemakeup}{definemakeup}  \setinterfacecommand{definemarking}{definemarking}  \setinterfacecommand{definemathalignment}{definemathalignment} +\setinterfacecommand{definemode}{definemode} +\setinterfacecommand{definenamedcolor}{definenamedcolor} +\setinterfacecommand{definenote}{definenote}  \setinterfacecommand{defineoutput}{defineoutput}  \setinterfacecommand{defineoverlay}{defineoverlay}  \setinterfacecommand{definepagebreak}{definepagebreak}  \setinterfacecommand{definepalet}{definepalet}  \setinterfacecommand{definepapersize}{definepapersize}  \setinterfacecommand{defineparagraphs}{defineparagraphs} +\setinterfacecommand{defineperiodkerning}{defineperiodkerning}  \setinterfacecommand{defineplacement}{defineplacement}  \setinterfacecommand{defineprofile}{defineprofile}  \setinterfacecommand{defineprogram}{defineprogram} @@ -1484,33 +1531,45 @@  \setinterfacecommand{definetabulate}{definetabulate}  \setinterfacecommand{definetext}{definetext}  \setinterfacecommand{definetextbackground}{definetextbackground} +\setinterfacecommand{definetextnote}{definetextnote}  \setinterfacecommand{definetextposition}{definetextposition}  \setinterfacecommand{definetextvariable}{definetextvariable}  \setinterfacecommand{definetype}{definetype}  \setinterfacecommand{definetyping}{definetyping}  \setinterfacecommand{defineversion}{defineversion} +\setinterfacecommand{depthspanningtext}{depthspanningtext}  \setinterfacecommand{determineheadnumber}{determineheadnumber}  \setinterfacecommand{determinelistcharacteristics}{determinelistcharacteristics}  \setinterfacecommand{determineregistercharacteristics}{determineregistercharacteristics}  \setinterfacecommand{dimension}{dimension}  \setinterfacecommand{disableinteractionmenu}{disableinteractionmenu} +\setinterfacecommand{disablemode}{disablemode} +\setinterfacecommand{doaddfeature}{doaddfeature}  \setinterfacecommand{domicile}{domicile} +\setinterfacecommand{dontconvertfont}{dontconvertfont}  \setinterfacecommand{donttest}{donttest}  \setinterfacecommand{edgedistance}{edgedistance}  \setinterfacecommand{edgewidth}{edgewidth} +\setinterfacecommand{emphasisboldface}{emphasisboldface}  \setinterfacecommand{emptylines}{emptylines} +\setinterfacecommand{enablemode}{enablemode}  \setinterfacecommand{environment}{environment}  \setinterfacecommand{externalfigure}{externalfigure}  \setinterfacecommand{fact}{fact} +\setinterfacecommand{fastswitchtobodyfont}{fastswitchtobodyfont} +\setinterfacecommand{feature}{feature}  \setinterfacecommand{field}{field}  \setinterfacecommand{fieldstack}{fieldstack}  \setinterfacecommand{fillinfield}{fillinfield}  \setinterfacecommand{fillinline}{fillinline}  \setinterfacecommand{fillinrules}{fillinrules}  \setinterfacecommand{fillintext}{fillintext} +\setinterfacecommand{firstcharacter}{firstcharacter}  \setinterfacecommand{fitfield}{fitfield} +\setinterfacecommand{fittopbaselinegrid}{fittopbaselinegrid}  \setinterfacecommand{fixedspace}{fixedspace}  \setinterfacecommand{fixedspaces}{fixedspaces} +\setinterfacecommand{flushnotes}{flushnotes}  \setinterfacecommand{followprofile}{followprofile}  \setinterfacecommand{followprofileversion}{followprofileversion}  \setinterfacecommand{followversion}{followversion} @@ -1519,13 +1578,19 @@  \setinterfacecommand{footnote}{footnote}  \setinterfacecommand{footnotetext}{footnotetext}  \setinterfacecommand{forceblocks}{forceblocks} +\setinterfacecommand{forcecharacterstripping}{forcecharacterstripping}  \setinterfacecommand{formulanumber}{formulanumber}  \setinterfacecommand{fraction}{fraction}  \setinterfacecommand{framed}{framed}  \setinterfacecommand{from}{from} +\setinterfacecommand{fromlinenote}{fromlinenote}  \setinterfacecommand{getbuffer}{getbuffer} +\setinterfacecommand{getfirstcharacter}{getfirstcharacter}  \setinterfacecommand{getmarking}{getmarking}  \setinterfacecommand{getnumber}{getnumber} +\setinterfacecommand{globaldisablemode}{globaldisablemode} +\setinterfacecommand{globalenablemode}{globalenablemode} +\setinterfacecommand{globalpreventmode}{globalpreventmode}  \setinterfacecommand{godown}{godown}  \setinterfacecommand{goto}{goto}  \setinterfacecommand{gotobox}{gotobox} @@ -1541,6 +1606,7 @@  \setinterfacecommand{headnumber}{headnumber}  \setinterfacecommand{headsym}{headsym}  \setinterfacecommand{headtext}{headtext} +\setinterfacecommand{heightspanningtext}{heightspanningtext}  \setinterfacecommand{hideblocks}{hideblocks}  \setinterfacecommand{high}{high}  \setinterfacecommand{hl}{hl} @@ -1572,26 +1638,37 @@  \setinterfacecommand{interactionbuttons}{interactionbuttons}  \setinterfacecommand{interactionmenu}{interactionmenu}  \setinterfacecommand{item}{item} +\setinterfacecommand{itemgroup}{itemgroup}  \setinterfacecommand{items}{items} +\setinterfacecommand{itemtag}{itemtag}  \setinterfacecommand{its}{its}  \setinterfacecommand{keepblocks}{keepblocks} +\setinterfacecommand{kerncharacters}{kerncharacters}  \setinterfacecommand{label}{label}  \setinterfacecommand{labels}{labels}  \setinterfacecommand{labeltext}{labeltext}  \setinterfacecommand{language}{language} +\setinterfacecommand{languageCharacters}{languageCharacters} +\setinterfacecommand{languagecharacters}{languagecharacters}  \setinterfacecommand{leftaligned}{leftaligned} +\setinterfacecommand{leftbottombox}{leftbottombox}  \setinterfacecommand{leftedgedistance}{leftedgedistance}  \setinterfacecommand{leftedgewidth}{leftedgewidth} +\setinterfacecommand{leftline}{leftline}  \setinterfacecommand{leftmargindistance}{leftmargindistance}  \setinterfacecommand{leftmarginwidth}{leftmarginwidth}  \setinterfacecommand{leg}{leg}  \setinterfacecommand{linecorrection}{linecorrection} +\setinterfacecommand{linenote}{linenote} +\setinterfacecommand{linespanningtext}{linespanningtext}  \setinterfacecommand{linewidth}{linethickness}  \setinterfacecommand{listheight}{listheight}  \setinterfacecommand{listlength}{listlength}  \setinterfacecommand{listsymbol}{listsymbol}  \setinterfacecommand{listwidth}{listwidth} +\setinterfacecommand{loadfontgoodies}{loadfontgoodies}  \setinterfacecommand{localfootnotes}{localfootnotes} +\setinterfacecommand{localnotes}{localnotes}  \setinterfacecommand{logfields}{logfields}  \setinterfacecommand{lohi}{lohi}  \setinterfacecommand{low}{low} @@ -1622,6 +1699,7 @@  \setinterfacecommand{nodimension}{nodimension}  \setinterfacecommand{noheaderandfooterlines}{noheaderandfooterlines}  \setinterfacecommand{noindenting}{noindenting} +\setinterfacecommand{noitem}{noitem}  \setinterfacecommand{nolist}{nolist}  \setinterfacecommand{nomarking}{nomarking}  \setinterfacecommand{nomoreblocks}{nomoreblocks} @@ -1629,6 +1707,7 @@  \setinterfacecommand{nop}{nop}  \setinterfacecommand{nospace}{nospace}  \setinterfacecommand{note}{note} +\setinterfacecommand{notesymbol}{notesymbol}  \setinterfacecommand{notopandbottomlines}{notopandbottomlines}  \setinterfacecommand{notsmallcapped}{nocap}  \setinterfacecommand{nowhitespace}{nowhitespace} @@ -1640,6 +1719,7 @@  \setinterfacecommand{outermarginwidth}{outermarginwidth}  \setinterfacecommand{packed}{packed}  \setinterfacecommand{page}{page} +\setinterfacecommand{pagebreak}{pagebreak}  \setinterfacecommand{pagedepth}{pagedepth}  \setinterfacecommand{pagenumber}{pagenumber}  \setinterfacecommand{pageoffset}{pageoffset} @@ -1658,7 +1738,10 @@  \setinterfacecommand{placelist}{placelist}  \setinterfacecommand{placelistofsynonyms}{placelistofsynonyms}  \setinterfacecommand{placelocalfootnotes}{placelocalfootnotes} +\setinterfacecommand{placelocalnotes}{placelocalnotes}  \setinterfacecommand{placelogos}{placelogos} +\setinterfacecommand{placenamedfloat}{placenamedfloat} +\setinterfacecommand{placenotes}{placenotes}  \setinterfacecommand{placeongrid}{placeongrid}  \setinterfacecommand{placeontopofeachother}{placeontopofeachother}  \setinterfacecommand{placepagenumber}{placepagenumber} @@ -1671,9 +1754,17 @@  \setinterfacecommand{placetextvariable}{placetextvariable}  \setinterfacecommand{position}{position}  \setinterfacecommand{positiontext}{positiontext} +\setinterfacecommand{postponenotes}{postponenotes} +\setinterfacecommand{postponingnotes}{postponingnotes} +\setinterfacecommand{predefinedfont}{predefinedfont} +\setinterfacecommand{predefinefont}{predefinefont} +\setinterfacecommand{presetdocument}{presetdocument} +\setinterfacecommand{prettyprintbuffer}{prettyprintbuffer} +\setinterfacecommand{preventmode}{preventmode}  \setinterfacecommand{printpaperheight}{printpaperheight}  \setinterfacecommand{printpaperwidth}{printpaperwidth}  \setinterfacecommand{processblocks}{processblocks} +\setinterfacecommand{processbodyfontenvironmentlist}{processbodyfontenvironmentlist}  \setinterfacecommand{processpage}{processpage}  \setinterfacecommand{product}{product}  \setinterfacecommand{program}{program} @@ -1683,19 +1774,45 @@  \setinterfacecommand{quote}{quote}  \setinterfacecommand{ran}{ran}  \setinterfacecommand{redo}{redo} +\setinterfacecommand{redoconvertfont}{redoconvertfont}  \setinterfacecommand{ref}{ref}  \setinterfacecommand{reference}{reference}  \setinterfacecommand{referral}{referral}  \setinterfacecommand{referraldate}{referraldate}  \setinterfacecommand{referring}{referring} +\setinterfacecommand{registerfontclass}{registerfontclass} +\setinterfacecommand{registerhyphenationexception}{registerhyphenationexception} +\setinterfacecommand{registerhyphenationpattern}{registerhyphenationpattern}  \setinterfacecommand{remark}{remark} +\setinterfacecommand{replacefeature}{replacefeature}  \setinterfacecommand{reset}{reset} +\setinterfacecommand{resetandaddfeature}{resetandaddfeature} +\setinterfacecommand{resetcharacteralign}{resetcharacteralign} +\setinterfacecommand{resetcharacterkerning}{resetcharacterkerning} +\setinterfacecommand{resetcharacterspacing}{resetcharacterspacing} +\setinterfacecommand{resetcharacterstripping}{resetcharacterstripping} +\setinterfacecommand{resetfeature}{resetfeature} +\setinterfacecommand{resetfontcolorsheme}{resetfontcolorsheme} +\setinterfacecommand{resetfontfallback}{resetfontfallback} +\setinterfacecommand{resetfontsolution}{resetfontsolution} +\setinterfacecommand{resethyphenationfeatures}{resethyphenationfeatures} +\setinterfacecommand{resetlocalfloats}{resetlocalfloats}  \setinterfacecommand{resetmarking}{resetmarking} +\setinterfacecommand{resetmode}{resetmode}  \setinterfacecommand{resetnumber}{resetnumber} +\setinterfacecommand{resetpath}{resetpath} +\setinterfacecommand{resetperiodkerning}{resetperiodkerning} +\setinterfacecommand{resetsystemmode}{resetsystemmode}  \setinterfacecommand{resettext}{resettextcontent} +\setinterfacecommand{resetvisualizers}{resetvisualizers} +\setinterfacecommand{restoreglobalbodyfont}{restoreglobalbodyfont} +\setinterfacecommand{retestfeature}{retestfeature} +\setinterfacecommand{revivefeature}{revivefeature}  \setinterfacecommand{rightaligned}{rightaligned} +\setinterfacecommand{rightbottombox}{rightbottombox}  \setinterfacecommand{rightedgedistance}{rightedgedistance}  \setinterfacecommand{rightedgewidth}{rightedgewidth} +\setinterfacecommand{rightline}{rightline}  \setinterfacecommand{rightmargindistance}{rightmargindistance}  \setinterfacecommand{rightmarginwidth}{rightmarginwidth}  \setinterfacecommand{romannumerals}{romannumerals} @@ -1706,12 +1823,38 @@  \setinterfacecommand{selectblocks}{selectblocks}  \setinterfacecommand{selectpaper}{selectpaper}  \setinterfacecommand{selectversion}{selectversion} +\setinterfacecommand{setbigbodyfont}{setbigbodyfont} +\setinterfacecommand{setcharacteralign}{setcharacteralign} +\setinterfacecommand{setcharacteraligndetail}{setcharacteraligndetail} +\setinterfacecommand{setcharactercasing}{setcharactercasing} +\setinterfacecommand{setcharactercleaning}{setcharactercleaning} +\setinterfacecommand{setcharacterkerning}{setcharacterkerning} +\setinterfacecommand{setcharacterspacing}{setcharacterspacing} +\setinterfacecommand{setcharacterstripping}{setcharacterstripping} +\setinterfacecommand{setcurrentfontclass}{setcurrentfontclass} +\setinterfacecommand{setfirstline}{setfirstline} +\setinterfacecommand{setfirstpasscharacteralign}{setfirstpasscharacteralign} +\setinterfacecommand{setfont}{setfont} +\setinterfacecommand{setfontcolorsheme}{setfontcolorsheme} +\setinterfacecommand{setfontfeature}{setfontfeature} +\setinterfacecommand{setfontsolution}{setfontsolution} +\setinterfacecommand{setfontstrut}{setfontstrut} +\setinterfacecommand{sethyphenationfeatures}{sethyphenationfeatures} +\setinterfacecommand{setmainbodyfont}{setmainbodyfont} +\setinterfacecommand{setmode}{setmode} +\setinterfacecommand{setnote}{setnote} +\setinterfacecommand{setnotetext}{setnotetext}  \setinterfacecommand{setnumber}{setnumber} +\setinterfacecommand{setperiodkerning}{setperiodkerning} +\setinterfacecommand{setsecondpasscharacteralign}{setsecondpasscharacteralign} +\setinterfacecommand{setsmallbodyfont}{setsmallbodyfont} +\setinterfacecommand{setsystemmode}{setsystemmode}  \setinterfacecommand{settextcontent}{settextcontent}  \setinterfacecommand{settextvariable}{settextvariable}  \setinterfacecommand{setupalign}{setupalign}  \setinterfacecommand{setupanswerarea}{setupanswerarea}  \setinterfacecommand{setuparranging}{setuparranging} +\setinterfacecommand{setupattachment}{setupattachment}  \setinterfacecommand{setupbackground}{setupbackground}  \setinterfacecommand{setupbackgrounds}{setupbackgrounds}  \setinterfacecommand{setupblackrules}{setupblackrules} @@ -1726,6 +1869,9 @@  \setinterfacecommand{setupcapitals}{setupcapitals}  \setinterfacecommand{setupcaption}{setupcaption}  \setinterfacecommand{setupcaptions}{setupcaptions} +\setinterfacecommand{setupcharacteralign}{setupcharacteralign} +\setinterfacecommand{setupcharacterkerning}{setupcharacterkerning} +\setinterfacecommand{setupcharacterspacing}{setupcharacterspacing}  \setinterfacecommand{setupclipping}{setupclipping}  \setinterfacecommand{setupcolor}{setupcolor}  \setinterfacecommand{setupcolors}{setupcolors} @@ -1736,6 +1882,7 @@  \setinterfacecommand{setupcombinations}{setupcombinations}  \setinterfacecommand{setupcombinedlist}{setupcombinedlist}  \setinterfacecommand{setupcomment}{setupcomment} +\setinterfacecommand{setupcounter}{setupcounter}  \setinterfacecommand{setupdescription}{setupdescription}  \setinterfacecommand{setupdescriptions}{setupdescriptions}  \setinterfacecommand{setupenumeration}{setupenumeration} @@ -1745,9 +1892,14 @@  \setinterfacecommand{setupfields}{setupfields}  \setinterfacecommand{setupfillinlines}{setupfillinlines}  \setinterfacecommand{setupfillinrules}{setupfillinrules} +\setinterfacecommand{setupfirstline}{setupfirstline}  \setinterfacecommand{setupfloat}{setupfloat}  \setinterfacecommand{setupfloats}{setupfloats}  \setinterfacecommand{setupfloatsplitting}{setupfloatsplitting} +\setinterfacecommand{setupfontexpansion}{setupfontexpansion} +\setinterfacecommand{setupfontprotrusion}{setupfontprotrusion} +\setinterfacecommand{setupfonts}{setupfonts} +\setinterfacecommand{setupfontsolution}{setupfontsolution}  \setinterfacecommand{setupfooter}{setupfooter}  \setinterfacecommand{setupfootertexts}{setupfootertexts}  \setinterfacecommand{setupfootnotedefinition}{setupfootnotedefinition} @@ -1764,6 +1916,7 @@  \setinterfacecommand{setupheadnumber}{setupheadnumber}  \setinterfacecommand{setupheads}{setupheads}  \setinterfacecommand{setupheadtext}{setupheadtext} +\setinterfacecommand{setuphyphenation}{setuphyphenation}  \setinterfacecommand{setuphyphenmark}{setuphyphenmark}  \setinterfacecommand{setupindentedtext}{setupindentedtext}  \setinterfacecommand{setupindenting}{setupindenting} @@ -1780,6 +1933,7 @@  \setinterfacecommand{setuplanguage}{setuplanguage}  \setinterfacecommand{setuplayout}{setuplayout}  \setinterfacecommand{setuplegend}{setuplegend} +\setinterfacecommand{setuplinenote}{setuplinenote}  \setinterfacecommand{setuplinenumbering}{setuplinenumbering}  \setinterfacecommand{setuplines}{setuplines}  \setinterfacecommand{setuplinewidth}{setuplinewidth} @@ -1792,6 +1946,10 @@  \setinterfacecommand{setupmarking}{setupmarking}  \setinterfacecommand{setupmathalignment}{setupmathalignment}  \setinterfacecommand{setupnarrower}{setupnarrower} +\setinterfacecommand{setupnotation}{setupnotation} +\setinterfacecommand{setupnotations}{setupnotations} +\setinterfacecommand{setupnote}{setupnote} +\setinterfacecommand{setupnotes}{setupnotes}  \setinterfacecommand{setupnumber}{setupnumber}  \setinterfacecommand{setupnumbering}{setupnumbering}  \setinterfacecommand{setupoppositeplacing}{setupoppositeplacing} @@ -1805,6 +1963,7 @@  \setinterfacecommand{setuppapersize}{setuppapersize}  \setinterfacecommand{setupparagraphnumbering}{setupparagraphnumbering}  \setinterfacecommand{setupparagraphs}{setupparagraphs} +\setinterfacecommand{setupperiodkerning}{setupperiodkerning}  \setinterfacecommand{setupplacement}{setupplacement}  \setinterfacecommand{setuppositioning}{setuppositioning}  \setinterfacecommand{setupprofiles}{setupprofiles} @@ -1834,6 +1993,7 @@  \setinterfacecommand{setuptabulate}{setuptabulate}  \setinterfacecommand{setuptext}{setuptext}  \setinterfacecommand{setuptextbackground}{setuptextbackground} +\setinterfacecommand{setuptextnote}{setuptextnote}  \setinterfacecommand{setuptextposition}{setuptextposition}  \setinterfacecommand{setuptextrules}{setuptextrules}  \setinterfacecommand{setuptexttexts}{setuptexttexts} @@ -1848,16 +2008,29 @@  \setinterfacecommand{setupurl}{setupurl}  \setinterfacecommand{setupversions}{setupversions}  \setinterfacecommand{setupwhitespace}{setupwhitespace} +\setinterfacecommand{setvisualizerfont}{setvisualizerfont}  \setinterfacecommand{showbodyfont}{showbodyfont}  \setinterfacecommand{showbodyfontenvironment}{showbodyfontenvironment}  \setinterfacecommand{showcolor}{showcolor}  \setinterfacecommand{showcolorgroup}{showcolorgroup} +\setinterfacecommand{showcounter}{showcounter}  \setinterfacecommand{showexternalfigures}{showexternalfigures}  \setinterfacecommand{showfields}{showfields} +\setinterfacecommand{showfont}{showfont} +\setinterfacecommand{showfontdata}{showfontdata} +\setinterfacecommand{showfontexpansion}{showfontexpansion} +\setinterfacecommand{showfontitalics}{showfontitalics} +\setinterfacecommand{showfontkerns}{showfontkerns} +\setinterfacecommand{showfontparameters}{showfontparameters} +\setinterfacecommand{showfontstrip}{showfontstrip} +\setinterfacecommand{showfontstyle}{showfontstyle}  \setinterfacecommand{showframe}{showframe}  \setinterfacecommand{showgrid}{showgrid} +\setinterfacecommand{showhyphenationtrace}{showhyphenationtrace} +\setinterfacecommand{showkerning}{showkerning}  \setinterfacecommand{showlayout}{showlayout}  \setinterfacecommand{showmakeup}{showmakeup} +\setinterfacecommand{showminimalbaseline}{showminimalbaseline}  \setinterfacecommand{showpalet}{showpalet}  \setinterfacecommand{showprint}{showprint}  \setinterfacecommand{showsetups}{showsetups} @@ -1867,6 +2040,7 @@  \setinterfacecommand{someline}{someline}  \setinterfacecommand{somewhere}{somewhere}  \setinterfacecommand{space}{space} +\setinterfacecommand{specialitem}{specialitem}  \setinterfacecommand{splitfloat}{splitfloat}  \setinterfacecommand{startalignment}{startalignment}  \setinterfacecommand{startbackground}{startbackground} @@ -1884,6 +2058,7 @@  \setinterfacecommand{startglobal}{startglobal}  \setinterfacecommand{startline}{startline}  \setinterfacecommand{startlinecorrection}{startlinecorrection} +\setinterfacecommand{startlinenote}{startlinenote}  \setinterfacecommand{startlinenumbering}{startlinenumbering}  \setinterfacecommand{startlines}{startlines}  \setinterfacecommand{startlocal}{startlocal} @@ -1926,6 +2101,7 @@  \setinterfacecommand{stopglobal}{stopglobal}  \setinterfacecommand{stopline}{stopline}  \setinterfacecommand{stoplinecorrection}{stoplinecorrection} +\setinterfacecommand{stoplinenote}{stoplinenote}  \setinterfacecommand{stoplinenumbering}{stoplinenumbering}  \setinterfacecommand{stoplines}{stoplines}  \setinterfacecommand{stoplocal}{stoplocal} @@ -1953,8 +2129,11 @@  \setinterfacecommand{stopunpacked}{stopunpacked}  \setinterfacecommand{stopversion}{stopversion}  \setinterfacecommand{stretched}{stretched} +\setinterfacecommand{strictinspectnextcharacter}{strictinspectnextcharacter} +\setinterfacecommand{stripcharacter}{stripcharacter}  \setinterfacecommand{subformulanumber}{subformulanumber}  \setinterfacecommand{subpagenumber}{subpagenumber} +\setinterfacecommand{subtractfeature}{subtractfeature}  \setinterfacecommand{switchtobodyfont}{switchtobodyfont}  \setinterfacecommand{switchtorawfont}{switchtorawfont}  \setinterfacecommand{sym}{sym} @@ -1964,16 +2143,24 @@  \setinterfacecommand{synchronize}{synchronize}  \setinterfacecommand{tab}{tab}  \setinterfacecommand{testcolumn}{testcolumn} +\setinterfacecommand{testfeature}{testfeature} +\setinterfacecommand{testfeatureonce}{testfeatureonce}  \setinterfacecommand{testpage}{testpage}  \setinterfacecommand{tex}{tex}  \setinterfacecommand{textbackground}{textbackground} +\setinterfacecommand{textcolor}{textcolor}  \setinterfacecommand{textheight}{textheight} +\setinterfacecommand{textnote}{textnote}  \setinterfacecommand{textreference}{textreference}  \setinterfacecommand{textrule}{textrule}  \setinterfacecommand{textvariable}{textvariable}  \setinterfacecommand{textwidth}{textwidth} +\setinterfacecommand{thefirstcharacter}{thefirstcharacter} +\setinterfacecommand{thenormalizedbodyfontsize}{thenormalizedbodyfontsize} +\setinterfacecommand{theremainingcharacters}{theremainingcharacters}  \setinterfacecommand{thinrule}{thinrule}  \setinterfacecommand{thinrules}{thinrules} +\setinterfacecommand{tolinenote}{tolinenote}  \setinterfacecommand{tooltip}{tooltip}  \setinterfacecommand{topdistance}{topdistance}  \setinterfacecommand{topheight}{topheight} @@ -1984,13 +2171,19 @@  \setinterfacecommand{typ}{typ}  \setinterfacecommand{type}{type}  \setinterfacecommand{typebuffer}{typebuffer} +\setinterfacecommand{typedefinedbuffer}{typedefinedbuffer}  \setinterfacecommand{typefile}{typefile} +\setinterfacecommand{typeinlinebuffer}{typeinlinebuffer} +\setinterfacecommand{typing}{typing}  \setinterfacecommand{unitmeaning}{unitmeaning}  \setinterfacecommand{unknown}{unknown} +\setinterfacecommand{unregisterhyphenationpattern}{unregisterhyphenationpattern}  \setinterfacecommand{useJSscripts}{useJSscripts}  \setinterfacecommand{useURL}{useURL}  \setinterfacecommand{useXMLfilter}{useXMLfilter}  \setinterfacecommand{useblocks}{useblocks} +\setinterfacecommand{usebodyfont}{usebodyfont} +\setinterfacecommand{usebodyfontparameter}{usebodyfontparameter}  \setinterfacecommand{usecommands}{usecommands}  \setinterfacecommand{useencoding}{useencoding}  \setinterfacecommand{useexternaldocument}{useexternaldocument} @@ -2007,10 +2200,12 @@  \setinterfacecommand{usetypescript}{usetypescript}  \setinterfacecommand{usetypescriptfile}{usetypescriptfile}  \setinterfacecommand{useurl}{useurl} +\setinterfacecommand{verbatim}{verbatim}  \setinterfacecommand{version}{version}  \setinterfacecommand{vl}{vl}  \setinterfacecommand{weekday}{weekday}  \setinterfacecommand{whitespace}{whitespace} +\setinterfacecommand{widthspanningtext}{widthspanningtext}  \setinterfacecommand{wordright}{wordright}  \setinterfacecommand{writebetweenlist}{writebetweenlist}  \setinterfacecommand{writetolist}{writetolist} diff --git a/tex/context/base/mkii/mult-pe.mkii b/tex/context/base/mkii/mult-pe.mkii index 119b1f58d..c09ccb470 100644 --- a/tex/context/base/mkii/mult-pe.mkii +++ b/tex/context/base/mkii/mult-pe.mkii @@ -128,6 +128,9 @@  \setinterfacevariable{camel}{camel}  \setinterfacevariable{cap}{cap}  \setinterfacevariable{capital}{capital} +\setinterfacevariable{category}{category} +\setinterfacevariable{cd:character}{cd:character} +\setinterfacevariable{cd:font}{cd:font}  \setinterfacevariable{center}{مرکز}  \setinterfacevariable{centerlast}{centerlast}  \setinterfacevariable{chapter}{فصل} @@ -186,6 +189,7 @@  \setinterfacevariable{external}{خارجی}  \setinterfacevariable{extremestretch}{extremestretch}  \setinterfacevariable{fact}{fact} +\setinterfacevariable{fallback}{fallback}  \setinterfacevariable{february}{فوریه}  \setinterfacevariable{field}{field}  \setinterfacevariable{figure}{شکل} @@ -804,8 +808,10 @@  \setinterfaceconstant{extras}{extras}  \setinterfaceconstant{factor}{عامل}  \setinterfaceconstant{fallback}{عقبریختن} +\setinterfaceconstant{fallbacks}{fallbacks}  \setinterfaceconstant{family}{خانواده}  \setinterfaceconstant{features}{features} +\setinterfaceconstant{featureset}{featureset}  \setinterfaceconstant{fences}{fences}  \setinterfaceconstant{field}{field}  \setinterfaceconstant{fieldbackgroundcolor}{رنگپسزمینهمیدان} @@ -880,6 +886,7 @@  \setinterfaceconstant{increment}{افزایش}  \setinterfaceconstant{incrementnumber}{شمارهافزایش}  \setinterfaceconstant{indenting}{تورفتگی} +\setinterfaceconstant{indentlist}{indentlist}  \setinterfaceconstant{indentnext}{متنتورفته}  \setinterfaceconstant{index}{index}  \setinterfaceconstant{indicator}{اندیکاتور} @@ -1084,6 +1091,7 @@  \setinterfaceconstant{period}{period}  \setinterfaceconstant{place}{بگذار}  \setinterfaceconstant{placehead}{بگذارسر} +\setinterfaceconstant{placeholder}{placeholder}  \setinterfaceconstant{placestopper}{بگذارایست}  \setinterfaceconstant{position}{موقعیت}  \setinterfaceconstant{prefix}{پیشوند} @@ -1367,8 +1375,18 @@  \setinterfacecommand{Word}{Word}  \setinterfacecommand{Words}{Words}  \setinterfacecommand{about}{درمورد} +\setinterfacecommand{adaptfontfeature}{adaptfontfeature}  \setinterfacecommand{adaptlayout}{تنظیمطرحبندی} +\setinterfacecommand{addfeature}{addfeature} +\setinterfacecommand{alignbottom}{alignbottom} +\setinterfacecommand{aligned}{aligned} +\setinterfacecommand{alignedbox}{alignedbox} +\setinterfacecommand{alignedline}{alignedline} +\setinterfacecommand{alignhere}{alignhere}  \setinterfacecommand{alignment}{alignment} +\setinterfacecommand{alignmentcharacter}{alignmentcharacter} +\setinterfacecommand{applytocharacters}{applytocharacters} +\setinterfacecommand{applytofirstcharacter}{applytofirstcharacter}  \setinterfacecommand{arg}{افزودن}  \setinterfacecommand{at}{در}  \setinterfacecommand{atleftmargin}{درحاشیهچپ} @@ -1380,9 +1398,13 @@  \setinterfacecommand{blackrules}{خطهایسیاه}  \setinterfacecommand{blank}{خالی}  \setinterfacecommand{bookmark}{چوبخط} +\setinterfacecommand{bottombox}{bottombox}  \setinterfacecommand{bottomdistance}{فاصلهپایین}  \setinterfacecommand{bottomheight}{ارتفاعپایین} +\setinterfacecommand{bottomleftbox}{bottomleftbox} +\setinterfacecommand{bottomrightbox}{bottomrightbox}  \setinterfacecommand{bottomspace}{فضایپایین} +\setinterfacecommand{buildtextbottomdot}{buildtextbottomdot}  \setinterfacecommand{but}{اما}  \setinterfacecommand{button}{دکمه}  \setinterfacecommand{bypassblocks}{عبوربلوکها} @@ -1421,8 +1443,11 @@  \setinterfacecommand{defineblock}{تعریفبلوک}  \setinterfacecommand{definebodyfont}{تعریفقلممتن}  \setinterfacecommand{definebodyfontenvironment}{تعریفمحیطقلمبدنه} +\setinterfacecommand{definebodyfontswitch}{definebodyfontswitch}  \setinterfacecommand{definebuffer}{تعریفبافر}  \setinterfacecommand{definecharacter}{تعریفحرف} +\setinterfacecommand{definecharacterkerning}{definecharacterkerning} +\setinterfacecommand{definecharacterspacing}{definecharacterspacing}  \setinterfacecommand{definecolor}{تعریفرنگ}  \setinterfacecommand{definecolorgroup}{تعریفگروهرنگ}  \setinterfacecommand{definecolumnbreak}{تعریفشکستنستون} @@ -1432,37 +1457,57 @@  \setinterfacecommand{definecommand}{تعریففرمان}  \setinterfacecommand{defineconversion}{تعریفتبدیل}  \setinterfacecommand{definedescription}{تعریفشرح} +\setinterfacecommand{definedfont}{definedfont}  \setinterfacecommand{defineenumeration}{تعریفشمارهبندی} +\setinterfacecommand{definefallbackfamily}{definefallbackfamily}  \setinterfacecommand{definefield}{تعریفمیدان}  \setinterfacecommand{definefieldstack}{تعریفتودهمیدان}  \setinterfacecommand{definefiguresymbol}{تعریفنمادشکل} +\setinterfacecommand{definefilefallback}{definefilefallback} +\setinterfacecommand{definefirstline}{definefirstline}  \setinterfacecommand{definefloat}{تعریفشناور}  \setinterfacecommand{definefont}{تعریفقلم} +\setinterfacecommand{definefontalternative}{definefontalternative} +\setinterfacecommand{definefontfallback}{definefontfallback} +\setinterfacecommand{definefontfamily}{definefontfamily} +\setinterfacecommand{definefontfamilypreset}{definefontfamilypreset} +\setinterfacecommand{definefontfeature}{definefontfeature} +\setinterfacecommand{definefontfile}{definefontfile} +\setinterfacecommand{definefontsize}{definefontsize} +\setinterfacecommand{definefontsolution}{definefontsolution}  \setinterfacecommand{definefontstyle}{تعریفسبکقلم}  \setinterfacecommand{definefontsynonym}{تعریفمترادفقلم}  \setinterfacecommand{defineframed}{تعریفقالبی}  \setinterfacecommand{defineframedtext}{تعریفمتنقالبی} +\setinterfacecommand{definefrozenfont}{definefrozenfont}  \setinterfacecommand{definehbox}{تعریفجعبهافقی}  \setinterfacecommand{definehead}{تعریفسر} +\setinterfacecommand{definehyphenationfeatures}{definehyphenationfeatures}  \setinterfacecommand{defineindentedtext}{defineindentedtext}  \setinterfacecommand{defineinmargin}{تعریفدرونحاشیه}  \setinterfacecommand{defineinteractionmenu}{تعریفمنویپانل}  \setinterfacecommand{defineitemgroup}{تعریفگروهآیتم} +\setinterfacecommand{defineitems}{defineitems}  \setinterfacecommand{definelabel}{تعریفبرچسب}  \setinterfacecommand{definelayer}{تعریفلایه}  \setinterfacecommand{definelayout}{تعریفطرحبندی} +\setinterfacecommand{definelinenote}{definelinenote}  \setinterfacecommand{definelist}{تعریفلیست}  \setinterfacecommand{definelogo}{تعریفآرم}  \setinterfacecommand{definemainfield}{تعریفمیداناصلی}  \setinterfacecommand{definemakeup}{تعریفآرایش}  \setinterfacecommand{definemarking}{تعریفنشانهگذاری}  \setinterfacecommand{definemathalignment}{تعریفتنظیمریاضی} +\setinterfacecommand{definemode}{definemode} +\setinterfacecommand{definenamedcolor}{definenamedcolor} +\setinterfacecommand{definenote}{definenote}  \setinterfacecommand{defineoutput}{تعریفخروجی}  \setinterfacecommand{defineoverlay}{تعریفپوشش}  \setinterfacecommand{definepagebreak}{تعریفشکستصفحه}  \setinterfacecommand{definepalet}{تعریفلوح}  \setinterfacecommand{definepapersize}{تعریفاندازهبرگ}  \setinterfacecommand{defineparagraphs}{تعریفپاراگرافها} +\setinterfacecommand{defineperiodkerning}{defineperiodkerning}  \setinterfacecommand{defineplacement}{تعریفجانشانی}  \setinterfacecommand{defineprofile}{تعریفپروفایل}  \setinterfacecommand{defineprogram}{تعریفبرنامه} @@ -1484,33 +1529,45 @@  \setinterfacecommand{definetabulate}{تعریفجدولبندی}  \setinterfacecommand{definetext}{تعریفمتن}  \setinterfacecommand{definetextbackground}{definetextbackground} +\setinterfacecommand{definetextnote}{definetextnote}  \setinterfacecommand{definetextposition}{تعریفمکانمتن}  \setinterfacecommand{definetextvariable}{تعریفمتغیرمتن}  \setinterfacecommand{definetype}{تعریفتایپ}  \setinterfacecommand{definetyping}{تعریفتایپکردن}  \setinterfacecommand{defineversion}{تعریفنسخه} +\setinterfacecommand{depthspanningtext}{depthspanningtext}  \setinterfacecommand{determineheadnumber}{تعیینشمارهسر}  \setinterfacecommand{determinelistcharacteristics}{تعیینمشخصاتلیست}  \setinterfacecommand{determineregistercharacteristics}{تعیینمشخصاتثبت}  \setinterfacecommand{dimension}{بعد}  \setinterfacecommand{disableinteractionmenu}{ازکارانداختنمنویپانل} +\setinterfacecommand{disablemode}{disablemode} +\setinterfacecommand{doaddfeature}{doaddfeature}  \setinterfacecommand{domicile}{مسکن} +\setinterfacecommand{dontconvertfont}{dontconvertfont}  \setinterfacecommand{donttest}{امتحاننکن}  \setinterfacecommand{edgedistance}{فاصلهلبه}  \setinterfacecommand{edgewidth}{عرضلبه} +\setinterfacecommand{emphasisboldface}{emphasisboldface}  \setinterfacecommand{emptylines}{خطهاخالی} +\setinterfacecommand{enablemode}{enablemode}  \setinterfacecommand{environment}{محیط}  \setinterfacecommand{externalfigure}{شکلخارجی}  \setinterfacecommand{fact}{حقیقت} +\setinterfacecommand{fastswitchtobodyfont}{fastswitchtobodyfont} +\setinterfacecommand{feature}{feature}  \setinterfacecommand{field}{میدان}  \setinterfacecommand{fieldstack}{میدانپشته}  \setinterfacecommand{fillinfield}{درجدرمیدان}  \setinterfacecommand{fillinline}{درجدرخط}  \setinterfacecommand{fillinrules}{درجدرخطها}  \setinterfacecommand{fillintext}{درجدرمتن} +\setinterfacecommand{firstcharacter}{firstcharacter}  \setinterfacecommand{fitfield}{پرکردنمیدان} +\setinterfacecommand{fittopbaselinegrid}{fittopbaselinegrid}  \setinterfacecommand{fixedspace}{فضایثابت}  \setinterfacecommand{fixedspaces}{فضاهایثابت} +\setinterfacecommand{flushnotes}{flushnotes}  \setinterfacecommand{followprofile}{پیرویپروفایل}  \setinterfacecommand{followprofileversion}{پیروینسخهپروفایل}  \setinterfacecommand{followversion}{پیروینسخه} @@ -1519,13 +1576,19 @@  \setinterfacecommand{footnote}{پانوشت}  \setinterfacecommand{footnotetext}{متنپانوشت}  \setinterfacecommand{forceblocks}{اجباربلوکها} +\setinterfacecommand{forcecharacterstripping}{forcecharacterstripping}  \setinterfacecommand{formulanumber}{شمارهفرمول}  \setinterfacecommand{fraction}{کسر}  \setinterfacecommand{framed}{قالبی}  \setinterfacecommand{from}{از} +\setinterfacecommand{fromlinenote}{fromlinenote}  \setinterfacecommand{getbuffer}{دریافتبافر} +\setinterfacecommand{getfirstcharacter}{getfirstcharacter}  \setinterfacecommand{getmarking}{دریافتنشانه}  \setinterfacecommand{getnumber}{دریافتشماره} +\setinterfacecommand{globaldisablemode}{globaldisablemode} +\setinterfacecommand{globalenablemode}{globalenablemode} +\setinterfacecommand{globalpreventmode}{globalpreventmode}  \setinterfacecommand{godown}{بروپایین}  \setinterfacecommand{goto}{بروبه}  \setinterfacecommand{gotobox}{بروبهجعبه} @@ -1541,6 +1604,7 @@  \setinterfacecommand{headnumber}{شمارهسر}  \setinterfacecommand{headsym}{نمادسر}  \setinterfacecommand{headtext}{متنسر} +\setinterfacecommand{heightspanningtext}{heightspanningtext}  \setinterfacecommand{hideblocks}{بلوکهاپنهان}  \setinterfacecommand{high}{بلند}  \setinterfacecommand{hl}{خا} @@ -1572,26 +1636,37 @@  \setinterfacecommand{interactionbuttons}{دکمهپانل}  \setinterfacecommand{interactionmenu}{منویپانل}  \setinterfacecommand{item}{آیتم} +\setinterfacecommand{itemgroup}{itemgroup}  \setinterfacecommand{items}{آیتمها} +\setinterfacecommand{itemtag}{itemtag}  \setinterfacecommand{its}{its}  \setinterfacecommand{keepblocks}{حفظبلوکها} +\setinterfacecommand{kerncharacters}{kerncharacters}  \setinterfacecommand{label}{برچسب}  \setinterfacecommand{labels}{برچسبها}  \setinterfacecommand{labeltext}{متنبرچسب}  \setinterfacecommand{language}{زبان} +\setinterfacecommand{languageCharacters}{languageCharacters} +\setinterfacecommand{languagecharacters}{languagecharacters}  \setinterfacecommand{leftaligned}{چپچین} +\setinterfacecommand{leftbottombox}{leftbottombox}  \setinterfacecommand{leftedgedistance}{فاصلهلبهچپ}  \setinterfacecommand{leftedgewidth}{عرضلبهچپ} +\setinterfacecommand{leftline}{leftline}  \setinterfacecommand{leftmargindistance}{فاصلهحاشیهچپ}  \setinterfacecommand{leftmarginwidth}{عرضحاشیهچپ}  \setinterfacecommand{leg}{پا}  \setinterfacecommand{linecorrection}{linecorrection} +\setinterfacecommand{linenote}{linenote} +\setinterfacecommand{linespanningtext}{linespanningtext}  \setinterfacecommand{linewidth}{عرضخط}  \setinterfacecommand{listheight}{ارتفاعخط}  \setinterfacecommand{listlength}{طوللیست}  \setinterfacecommand{listsymbol}{نمادلیست}  \setinterfacecommand{listwidth}{عرضلیست} +\setinterfacecommand{loadfontgoodies}{loadfontgoodies}  \setinterfacecommand{localfootnotes}{localfootnotes} +\setinterfacecommand{localnotes}{localnotes}  \setinterfacecommand{logfields}{میدانهایگزارش}  \setinterfacecommand{lohi}{پابا}  \setinterfacecommand{low}{پایین} @@ -1622,6 +1697,7 @@  \setinterfacecommand{nodimension}{بدونبعد}  \setinterfacecommand{noheaderandfooterlines}{بدونخطسروتهبرگ}  \setinterfacecommand{noindenting}{بدونتورفتگی} +\setinterfacecommand{noitem}{noitem}  \setinterfacecommand{nolist}{بدونلیست}  \setinterfacecommand{nomarking}{بدوننشانهگذاری}  \setinterfacecommand{nomoreblocks}{بدونبلوکهایبیشتر} @@ -1629,6 +1705,7 @@  \setinterfacecommand{nop}{منفی}  \setinterfacecommand{nospace}{بدونفضا}  \setinterfacecommand{note}{یادداشت} +\setinterfacecommand{notesymbol}{notesymbol}  \setinterfacecommand{notopandbottomlines}{بدونخطبالاوپایین}  \setinterfacecommand{notsmallcapped}{سرپوشکوچکنه}  \setinterfacecommand{nowhitespace}{بدونفضایسفید} @@ -1640,6 +1717,7 @@  \setinterfacecommand{outermarginwidth}{عرضحاشیهخارجی}  \setinterfacecommand{packed}{فشرده}  \setinterfacecommand{page}{صفحه} +\setinterfacecommand{pagebreak}{pagebreak}  \setinterfacecommand{pagedepth}{عمقصفحه}  \setinterfacecommand{pagenumber}{شمارهصفحه}  \setinterfacecommand{pageoffset}{آفستصفحه} @@ -1658,7 +1736,10 @@  \setinterfacecommand{placelist}{درجلیست}  \setinterfacecommand{placelistofsynonyms}{placelistofsynonyms}  \setinterfacecommand{placelocalfootnotes}{درجپانوشتهایموضعی} +\setinterfacecommand{placelocalnotes}{placelocalnotes}  \setinterfacecommand{placelogos}{درجآرمها} +\setinterfacecommand{placenamedfloat}{placenamedfloat} +\setinterfacecommand{placenotes}{placenotes}  \setinterfacecommand{placeongrid}{درجدرتوری}  \setinterfacecommand{placeontopofeachother}{درجدربالاییکدیگر}  \setinterfacecommand{placepagenumber}{درجشمارهصفحه} @@ -1671,9 +1752,17 @@  \setinterfacecommand{placetextvariable}{درجمتغیرمتن}  \setinterfacecommand{position}{مکان}  \setinterfacecommand{positiontext}{مکانمتن} +\setinterfacecommand{postponenotes}{postponenotes} +\setinterfacecommand{postponingnotes}{postponingnotes} +\setinterfacecommand{predefinedfont}{predefinedfont} +\setinterfacecommand{predefinefont}{predefinefont} +\setinterfacecommand{presetdocument}{presetdocument} +\setinterfacecommand{prettyprintbuffer}{prettyprintbuffer} +\setinterfacecommand{preventmode}{preventmode}  \setinterfacecommand{printpaperheight}{چاپارتفاعبرگ}  \setinterfacecommand{printpaperwidth}{چاپعرضبرگ}  \setinterfacecommand{processblocks}{بلوکهایپردازش} +\setinterfacecommand{processbodyfontenvironmentlist}{processbodyfontenvironmentlist}  \setinterfacecommand{processpage}{صفحهپردازش}  \setinterfacecommand{product}{تولید}  \setinterfacecommand{program}{برنامه} @@ -1683,19 +1772,45 @@  \setinterfacecommand{quote}{نقل}  \setinterfacecommand{ran}{ran}  \setinterfacecommand{redo}{انجامدوباره} +\setinterfacecommand{redoconvertfont}{redoconvertfont}  \setinterfacecommand{ref}{رج}  \setinterfacecommand{reference}{مرجع}  \setinterfacecommand{referral}{رجوع}  \setinterfacecommand{referraldate}{تاریخرجوع}  \setinterfacecommand{referring}{مراجعه} +\setinterfacecommand{registerfontclass}{registerfontclass} +\setinterfacecommand{registerhyphenationexception}{registerhyphenationexception} +\setinterfacecommand{registerhyphenationpattern}{registerhyphenationpattern}  \setinterfacecommand{remark}{توجه} +\setinterfacecommand{replacefeature}{replacefeature}  \setinterfacecommand{reset}{بازنشانی} +\setinterfacecommand{resetandaddfeature}{resetandaddfeature} +\setinterfacecommand{resetcharacteralign}{resetcharacteralign} +\setinterfacecommand{resetcharacterkerning}{resetcharacterkerning} +\setinterfacecommand{resetcharacterspacing}{resetcharacterspacing} +\setinterfacecommand{resetcharacterstripping}{resetcharacterstripping} +\setinterfacecommand{resetfeature}{resetfeature} +\setinterfacecommand{resetfontcolorsheme}{resetfontcolorsheme} +\setinterfacecommand{resetfontfallback}{resetfontfallback} +\setinterfacecommand{resetfontsolution}{resetfontsolution} +\setinterfacecommand{resethyphenationfeatures}{resethyphenationfeatures} +\setinterfacecommand{resetlocalfloats}{resetlocalfloats}  \setinterfacecommand{resetmarking}{بازنشانینشانهگذاری} +\setinterfacecommand{resetmode}{resetmode}  \setinterfacecommand{resetnumber}{بازنشانیشماره} +\setinterfacecommand{resetpath}{resetpath} +\setinterfacecommand{resetperiodkerning}{resetperiodkerning} +\setinterfacecommand{resetsystemmode}{resetsystemmode}  \setinterfacecommand{resettext}{بازنشانیمتن} +\setinterfacecommand{resetvisualizers}{resetvisualizers} +\setinterfacecommand{restoreglobalbodyfont}{restoreglobalbodyfont} +\setinterfacecommand{retestfeature}{retestfeature} +\setinterfacecommand{revivefeature}{revivefeature}  \setinterfacecommand{rightaligned}{تنظیمراست} +\setinterfacecommand{rightbottombox}{rightbottombox}  \setinterfacecommand{rightedgedistance}{فاصلهلبهراست}  \setinterfacecommand{rightedgewidth}{عرضلبهراست} +\setinterfacecommand{rightline}{rightline}  \setinterfacecommand{rightmargindistance}{فاصلهحاشیهراست}  \setinterfacecommand{rightmarginwidth}{عرضحاشیهراست}  \setinterfacecommand{romannumerals}{اعدادلاتین} @@ -1706,12 +1821,38 @@  \setinterfacecommand{selectblocks}{انتخاببلوکها}  \setinterfacecommand{selectpaper}{انتخاببرگ}  \setinterfacecommand{selectversion}{انتخابنسخه} +\setinterfacecommand{setbigbodyfont}{setbigbodyfont} +\setinterfacecommand{setcharacteralign}{setcharacteralign} +\setinterfacecommand{setcharacteraligndetail}{setcharacteraligndetail} +\setinterfacecommand{setcharactercasing}{setcharactercasing} +\setinterfacecommand{setcharactercleaning}{setcharactercleaning} +\setinterfacecommand{setcharacterkerning}{setcharacterkerning} +\setinterfacecommand{setcharacterspacing}{setcharacterspacing} +\setinterfacecommand{setcharacterstripping}{setcharacterstripping} +\setinterfacecommand{setcurrentfontclass}{setcurrentfontclass} +\setinterfacecommand{setfirstline}{setfirstline} +\setinterfacecommand{setfirstpasscharacteralign}{setfirstpasscharacteralign} +\setinterfacecommand{setfont}{setfont} +\setinterfacecommand{setfontcolorsheme}{setfontcolorsheme} +\setinterfacecommand{setfontfeature}{setfontfeature} +\setinterfacecommand{setfontsolution}{setfontsolution} +\setinterfacecommand{setfontstrut}{setfontstrut} +\setinterfacecommand{sethyphenationfeatures}{sethyphenationfeatures} +\setinterfacecommand{setmainbodyfont}{setmainbodyfont} +\setinterfacecommand{setmode}{setmode} +\setinterfacecommand{setnote}{setnote} +\setinterfacecommand{setnotetext}{setnotetext}  \setinterfacecommand{setnumber}{تعیینشماره} +\setinterfacecommand{setperiodkerning}{setperiodkerning} +\setinterfacecommand{setsecondpasscharacteralign}{setsecondpasscharacteralign} +\setinterfacecommand{setsmallbodyfont}{setsmallbodyfont} +\setinterfacecommand{setsystemmode}{setsystemmode}  \setinterfacecommand{settextcontent}{تعیینمحتوایمتن}  \setinterfacecommand{settextvariable}{تعیینمتغیرمتن}  \setinterfacecommand{setupalign}{بارگذاریتنظیم}  \setinterfacecommand{setupanswerarea}{setupanswerarea}  \setinterfacecommand{setuparranging}{بارگذاریترتیب} +\setinterfacecommand{setupattachment}{setupattachment}  \setinterfacecommand{setupbackground}{بارگذاریپسزمینه}  \setinterfacecommand{setupbackgrounds}{بارگذاریپسزمینهها}  \setinterfacecommand{setupblackrules}{بارگذاریخطهایسیاه} @@ -1726,6 +1867,9 @@  \setinterfacecommand{setupcapitals}{setupcapitals}  \setinterfacecommand{setupcaption}{بارگذاریشرح}  \setinterfacecommand{setupcaptions}{بارگذاریشرحها} +\setinterfacecommand{setupcharacteralign}{setupcharacteralign} +\setinterfacecommand{setupcharacterkerning}{setupcharacterkerning} +\setinterfacecommand{setupcharacterspacing}{setupcharacterspacing}  \setinterfacecommand{setupclipping}{بارگذاریچیدن}  \setinterfacecommand{setupcolor}{بارگذاریرنگ}  \setinterfacecommand{setupcolors}{بارگذاریرنگها} @@ -1736,6 +1880,7 @@  \setinterfacecommand{setupcombinations}{بارگذاریترکیبها}  \setinterfacecommand{setupcombinedlist}{بارگذاریلیستترکیبی}  \setinterfacecommand{setupcomment}{بارگذاریتوضیح} +\setinterfacecommand{setupcounter}{setupcounter}  \setinterfacecommand{setupdescription}{setupdescription}  \setinterfacecommand{setupdescriptions}{بارگذاریشرح}  \setinterfacecommand{setupenumeration}{setupenumeration} @@ -1745,9 +1890,14 @@  \setinterfacecommand{setupfields}{بارگذاریمیدانها}  \setinterfacecommand{setupfillinlines}{بارگذاریپرکردنخطها}  \setinterfacecommand{setupfillinrules}{بارگذاریدرجدرخطها} +\setinterfacecommand{setupfirstline}{setupfirstline}  \setinterfacecommand{setupfloat}{بارگذاریشناور}  \setinterfacecommand{setupfloats}{بارگذاریشناورها}  \setinterfacecommand{setupfloatsplitting}{بارگذاریشکافتنشناورها} +\setinterfacecommand{setupfontexpansion}{setupfontexpansion} +\setinterfacecommand{setupfontprotrusion}{setupfontprotrusion} +\setinterfacecommand{setupfonts}{setupfonts} +\setinterfacecommand{setupfontsolution}{setupfontsolution}  \setinterfacecommand{setupfooter}{بارگذاریتهبرگ}  \setinterfacecommand{setupfootertexts}{بارگذاریمتنپانوشت}  \setinterfacecommand{setupfootnotedefinition}{بارگذاریتعریفپانوشت} @@ -1764,6 +1914,7 @@  \setinterfacecommand{setupheadnumber}{بارگذاریشمارهسر}  \setinterfacecommand{setupheads}{بارگذاریسرها}  \setinterfacecommand{setupheadtext}{بارگذاریمتنسر} +\setinterfacecommand{setuphyphenation}{setuphyphenation}  \setinterfacecommand{setuphyphenmark}{بارگذارینشانهشکستن}  \setinterfacecommand{setupindentedtext}{setupindentedtext}  \setinterfacecommand{setupindenting}{بارگذاریتورفتگی} @@ -1780,6 +1931,7 @@  \setinterfacecommand{setuplanguage}{بارگذاریزبان}  \setinterfacecommand{setuplayout}{بارگذاریطرحبندی}  \setinterfacecommand{setuplegend}{بارگذاریراهنما} +\setinterfacecommand{setuplinenote}{setuplinenote}  \setinterfacecommand{setuplinenumbering}{بارگذاریشمارهگذاریخط}  \setinterfacecommand{setuplines}{بارگذاریخطها}  \setinterfacecommand{setuplinewidth}{بارگذاریعرضخط} @@ -1792,6 +1944,10 @@  \setinterfacecommand{setupmarking}{بارگذارینشانهگذاری}  \setinterfacecommand{setupmathalignment}{بارگذاریتنظیمریاضی}  \setinterfacecommand{setupnarrower}{بارگذاریباریکتر} +\setinterfacecommand{setupnotation}{setupnotation} +\setinterfacecommand{setupnotations}{setupnotations} +\setinterfacecommand{setupnote}{setupnote} +\setinterfacecommand{setupnotes}{setupnotes}  \setinterfacecommand{setupnumber}{بارگذاریشماره}  \setinterfacecommand{setupnumbering}{بارگذاریشمارهگذاری}  \setinterfacecommand{setupoppositeplacing}{بارگذاریدرجمخالف} @@ -1805,6 +1961,7 @@  \setinterfacecommand{setuppapersize}{بارگذاریاندازهبرگ}  \setinterfacecommand{setupparagraphnumbering}{بارگذاریشمارهگذاریپاراگراف}  \setinterfacecommand{setupparagraphs}{بارگذاریپاراگرافها} +\setinterfacecommand{setupperiodkerning}{setupperiodkerning}  \setinterfacecommand{setupplacement}{بارگذاریجانشانی}  \setinterfacecommand{setuppositioning}{بارگذاریمکانگذاری}  \setinterfacecommand{setupprofiles}{بارگذاریپروفایلها} @@ -1834,6 +1991,7 @@  \setinterfacecommand{setuptabulate}{بارگذاریجدولبندی}  \setinterfacecommand{setuptext}{بارگذاریمتن}  \setinterfacecommand{setuptextbackground}{setuptextbackground} +\setinterfacecommand{setuptextnote}{setuptextnote}  \setinterfacecommand{setuptextposition}{بارگذاریمکانمتن}  \setinterfacecommand{setuptextrules}{بارگذاریخطهایمتن}  \setinterfacecommand{setuptexttexts}{بارگذاریمتنمتنها} @@ -1848,16 +2006,29 @@  \setinterfacecommand{setupurl}{setupurl}  \setinterfacecommand{setupversions}{بارگذارینسخهها}  \setinterfacecommand{setupwhitespace}{بارگذاریفضایسفید} +\setinterfacecommand{setvisualizerfont}{setvisualizerfont}  \setinterfacecommand{showbodyfont}{نمایشقلمبدنه}  \setinterfacecommand{showbodyfontenvironment}{نمایشمحیطقلمبدنه}  \setinterfacecommand{showcolor}{نمایشرنگ}  \setinterfacecommand{showcolorgroup}{نمایشگروهرنگ} +\setinterfacecommand{showcounter}{showcounter}  \setinterfacecommand{showexternalfigures}{نمایششکلهایخارجی}  \setinterfacecommand{showfields}{نمایشمیدانها} +\setinterfacecommand{showfont}{showfont} +\setinterfacecommand{showfontdata}{showfontdata} +\setinterfacecommand{showfontexpansion}{showfontexpansion} +\setinterfacecommand{showfontitalics}{showfontitalics} +\setinterfacecommand{showfontkerns}{showfontkerns} +\setinterfacecommand{showfontparameters}{showfontparameters} +\setinterfacecommand{showfontstrip}{showfontstrip} +\setinterfacecommand{showfontstyle}{showfontstyle}  \setinterfacecommand{showframe}{نمایشقالب}  \setinterfacecommand{showgrid}{نمایشتوری} +\setinterfacecommand{showhyphenationtrace}{showhyphenationtrace} +\setinterfacecommand{showkerning}{showkerning}  \setinterfacecommand{showlayout}{نمایشطرحبندی}  \setinterfacecommand{showmakeup}{نمایشآرایش} +\setinterfacecommand{showminimalbaseline}{showminimalbaseline}  \setinterfacecommand{showpalet}{نمایشلوح}  \setinterfacecommand{showprint}{نمایشچاپ}  \setinterfacecommand{showsetups}{نمایشبارگذاریها} @@ -1867,6 +2038,7 @@  \setinterfacecommand{someline}{یکخط}  \setinterfacecommand{somewhere}{یکجا}  \setinterfacecommand{space}{فضا} +\setinterfacecommand{specialitem}{specialitem}  \setinterfacecommand{splitfloat}{شکافتنشناور}  \setinterfacecommand{startalignment}{شروعتنظیم}  \setinterfacecommand{startbackground}{شروعپسزمینه} @@ -1884,6 +2056,7 @@  \setinterfacecommand{startglobal}{شروعسراسری}  \setinterfacecommand{startline}{شروعخط}  \setinterfacecommand{startlinecorrection}{شروعتصحیحخط} +\setinterfacecommand{startlinenote}{startlinenote}  \setinterfacecommand{startlinenumbering}{شروعشمارهگذاریخط}  \setinterfacecommand{startlines}{شروعخطها}  \setinterfacecommand{startlocal}{شروعموضعی} @@ -1926,6 +2099,7 @@  \setinterfacecommand{stopglobal}{پایانسراسری}  \setinterfacecommand{stopline}{پایانخط}  \setinterfacecommand{stoplinecorrection}{پایانتصحیحخط} +\setinterfacecommand{stoplinenote}{stoplinenote}  \setinterfacecommand{stoplinenumbering}{پایانشمارهگذاریخط}  \setinterfacecommand{stoplines}{پایانخطها}  \setinterfacecommand{stoplocal}{پایانموضعی} @@ -1953,8 +2127,11 @@  \setinterfacecommand{stopunpacked}{پایانغیرفشرده}  \setinterfacecommand{stopversion}{پایاننسخه}  \setinterfacecommand{stretched}{کشیده} +\setinterfacecommand{strictinspectnextcharacter}{strictinspectnextcharacter} +\setinterfacecommand{stripcharacter}{stripcharacter}  \setinterfacecommand{subformulanumber}{شمارهزیرفرمول}  \setinterfacecommand{subpagenumber}{شمارهزیرصفحه} +\setinterfacecommand{subtractfeature}{subtractfeature}  \setinterfacecommand{switchtobodyfont}{تغییربهقلمبدنه}  \setinterfacecommand{switchtorawfont}{تغییربهقلمخام}  \setinterfacecommand{sym}{نم} @@ -1964,16 +2141,24 @@  \setinterfacecommand{synchronize}{تطابق}  \setinterfacecommand{tab}{تب}  \setinterfacecommand{testcolumn}{ستونامتحان} +\setinterfacecommand{testfeature}{testfeature} +\setinterfacecommand{testfeatureonce}{testfeatureonce}  \setinterfacecommand{testpage}{صفحهتست}  \setinterfacecommand{tex}{تک}  \setinterfacecommand{textbackground}{textbackground} +\setinterfacecommand{textcolor}{textcolor}  \setinterfacecommand{textheight}{ارتفاعمتن} +\setinterfacecommand{textnote}{textnote}  \setinterfacecommand{textreference}{مرجعمتن}  \setinterfacecommand{textrule}{خطمتن}  \setinterfacecommand{textvariable}{متغیر متن}  \setinterfacecommand{textwidth}{عرضمتن} +\setinterfacecommand{thefirstcharacter}{thefirstcharacter} +\setinterfacecommand{thenormalizedbodyfontsize}{thenormalizedbodyfontsize} +\setinterfacecommand{theremainingcharacters}{theremainingcharacters}  \setinterfacecommand{thinrule}{خطنازک}  \setinterfacecommand{thinrules}{خطهاینازک} +\setinterfacecommand{tolinenote}{tolinenote}  \setinterfacecommand{tooltip}{tooltip}  \setinterfacecommand{topdistance}{فاصلهبالا}  \setinterfacecommand{topheight}{ارتفاعبالا} @@ -1984,13 +2169,19 @@  \setinterfacecommand{typ}{typ}  \setinterfacecommand{type}{تایپ}  \setinterfacecommand{typebuffer}{تایپبافر} +\setinterfacecommand{typedefinedbuffer}{typedefinedbuffer}  \setinterfacecommand{typefile}{تایپپرونده} +\setinterfacecommand{typeinlinebuffer}{typeinlinebuffer} +\setinterfacecommand{typing}{typing}  \setinterfacecommand{unitmeaning}{معنیواحد}  \setinterfacecommand{unknown}{ناشناس} +\setinterfacecommand{unregisterhyphenationpattern}{unregisterhyphenationpattern}  \setinterfacecommand{useJSscripts}{useJSscripts}  \setinterfacecommand{useURL}{useURL}  \setinterfacecommand{useXMLfilter}{useXMLfilter}  \setinterfacecommand{useblocks}{استفادهبلوکها} +\setinterfacecommand{usebodyfont}{usebodyfont} +\setinterfacecommand{usebodyfontparameter}{usebodyfontparameter}  \setinterfacecommand{usecommands}{استفادهفرمانها}  \setinterfacecommand{useencoding}{استفادهرمزینه}  \setinterfacecommand{useexternaldocument}{استفادهنوشتارخارجی} @@ -2007,10 +2198,12 @@  \setinterfacecommand{usetypescript}{استفادهدستخطتایپ}  \setinterfacecommand{usetypescriptfile}{استفادهپروندهدستخطتایپ}  \setinterfacecommand{useurl}{useurl} +\setinterfacecommand{verbatim}{verbatim}  \setinterfacecommand{version}{نسخه}  \setinterfacecommand{vl}{خع}  \setinterfacecommand{weekday}{روزهفته}  \setinterfacecommand{whitespace}{فضایسفید} +\setinterfacecommand{widthspanningtext}{widthspanningtext}  \setinterfacecommand{wordright}{کلمهراست}  \setinterfacecommand{writebetweenlist}{بنویسبینلیست}  \setinterfacecommand{writetolist}{بنویسدرلیست} diff --git a/tex/context/base/mkii/mult-ro.mkii b/tex/context/base/mkii/mult-ro.mkii index 29d7fc29b..056125b9c 100644 --- a/tex/context/base/mkii/mult-ro.mkii +++ b/tex/context/base/mkii/mult-ro.mkii @@ -211,6 +211,7 @@  \setinterfacevariable{flushouter}{flushouter}  \setinterfacevariable{flushright}{flushright}  \setinterfacevariable{followingpage}{followingpage} +\setinterfacevariable{font}{font}  \setinterfacevariable{footer}{subsol}  \setinterfacevariable{footnote}{notasubsol}  \setinterfacevariable{force}{fortat} @@ -832,6 +833,7 @@  \setinterfaceconstant{focusin}{focusin}  \setinterfaceconstant{focusoffset}{focusoffset}  \setinterfaceconstant{focusout}{focusout} +\setinterfaceconstant{font}{font}  \setinterfaceconstant{footer}{subsol}  \setinterfaceconstant{footerdistance}{distantasubsol}  \setinterfaceconstant{footerstate}{staresubsol} diff --git a/tex/context/base/mkiv/cont-new.mkiv b/tex/context/base/mkiv/cont-new.mkiv index 0df4eaf93..9408f9e1a 100644 --- a/tex/context/base/mkiv/cont-new.mkiv +++ b/tex/context/base/mkiv/cont-new.mkiv @@ -13,7 +13,7 @@  % \normalend % uncomment this to get the real base runtime -\newcontextversion{2020.07.24 15:15} +\newcontextversion{2020.07.27 16:21}  %D This file is loaded at runtime, thereby providing an excellent place for hacks,  %D patches, extensions and new features. There can be local overloads in cont-loc diff --git a/tex/context/base/mkiv/context.mkiv b/tex/context/base/mkiv/context.mkiv index 128b75ec1..95d207612 100644 --- a/tex/context/base/mkiv/context.mkiv +++ b/tex/context/base/mkiv/context.mkiv @@ -45,7 +45,7 @@  %D {YYYY.MM.DD HH:MM} format.  \edef\contextformat {\jobname} -\edef\contextversion{2020.07.24 15:15} +\edef\contextversion{2020.07.27 16:21}  %D Kind of special: diff --git a/tex/context/base/mkiv/context.mkxl b/tex/context/base/mkiv/context.mkxl index ab4499856..b684d2ad6 100644 --- a/tex/context/base/mkiv/context.mkxl +++ b/tex/context/base/mkiv/context.mkxl @@ -29,7 +29,7 @@  %D {YYYY.MM.DD HH:MM} format.  \edef\contextformat {\jobname} -\edef\contextversion{2020.07.24 15:15} +\edef\contextversion{2020.07.27 16:21}  %D Kind of special: @@ -158,7 +158,7 @@  \loadmarkfile{cldf-bas} % basics / depends on nodes  \loadmkivfile{node-fin} -\loadmarkfile{node-mig} +\loadmkxlfile{node-mig}  %loadmarkfile{node-pag}  \loadmkxlfile{driv-ini} % LMTX diff --git a/tex/context/base/mkiv/core-def.mkiv b/tex/context/base/mkiv/core-def.mkiv index d10527d7b..bb209a8ff 100644 --- a/tex/context/base/mkiv/core-def.mkiv +++ b/tex/context/base/mkiv/core-def.mkiv @@ -49,6 +49,13 @@      \typo_firstline_handle  \to \everypar +\ifcase\contextlmtxmode \else +    \appendtoks +        \spac_paragraph_wrap +        \spac_paragraph_freeze +    \to \everypar +\fi +  \appendtoks      \flushnotes  \to \everydisplay diff --git a/tex/context/base/mkiv/lang-ini.mkiv b/tex/context/base/mkiv/lang-ini.mkiv index f9d7e0f51..946fe6845 100644 --- a/tex/context/base/mkiv/lang-ini.mkiv +++ b/tex/context/base/mkiv/lang-ini.mkiv @@ -311,7 +311,7 @@     \c!time={h,:,m},     \c!date={\v!year,\ ,\v!month,\ ,\v!day},     \c!text=Ag, -   \s!font=] % \v!auto : experimental ! +   \c!font=] % \v!auto : experimental !  % to be tested:  % @@ -486,12 +486,12 @@  \unexpanded\def\setuplanguages    {\setuplanguage[\s!default]} -% \setuplanguages[\s!font=\v!auto] -% \setuplanguage[\s!default][\s!font=\v!auto] -% \setuplanguage[nl][\s!font=\v!auto] +% \setuplanguages[\c!font=\v!auto] +% \setuplanguage[\s!default][\c!font=\v!auto] +% \setuplanguage[nl][\c!font=\v!auto]  \appendtoks -    \edef\p_language_font{\languageparameter\s!font}% +    \edef\p_language_font{\languageparameter\c!font}%      \ifx\p_language_font\empty\else        \ifx\p_language_font\v!auto          \doaddfeature\currentlanguage diff --git a/tex/context/base/mkiv/lang-ini.mkxl b/tex/context/base/mkiv/lang-ini.mkxl index f86628069..490d35997 100644 --- a/tex/context/base/mkiv/lang-ini.mkxl +++ b/tex/context/base/mkiv/lang-ini.mkxl @@ -311,7 +311,7 @@     \c!time={h,:,m},     \c!date={\v!year,\ ,\v!month,\ ,\v!day},     \c!text=Ag, -   \s!font=] % \v!auto : experimental ! +   \c!font=] % \v!auto : experimental !  % to be tested:  % @@ -486,12 +486,12 @@  \unexpanded\def\setuplanguages    {\setuplanguage[\s!default]} -% \setuplanguages[\s!font=\v!auto] -% \setuplanguage[\s!default][\s!font=\v!auto] -% \setuplanguage[nl][\s!font=\v!auto] +% \setuplanguages[\c!font=\v!auto] +% \setuplanguage[\s!default][\c!font=\v!auto] +% \setuplanguage[nl][\c!font=\v!auto]  \appendtoks -    \edef\p_language_font{\languageparameter\s!font}% +    \edef\p_language_font{\languageparameter\c!font}%      \ifempty\p_language_font      \orelse\ifx\p_language_font\v!auto        \doaddfeature\currentlanguage diff --git a/tex/context/base/mkiv/mult-def.lua b/tex/context/base/mkiv/mult-def.lua index 678f17552..3e1f7bb8c 100644 --- a/tex/context/base/mkiv/mult-def.lua +++ b/tex/context/base/mkiv/mult-def.lua @@ -8821,6 +8821,10 @@ return {     ["pe"]="تمرکزبیرون",     ["ro"]="focusout",    }, +  ["font"]={ +   ["en"]="font", +   ["nl"]="font", +  },    ["footer"]={     ["cs"]="upati",     ["de"]="fusszeile", @@ -15577,6 +15581,10 @@ return {     ["fr"]="pagesuccesseur",     ["nl"]="opvolgendepagina",    }, +  ["font"]={ +   ["en"]="font", +   ["nl"]="font", +  },    ["footer"]={     ["cs"]="upati",     ["de"]="fusszeile", diff --git a/tex/context/base/mkiv/node-mig.lmt b/tex/context/base/mkiv/node-mig.lmt new file mode 100644 index 000000000..c19913509 --- /dev/null +++ b/tex/context/base/mkiv/node-mig.lmt @@ -0,0 +1,134 @@ +if not modules then modules = { } end modules ['node-mig'] = { +    version   = 1.001, +    comment   = "companion to node-mig.mkiv", +    author    = "Hans Hagen, PRAGMA-ADE, Hasselt NL", +    copyright = "PRAGMA ADE / ConTeXt Development Team", +    license   = "see context related readme files" +} + +-- todo: insert_after + +local format = string.format + +local trace_migrations = false trackers.register("nodes.migrations", function(v) trace_migrations = v end) + +local report_nodes     = logs.reporter("nodes","migrations") + +local attributes       = attributes +local nodes            = nodes + +local nuts             = nodes.nuts +local tonut            = nuts.tonut + +local getnext          = nuts.getnext +local getid            = nuts.getid +local getlist          = nuts.getlist +local getpost          = nuts.getpost +local getprop          = nuts.getprop + +local setprop          = nuts.setprop +local setlink          = nuts.setlink +local setlist          = nuts.setlist +local setpost          = nuts.setpost + +local count            = nuts.count +local migrate          = nuts.migrate + +local nodecodes        = nodes.nodecodes +local hlist_code       = nodecodes.hlist +local vlist_code       = nodecodes.vlist +local insert_code      = nodecodes.ins +local mark_code        = nodecodes.mark + +local a_migrated       = attributes.private("migrated") + +local migrate_inserts  = false +local migrate_marks    = false +local t_inserts        = 0 +local t_marks          = 0 +local t_sweeps         = 0 + +local trialtypesetting = context.trialtypesetting + +function nodes.handlers.migrate(head,where) +    if head and not trialtypesetting() and where == "alignment" then +        if trace_migrations then +            report_nodes("migration sweep %a",where) +        end +        local current = head +        while current do +            local id = getid(current) +            if (id == vlist_code or id == hlist_code or id == insert_code) and not getprop(current,"migrated") then +                setprop(current,"migrated",true) +                local list = getlist(current) +                if list then +                    t_sweeps = t_sweeps + 1 +                    local h, first, last = migrate(list,migrate_inserts,migrate_marks) +                    if first then +                        if trace_migrations then +                            local ni = count(insert_code,first) +                            local nm = count(mark_code,first) +                            t_inserts = t_inserts + ni +                            t_marks   = t_marks   + nm +                            report_nodes("sweep %a, container %a, %s inserts and %s marks migrated outwards during %a", +                                t_sweeps,nodecodes[id],ni,nm,where) + +                        end +                        local p, t = getpost(current) +                        if p then +                            setlink(t,first) +                        else +                            setpost(current,first) +                        end +                    end +                end +            end +            current = getnext(current) +        end +    end +    return head +end + +statistics.register("node migrations", function() +    if trace_migrations and t_sweeps > 0 then +        return format("%s sweeps, %s inserts moved, %s marks moved",t_sweeps,t_inserts,t_marks) +    end +end) + +-- Since we started with mkiv we had it as experiment but it is about time +-- to have a more formal interface .. it's still optional due to possible +-- side effects. + +local enableaction  = nodes.tasks.enableaction +local disableaction = nodes.tasks.disableaction +local texsetcount   = tex.setcount + +local migrations = { } +nodes.migrations = migrations +local enabled    = false + +local function check() +    if migrate_marks or migrate_inserts then +        if not enabled then +            enableaction("mvlbuilders", "nodes.handlers.migrate") +            enabled = true +            texsetcount("automigrationmode",3) +        end +    else +        if enabled then +            disableaction("mvlbuilders", "nodes.handlers.migrate") +            enabled = false +            texsetcount("automigrationmode",0) +        end +    end +end + +function migrations.setmarks(v) +    migrate_marks = v +    check() +end + +function migrations.setinserts(v) +    migrate_inserts = v +    check() +end diff --git a/tex/context/base/mkiv/node-mig.lua b/tex/context/base/mkiv/node-mig.lua index 6c10625eb..13414c560 100644 --- a/tex/context/base/mkiv/node-mig.lua +++ b/tex/context/base/mkiv/node-mig.lua @@ -14,157 +14,174 @@ local trace_migrations = false trackers.register("nodes.migrations", function(v)  local report_nodes = logs.reporter("nodes","migrations") -local attributes    = attributes -local nodes         = nodes -local enableaction  = nodes.tasks.enableaction +local attributes       = attributes +local nodes            = nodes -local nuts          = nodes.nuts -local tonut         = nuts.tonut +local nuts             = nodes.nuts +local tonut            = nuts.tonut -local getnext       = nuts.getnext -local getid         = nuts.getid -local getlist       = nuts.getlist ------ getattr       = nuts.getattr -local getprop       = nuts.getprop +local getnext          = nuts.getnext +local getid            = nuts.getid +local getlist          = nuts.getlist +local getprop          = nuts.getprop ------ setattr       = nuts.setattr -local setprop       = nuts.setprop -local setlink       = nuts.setlink -local setlist       = nuts.setlist -local setprev       = nuts.setprev -local setnext       = nuts.setnext -local setboth       = nuts.setboth +local setprop          = nuts.setprop +local setlink          = nuts.setlink +local setlist          = nuts.setlist +local setprev          = nuts.setprev +local setnext          = nuts.setnext +local setboth          = nuts.setboth -local remove_node   = nuts.remove +local remove_node      = nuts.remove +local count            = nuts.count -local nodecodes     = nodes.nodecodes -local hlist_code    = nodecodes.hlist -local vlist_code    = nodecodes.vlist -local insert_code   = nodecodes.ins -local mark_code     = nodecodes.mark +local nodecodes        = nodes.nodecodes +local hlist_code       = nodecodes.hlist +local vlist_code       = nodecodes.vlist +local insert_code      = nodecodes.ins +local mark_code        = nodecodes.mark -local a_migrated    = attributes.private("migrated") +local a_migrated       = attributes.private("migrated") +local trialtypesetting = context.trialtypesetting -local migrate_inserts, migrate_marks, inserts_too +local migrate_inserts  = false +local migrate_marks    = false -local t_inserts, t_marks, t_sweeps = 0, 0, 0 +local t_inserts        = 0 +local t_marks          = 0 +local t_sweeps         = 0 -local function locate(head,first,last,ni,nm) +local function locate(head,first,last)      local current = head      while current do          local id = getid(current)          if id == vlist_code or id == hlist_code then              local list = getlist(current)              if list then -                list, first, last, ni, nm = locate(list,first,last,ni,nm) -                setlist(current,list) +                local l +                l, first, last = locate(list,first,last) +                if l ~= list then +                    setlist(current,l) +                end              end              current = getnext(current) -        elseif migrate_inserts and id == insert_code then -            local insert -            head, current, insert = remove_node(head,current) -            if first then -                setnext(insert) -                setlink(last,insert) -            else -                setboth(insert) -                first = insert +        elseif id == insert_code then +            if migrate_inserts then +                local insert +                head, current, insert = remove_node(head,current) +                if first then +                    setnext(insert) +                    setlink(last,insert) +                else +                    setboth(insert) +                    first = insert +                end +                last = insert              end -            last = insert -            ni = ni + 1 -        elseif migrate_marks and id == mark_code then -            local mark -            head, current, mark = remove_node(head,current) -            if first then -                setnext(mark) -                setlink(last,mark) -            else -                setboth(mark) -                first = mark +        elseif id == mark_code then +            if migrate_marks then +                local mark +                head, current, mark = remove_node(head,current) +                if first then +                    setnext(mark) +                    setlink(last,mark) +                else +                    setboth(mark) +                    first = mark +                end +                last = mark              end -            last = mark -            nm = nm + 1          else              current = getnext(current)          end      end -    return head, first, last, ni, nm +    return head, first, last  end  function nodes.handlers.migrate(head,where) -    if head then +    if head and not trialtypesetting() then          if trace_migrations then              report_nodes("migration sweep %a",where)          end          local current = head          while current do              local id = getid(current) -            -- inserts_too is a temp hack, we should only do them when it concerns -            -- newly placed (flushed) inserts - -            -- todo: getprop / setprop - -         -- if id == vlist_code or id == hlist_code or (inserts_too and id == insert_code) and not getattr(current,a_migrated) then -            if id == vlist_code or id == hlist_code or (inserts_too and id == insert_code) and not getprop(current,"migrated") then -             -- setattr(current,a_migrated,1) +            if (id == vlist_code or id == hlist_code or id == insert_code) and not getprop(current,"migrated") then                  setprop(current,"migrated",true) -                t_sweeps = t_sweeps + 1                  local h = getlist(current) -                local first, last, ni, nm -                while h do -                    local id = getid(h) -                    if id == vlist_code or id == hlist_code then -                        h, first, last, ni, nm = locate(h,first,last,0,0) +                if h then +                    t_sweeps = t_sweeps + 1 +                    local first, last +                    while h do +                        local id = getid(h) +                        if id == vlist_code or id == hlist_code then +                            h, first, last = locate(h,first,last) +                        end +                        h = getnext(h)                      end -                    h = getnext(h) -                end -                if first then -                    t_inserts = t_inserts + ni -                    t_marks   = t_marks   + nm -                    if trace_migrations and (ni > 0 or nm > 0) then -                        report_nodes("sweep %a, container %a, %s inserts and %s marks migrated outwards during %a", -                            t_sweeps,nodecodes[id],ni,nm,where) -                    end -                    -- inserts after head, use insert_after -                    local n = getnext(current) -                    if n then -                        setlink(last,n) +                    if first then +                        if trace_migrations then +                            local ni = count(insert_code,first) +                            local nm = count(mark_code,first) +                            t_inserts = t_inserts + ni +                            t_marks   = t_marks   + nm +                            report_nodes("sweep %a, container %a, %s inserts and %s marks migrated outwards during %a", +                                t_sweeps,nodecodes[id],ni,nm,where) +                        end +                        local n = getnext(current) +                        if n then +                            setlink(last,n) +                        end +                        setlink(current,first) +                        current = last                      end -                    setlink(current,first) -                    current = last                  end              end              current = getnext(current)          end -        return head      end +    return head  end --- for the moment this way, this will disappear - -experiments.register("marks.migrate", function(v) -    if v then -        enableaction("mvlbuilders", "nodes.handlers.migrate") +statistics.register("node migrations", function() +    if trace_migrations and t_sweeps > 0 then +        return format("%s sweeps, %s inserts moved, %s marks moved",t_sweeps,t_inserts,t_marks)      end -    migrate_marks = v  end) -experiments.register("inserts.migrate", function(v) -    if v then -        enableaction("mvlbuilders", "nodes.handlers.migrate") -    end -    migrate_inserts = v -end) +-- Since we started with mkiv we had it as experiment but it is about time +-- to have a more formal interface .. it's still optional due to possible +-- side effects. -experiments.register("inserts.migrate.nested", function(v) -    if v then -        enableaction("mvlbuilders", "nodes.handlers.migrate") +local enableaction  = nodes.tasks.enableaction +local disableaction = nodes.tasks.disableaction + +local migrations = { } +nodes.migrations = migrations +local enabled    = false + +local function check() +    if migrate_marks or migrate_inserts then +        if not enabled then +            enableaction("mvlbuilders", "nodes.handlers.migrate") +            enableaction("processors", "nodes.handlers.migrate") +            enabled = true +        end +    else +        if enabled then +            disableaction("mvlbuilders", "nodes.handlers.migrate") +            disableaction("processors", "nodes.handlers.migrate") +            enabled = false +        end      end -    inserts_too = v -end) +end -statistics.register("node migrations", function() -    if trace_migrations and t_sweeps > 0 then -        return format("%s sweeps, %s inserts moved, %s marks moved",t_sweeps,t_inserts,t_marks) -    end -end) +function migrations.setmarks(v) +    migrate_marks = v +    check() +end + +function migrations.setinserts(v) +    migrate_inserts = v +    check() +end diff --git a/tex/context/base/mkiv/node-mig.mkiv b/tex/context/base/mkiv/node-mig.mkiv index 010d009b3..0e76e4794 100644 --- a/tex/context/base/mkiv/node-mig.mkiv +++ b/tex/context/base/mkiv/node-mig.mkiv @@ -13,9 +13,9 @@  \writestatus{loading}{ConTeXt Node Support / Migrations} -%D This is very experimental and although it is used in a -%D real project it mostly serves a testbed for Taco and me so -%D as prelude to extending the inserts mechanism. +%D This is very experimental and although it is used in a real project it mostly +%D serves a testbed for Taco and me so as prelude to extending the inserts +%D mechanism.  %D  %D \starttyping  %D \automigrateinserts @@ -42,20 +42,7 @@  \registerctxluafile{node-mig}{} -\newtoks\everyautomigratefootnotes -\newtoks\everyautomigratemarks - -\def\automigrateinserts{\the\everyautomigratefootnotes} % soon default but does not work (yet) for notes in captions (themselves inserts) -\def\automigratemarks  {\the\everyautomigratemarks} - -\appendtoks -    \let\postponenotes\relax -    \enableexperiments[inserts.migrate,inserts.migrate.nested]% -\to \everyautomigratefootnotes - -\appendtoks -    \writestatus\m!system{migration of marks is normally not needed}% -    \enableexperiments[marks.migrate]% -\to \everyautomigratemarks +\protected\def\automigrateinserts{\setupinsertion[\c!anchoring=\v!auto]} +          \let\automigratemarks   \relax  \protect diff --git a/tex/context/base/mkiv/node-mig.mkxl b/tex/context/base/mkiv/node-mig.mkxl new file mode 100644 index 000000000..f15f87f23 --- /dev/null +++ b/tex/context/base/mkiv/node-mig.mkxl @@ -0,0 +1,44 @@ +%D \module +%D   [       file=node-mig, +%D        version=2010.01.19, +%D          title=\CONTEXT\ Node Macros, +%D       subtitle=Inserts, +%D         author=Hans Hagen, +%D           date=\currentdate, +%D      copyright={PRAGMA ADE \& \CONTEXT\ Development Team}] +%C +%C This module is part of the \CONTEXT\ macro||package and is +%C therefore copyrighted by \PRAGMA. See mreadme.pdf for +%C details. + +\writestatus{loading}{ConTeXt Node Support / Migrations} + +%D \starttyping +%D \automigrateinserts +%D +%D \hbox{\vbox{x\footnote{1}x\footnote{2}x\footnote{3}x}} +%D \vbox{x\footnote{4}x} +%D \hbox{\vbox{x\footnote{5}x}} +%D +%D \hbox{x} +%D \hbox{x\footnote{6}x} +%D \hbox{x} +%D +%D \starttabulate +%D \NC test \NC test \footnote{test} \input tufte \NC \NR +%D \NC test \NC test \footnote{test} \input tufte \NC \NR +%D \NC test \NC test \footnote{test} \input tufte \NC \NR +%D \NC test \NC test \footnote{test} \input tufte \NC \NR +%D \NC test \NC test \footnote{test} \input tufte \NC \NR +%D \NC test \NC test \footnote{test} \input tufte \NC \NR +%D \stoptabulate +%D \stoptyping + +\unprotect + +\registerctxluafile{node-mig}{autosuffix} + +\let\automigrateinserts\relax +\let\automigratemarks  \relax + +\protect diff --git a/tex/context/base/mkiv/node-nut.lua b/tex/context/base/mkiv/node-nut.lua index e9bb71b80..5eed1b2b1 100644 --- a/tex/context/base/mkiv/node-nut.lua +++ b/tex/context/base/mkiv/node-nut.lua @@ -205,6 +205,7 @@ nuts.write                   = direct.write  nuts.mlist_to_hlist          = direct.mlist_to_hlist  nuts.has_dimensions          = direct.has_dimensions  nuts.start_of_par            = direct.start_of_par +nuts.migrate                 = direct.migrate  if not nuts.mlist_to_hlist then diff --git a/tex/context/base/mkiv/page-ins.lua b/tex/context/base/mkiv/page-ins.lua index 0323952d0..8a68e16dd 100644 --- a/tex/context/base/mkiv/page-ins.lua +++ b/tex/context/base/mkiv/page-ins.lua @@ -19,6 +19,7 @@ inserts.data         = inserts.data   or allocate { } -- bytecode storage pool  local variables      = interfaces.variables  local v_page         = variables.page +local v_auto         = variables.auto  local context        = context  local implement      = interfaces.implement @@ -111,3 +112,10 @@ implement {      arguments = "string"  } +implement { +    name      = "setinsertmigration", +    arguments = "string", +    actions   = function(state) +        nodes.migrations.setinserts(state == v_auto) +    end +} diff --git a/tex/context/base/mkiv/page-ins.mkiv b/tex/context/base/mkiv/page-ins.mkiv index 3b473343a..bac31476c 100644 --- a/tex/context/base/mkiv/page-ins.mkiv +++ b/tex/context/base/mkiv/page-ins.mkiv @@ -38,6 +38,31 @@     %c!factor=\plusthousand,     \c!location=\v!page] +\newconstant\insertionmigrationmode + +\def\page_inserts_check_anchoring +  {\edef\p_anchoring{\namedinsertionparameter\empty\c!anchoring}% +   \insertionmigrationmode\ifx\p_anchoring\v!auto\plusone\else\zerocount\fi +   \clf_setinsertmigration{\p_anchoring}} + +\appendtoks +    \ifx\currentinsertionparent\empty +        \page_inserts_check_anchoring +    \fi +\to \everysetupinsertion + +\ifcase\contextlmtxmode +    \setupinsertion +      [\c!anchoring=\v!none] +\else +    \setupinsertion +      [\c!anchoring=\v!auto] +\fi + +\appendtoks +    \page_inserts_check_anchoring +\to \everystarttext % or \everyjob +  \newcount\currentinsertionnumber % This is a count and not a macro !  \newtoks\t_page_inserts_list @@ -63,7 +88,9 @@  % \floatingpenalty\zerocount  \appendtoks -    \page_inserts_synchronize_registers +    \ifx\currentinsertionparent\empty \else +        \page_inserts_synchronize_registers +    \fi  \to \everysetupinsertion  \unexpanded\def\page_inserts_process#1% beware, this adapts currentinsertion ! @@ -131,12 +158,14 @@  \to \everydefineinsertion  \appendtoks -    \clf_setupinsertion -      {\currentinsertion} -      {% -        location {\insertionparameter\c!location}% -      }% -    \relax +    \ifx\currentinsertionparent\empty \else +        \clf_setupinsertion +          {\currentinsertion} +          {% +            location {\insertionparameter\c!location}% +          }% +        \relax +    \fi  \to \everysetupinsertion  \unexpanded\def\page_inserts_set_location#1#2% fast one diff --git a/tex/context/base/mkiv/spac-par.lmt b/tex/context/base/mkiv/spac-par.lmt index ed5b735ec..595eabe62 100644 --- a/tex/context/base/mkiv/spac-par.lmt +++ b/tex/context/base/mkiv/spac-par.lmt @@ -11,6 +11,7 @@ local implement = interfaces.implement  local collected = utilities.storage.allocate()  local tobesaved = utilities.storage.allocate() +local wrappers  = { }  local jobparwrappers = {      collected = collected, @@ -24,18 +25,26 @@ local function initializer()      collected = jobparwrappers.collected  end -job.register('job.parwrappers.collected', tobesaved, initializer) +local function finalizer() +    -- nothing yet +end + +job.register('job.parwrappers.collected', tobesaved, initializer, finalizer)  implement {      name      = "newparwrapper",      arguments = "string",      actions   = function(id)          local t = tobesaved[id] +        local n          if t then -            t[#t+1] = 0 +            n = #t + 1 +            t[n] = 0          else +            n = 1              tobesaved[id] = { 0 }          end +        wrappers[id] = n      end  } @@ -65,6 +74,6 @@ implement {      public    = true,      actions   = function(id)          local t = collected and collected[id] -        context(t and t[#t] or 0) +        context(t and t[wrappers[id]] or 0)      end  } diff --git a/tex/context/base/mkiv/spac-par.mkiv b/tex/context/base/mkiv/spac-par.mkiv index f1745e4f8..aeb7a6da3 100644 --- a/tex/context/base/mkiv/spac-par.mkiv +++ b/tex/context/base/mkiv/spac-par.mkiv @@ -60,6 +60,9 @@  \let\registerparwrapper\gobbletwoarguments  \let\forgetparwrapper  \relax +\let\spac_paragraph_wrap  \relax +\let\spac_paragraph_freeze\relax +  %D Beware, changing this will break some code (like pos/backgrounds) but it has been  %D changed anyway so let's see where things go wrong. diff --git a/tex/context/base/mkiv/spac-par.mkxl b/tex/context/base/mkiv/spac-par.mkxl index b136b5bce..d8abdcfdb 100644 --- a/tex/context/base/mkiv/spac-par.mkxl +++ b/tex/context/base/mkiv/spac-par.mkxl @@ -29,58 +29,53 @@  \installcorenamespace {bparwrap}  \installcorenamespace {eparwrap} +\installcorenamespace {parwrapbefore} +\installcorenamespace {parwrapafter}  \let\spac_paragraph_wrap\relax +\newcount\c_spac_paragraph_group_level +  \protected\def\spac_paragraph_update -  {\ifcsname\??bparwrap\the\currentgrouplevel\endcsname +  {\c_spac_paragraph_group_level\currentgrouplevel\relax +   \ifcsname\??bparwrap\the\c_spac_paragraph_group_level\endcsname       \the\lastnamedcs -     \wrapuppar{\the\csname\??eparwrap\the\currentgrouplevel\endcsname}% +     \wrapuppar{\the\csname\??eparwrap\the\c_spac_paragraph_group_level\endcsname}%     \fi} +\protected\def\registerparwrapper       {\spac_register_par_wrapper\toksapp\tokspre} +\protected\def\registerparwrapperreverse{\spac_register_par_wrapper\tokspre\toksapp}  \protected\def\spac_paragraph_install    {\expandafter\newtoks\csname\??bparwrap\the\currentgrouplevel\endcsname     \expandafter\newtoks\csname\??eparwrap\the\currentgrouplevel\endcsname} -% \protected\def\registerparwrapper#1#2% -%   {\ifcsname\??bparwrap\the\currentgrouplevel\endcsname \else -%      \spac_paragraph_install -%    \fi -%    \toksapp\csname\??bparwrap\the\currentgrouplevel\endcsname{#1}% -%    \tokspre\csname\??eparwrap\the\currentgrouplevel\endcsname{#2}% -%    \let\spac_paragraph_wrap\spac_paragraph_update} - -% \protected\def\registerparwrapperreverse#1#2% -%   {\ifcsname\??bparwrap\the\currentgrouplevel\endcsname \else -%      \spac_paragraph_install -%    \fi -%    \tokspre\csname\??bparwrap\the\currentgrouplevel\endcsname{#1}% -%    \toksapp\csname\??eparwrap\the\currentgrouplevel\endcsname{#2}% -%    \let\spac_paragraph_wrap\spac_paragraph_update} - -\protected\def\registerparwrapper#1#2#3% -  {\ifcsname\??bparwrap\the\currentgrouplevel\endcsname \else -     \spac_paragraph_install -   \fi -   \clf_newparwrapper{#1}% -   \toksapp\csname\??bparwrap\the\currentgrouplevel\endcsname{\clf_setparwrapper{#1}#2}% -   \tokspre\csname\??eparwrap\the\currentgrouplevel\endcsname{#3}% -   \let\spac_paragraph_wrap\spac_paragraph_update} +\def\spac_paragraph_install_pair#1#2#3% +  {\expandafter\newtoks \csname\??parwrapbefore#3\endcsname +   \expandafter\newtoks \csname\??parwrapafter #3\endcsname +   #1\csname\??bparwrap\the\currentgrouplevel\endcsname\expandafter{\expandafter\the\csname\??parwrapbefore#3\endcsname}% +   #2\csname\??eparwrap\the\currentgrouplevel\endcsname\expandafter{\expandafter\the\csname\??parwrapafter #3\endcsname}} -\protected\def\registerparwrapperreverse#1#2#3% +\protected\def\spac_register_par_wrapper#1#2#3#4#5%    {\ifcsname\??bparwrap\the\currentgrouplevel\endcsname \else       \spac_paragraph_install     \fi -   \clf_newparwrapper{#1}% -   \tokspre\csname\??bparwrap\the\currentgrouplevel\endcsname{\clf_setparwrapper{#1}#2}% -   \toksapp\csname\??eparwrap\the\currentgrouplevel\endcsname{#3}% +   \ifcsname\??parwrapbefore#3\endcsname \else +     \spac_paragraph_install_pair#1#2{#3}% +   \fi +   #1\csname\??parwrapbefore#3\endcsname{\clf_setparwrapper{#3}#4}% +   #2\csname\??parwrapafter #3\endcsname{#5}% +   \clf_newparwrapper{#3}%     \let\spac_paragraph_wrap\spac_paragraph_update}  \protected\def\forgetparwrapper    {\csname\??bparwrap\the\currentgrouplevel\endcsname\emptytoks     \csname\??eparwrap\the\currentgrouplevel\endcsname\emptytoks} +\protected\def\unregisterparwrapper#1% +  {\csname\??parwrapbefore#1\endcsname\emptytoks +   \csname\??parwrapafter #1\endcsname\emptytoks} +  % \getparwrapper  % defined in lua  % \lastparwrapper % defined in lua @@ -91,17 +86,22 @@       {\smallinfofont\lastparwrapper{#1}}%     \endgroup} -\appendtoks    \updateparwrapperindeed      \to\everypar -\appendtoks\let\updateparwrapperindeed\relax\to\everyforgetall - -\installtexexperiment -  {paragraphs.freeze} -  {\setparagraphfreezing -   \appendtoksonce\spac_paragraph_wrap  \to  \everypar -   \appendtoksonce\spac_paragraph_freeze\to  \everypar} -  {\forgetparagraphfreezing -   \removetoks    \spac_paragraph_wrap  \from\everypar -   \removetoks    \spac_paragraph_freeze\from\everypar} +%appendtoks\updateparwrapperindeed\to\everypar +%appendtoks\spac_paragraph_wrap   \to\everypar +%appendtoks\spac_paragraph_freeze \to\everypar + +\setparagraphfreezing + +\appendtoks\let\spac_paragraph_wrap\relax\to\everyforgetall + +% \installtexexperiment +%   {paragraphs.freeze} +%   {\setparagraphfreezing +%    \appendtoksonce\spac_paragraph_wrap  \to  \everypar +%    \appendtoksonce\spac_paragraph_freeze\to  \everypar} +%   {\forgetparagraphfreezing +%    \removetoks    \spac_paragraph_wrap  \from\everypar +%    \removetoks    \spac_paragraph_freeze\from\everypar}  %D In due time, the code below will be upgraded using the above mechanisms. diff --git a/tex/context/base/mkiv/status-files.pdf b/tex/context/base/mkiv/status-files.pdfBinary files differ index b6a9c8d6c..43e99e1d7 100644 --- a/tex/context/base/mkiv/status-files.pdf +++ b/tex/context/base/mkiv/status-files.pdf diff --git a/tex/context/base/mkiv/status-lua.pdf b/tex/context/base/mkiv/status-lua.pdfBinary files differ index 3f5dea552..bbba0e977 100644 --- a/tex/context/base/mkiv/status-lua.pdf +++ b/tex/context/base/mkiv/status-lua.pdf diff --git a/tex/context/base/mkiv/strc-not.mkvi b/tex/context/base/mkiv/strc-not.mkvi index b83add08f..bc2fc53eb 100644 --- a/tex/context/base/mkiv/strc-not.mkvi +++ b/tex/context/base/mkiv/strc-not.mkvi @@ -1563,14 +1563,18 @@  % we need a proper state: normal, postponing, flushing  \unexpanded\def\postponenotes -  {\ifconditional\postponingnotes\else -     \global\settrue\postponingnotes -     \glet\flushnotes\doflushnotes -     \clf_postponenotes +  {\ifcase\insertionmigrationmode +     \ifconditional\postponingnotes\else +       \global\settrue\postponingnotes +       \glet\flushnotes\doflushnotes +       \clf_postponenotes +     \fi     \fi}  \let\flushnotes\relax +% also \ifcase\insertionmigrationmode here, needs testing: +  \unexpanded\def\startpostponingnotes % experimental, page-mix    {\ifconditional\postponingnotes\else       \global\settrue\postponingnotes diff --git a/tex/context/base/mkiv/task-ini.lua b/tex/context/base/mkiv/task-ini.lua index 366c7009e..033672f45 100644 --- a/tex/context/base/mkiv/task-ini.lua +++ b/tex/context/base/mkiv/task-ini.lua @@ -66,6 +66,12 @@ appendaction("processors",   "lists",       "typesetters.digits.handler",  appendaction("processors",   "lists",       "typesetters.italics.handler",                      nil, "nut",    "disabled"  )  appendaction("processors",   "lists",       "languages.visualizediscretionaries",               nil, "nut",    "disabled"  ) +if CONTEXTLMTXMODE == 0 then + +appendaction("processors",   "lists",       "nodes.handlers.migrate",                           nil, "nut",    "disabled"  ) + +end +  appendaction("processors",   "after",       "typesetters.marksuspects",                         nil, "nut",    "disabled"  )  appendaction("shipouts",     "normalizers", "nodes.handlers.cleanuppage",                       nil, "nut",    "production") diff --git a/tex/context/base/mkiv/typo-del.mkiv b/tex/context/base/mkiv/typo-del.mkiv index afa7e0ffe..2ccac0e73 100644 --- a/tex/context/base/mkiv/typo-del.mkiv +++ b/tex/context/base/mkiv/typo-del.mkiv @@ -420,7 +420,7 @@     \typo_delimited_push{#1}{#2}%     \dostarttaggedchained\t!delimitedblock\currentdelimitedtext\??delimitedtext     \edef\p_delimited_method{\delimitedtextparameter\c!method}% -   \ifx\p_delimited_method\s!font +   \ifx\p_delimited_method\v!font       \expandafter\typo_delimited_start_font     \else       \expandafter\typo_delimited_start_other @@ -579,7 +579,7 @@    {\dontleavehmode % following ones can be omited     \typo_delimited_push{#1}{#2}%     \edef\p_delimited_method{\delimitedtextparameter\c!method}% -   \ifx\p_delimited_method\s!font +   \ifx\p_delimited_method\v!font       \expandafter\typo_delimited_fontdriven     \else       \expandafter\typo_delimited_other diff --git a/tex/context/base/mkiv/typo-drp.mkiv b/tex/context/base/mkiv/typo-drp.mkiv index 6ed7e8bfe..e774b6796 100644 --- a/tex/context/base/mkiv/typo-drp.mkiv +++ b/tex/context/base/mkiv/typo-drp.mkiv @@ -59,9 +59,9 @@     \c!n=3,     \c!m=1,     \c!method=\v!none, - % \s!font=Bold sa 4, - % \s!font=Bold ht \measure{initial:n}, -   \s!font=Bold cp \measure{initial:n}, + % \c!font=Bold sa 4, + % \c!font=Bold ht \measure{initial:n}, +   \c!font=Bold cp \measure{initial:n},     \c!distance=.125\emwidth,     \c!hoffset=\zeropoint,     \c!voffset=\v!line, % \dimexp\lineheight*\initialparameter\c!n-\lineheight\relax] @@ -90,7 +90,7 @@     \setupcurrentinitial[#2]%     \resetfontfeature % might be needed in more places     \doifelsenothing{\initialparameter\c!style} -     {\definedfont[\initialparameter\s!font]} +     {\definedfont[\initialparameter\c!font]}       {\useinitialstyleparameter\c!style}%     \useinitialcolorparameter\c!color     \edef\p_voffset{\initialparameter\c!voffset}% diff --git a/tex/context/interface/mkii/keys-en.xml b/tex/context/interface/mkii/keys-en.xml index 00922e743..afb377928 100644 --- a/tex/context/interface/mkii/keys-en.xml +++ b/tex/context/interface/mkii/keys-en.xml @@ -131,6 +131,9 @@  		<cd:variable name='camel' value='camel'/>  		<cd:variable name='cap' value='cap'/>  		<cd:variable name='capital' value='capital'/> +		<cd:variable name='category' value='category'/> +		<cd:variable name='cd:character' value='cd:character'/> +		<cd:variable name='cd:font' value='cd:font'/>  		<cd:variable name='center' value='center'/>  		<cd:variable name='centerlast' value='centerlast'/>  		<cd:variable name='chapter' value='chapter'/> @@ -189,6 +192,7 @@  		<cd:variable name='external' value='external'/>  		<cd:variable name='extremestretch' value='extremestretch'/>  		<cd:variable name='fact' value='fact'/> +		<cd:variable name='fallback' value='fallback'/>  		<cd:variable name='february' value='february'/>  		<cd:variable name='field' value='field'/>  		<cd:variable name='figure' value='figure'/> @@ -210,6 +214,7 @@  		<cd:variable name='flushouter' value='flushouter'/>  		<cd:variable name='flushright' value='flushright'/>  		<cd:variable name='followingpage' value='followingpage'/> +		<cd:variable name='font' value='font'/>  		<cd:variable name='footer' value='footer'/>  		<cd:variable name='footnote' value='footnote'/>  		<cd:variable name='force' value='force'/> @@ -810,8 +815,10 @@  		<cd:constant name='extras' value='extras'/>  		<cd:constant name='factor' value='factor'/>  		<cd:constant name='fallback' value='fallback'/> +		<cd:constant name='fallbacks' value='fallbacks'/>  		<cd:constant name='family' value='family'/>  		<cd:constant name='features' value='features'/> +		<cd:constant name='featureset' value='featureset'/>  		<cd:constant name='fences' value='fences'/>  		<cd:constant name='field' value='field'/>  		<cd:constant name='fieldbackgroundcolor' value='fieldbackgroundcolor'/> @@ -832,6 +839,7 @@  		<cd:constant name='focusin' value='focusin'/>  		<cd:constant name='focusoffset' value='focusoffset'/>  		<cd:constant name='focusout' value='focusout'/> +		<cd:constant name='font' value='font'/>  		<cd:constant name='footer' value='footer'/>  		<cd:constant name='footerdistance' value='footerdistance'/>  		<cd:constant name='footerstate' value='footerstate'/> @@ -886,6 +894,7 @@  		<cd:constant name='increment' value='increment'/>  		<cd:constant name='incrementnumber' value='incrementnumber'/>  		<cd:constant name='indenting' value='indenting'/> +		<cd:constant name='indentlist' value='indentlist'/>  		<cd:constant name='indentnext' value='indentnext'/>  		<cd:constant name='index' value='index'/>  		<cd:constant name='indicator' value='indicator'/> @@ -1090,6 +1099,7 @@  		<cd:constant name='period' value='period'/>  		<cd:constant name='place' value='place'/>  		<cd:constant name='placehead' value='placehead'/> +		<cd:constant name='placeholder' value='placeholder'/>  		<cd:constant name='placestopper' value='placestopper'/>  		<cd:constant name='position' value='position'/>  		<cd:constant name='prefix' value='prefix'/> @@ -1379,8 +1389,18 @@  		<cd:command name='Word' value='Word'/>  		<cd:command name='Words' value='Words'/>  		<cd:command name='about' value='about'/> +		<cd:command name='adaptfontfeature' value='adaptfontfeature'/>  		<cd:command name='adaptlayout' value='adaptlayout'/> +		<cd:command name='addfeature' value='addfeature'/> +		<cd:command name='alignbottom' value='alignbottom'/> +		<cd:command name='aligned' value='aligned'/> +		<cd:command name='alignedbox' value='alignedbox'/> +		<cd:command name='alignedline' value='alignedline'/> +		<cd:command name='alignhere' value='alignhere'/>  		<cd:command name='alignment' value='alignment'/> +		<cd:command name='alignmentcharacter' value='alignmentcharacter'/> +		<cd:command name='applytocharacters' value='applytocharacters'/> +		<cd:command name='applytofirstcharacter' value='applytofirstcharacter'/>  		<cd:command name='arg' value='arg'/>  		<cd:command name='at' value='at'/>  		<cd:command name='atleftmargin' value='atleftmargin'/> @@ -1392,9 +1412,13 @@  		<cd:command name='blackrules' value='blackrules'/>  		<cd:command name='blank' value='blank'/>  		<cd:command name='bookmark' value='bookmark'/> +		<cd:command name='bottombox' value='bottombox'/>  		<cd:command name='bottomdistance' value='bottomdistance'/>  		<cd:command name='bottomheight' value='bottomheight'/> +		<cd:command name='bottomleftbox' value='bottomleftbox'/> +		<cd:command name='bottomrightbox' value='bottomrightbox'/>  		<cd:command name='bottomspace' value='bottomspace'/> +		<cd:command name='buildtextbottomdot' value='buildtextbottomdot'/>  		<cd:command name='but' value='but'/>  		<cd:command name='button' value='button'/>  		<cd:command name='bypassblocks' value='bypassblocks'/> @@ -1433,8 +1457,11 @@  		<cd:command name='defineblock' value='defineblock'/>  		<cd:command name='definebodyfont' value='definebodyfont'/>  		<cd:command name='definebodyfontenvironment' value='definebodyfontenvironment'/> +		<cd:command name='definebodyfontswitch' value='definebodyfontswitch'/>  		<cd:command name='definebuffer' value='definebuffer'/>  		<cd:command name='definecharacter' value='definecharacter'/> +		<cd:command name='definecharacterkerning' value='definecharacterkerning'/> +		<cd:command name='definecharacterspacing' value='definecharacterspacing'/>  		<cd:command name='definecolor' value='definecolor'/>  		<cd:command name='definecolorgroup' value='definecolorgroup'/>  		<cd:command name='definecolumnbreak' value='definecolumnbreak'/> @@ -1444,37 +1471,57 @@  		<cd:command name='definecommand' value='definecommand'/>  		<cd:command name='defineconversion' value='defineconversion'/>  		<cd:command name='definedescription' value='definedescription'/> +		<cd:command name='definedfont' value='definedfont'/>  		<cd:command name='defineenumeration' value='defineenumeration'/> +		<cd:command name='definefallbackfamily' value='definefallbackfamily'/>  		<cd:command name='definefield' value='definefield'/>  		<cd:command name='definefieldstack' value='definefieldstack'/>  		<cd:command name='definefiguresymbol' value='definefiguresymbol'/> +		<cd:command name='definefilefallback' value='definefilefallback'/> +		<cd:command name='definefirstline' value='definefirstline'/>  		<cd:command name='definefloat' value='definefloat'/>  		<cd:command name='definefont' value='definefont'/> +		<cd:command name='definefontalternative' value='definefontalternative'/> +		<cd:command name='definefontfallback' value='definefontfallback'/> +		<cd:command name='definefontfamily' value='definefontfamily'/> +		<cd:command name='definefontfamilypreset' value='definefontfamilypreset'/> +		<cd:command name='definefontfeature' value='definefontfeature'/> +		<cd:command name='definefontfile' value='definefontfile'/> +		<cd:command name='definefontsize' value='definefontsize'/> +		<cd:command name='definefontsolution' value='definefontsolution'/>  		<cd:command name='definefontstyle' value='definefontstyle'/>  		<cd:command name='definefontsynonym' value='definefontsynonym'/>  		<cd:command name='defineframed' value='defineframed'/>  		<cd:command name='defineframedtext' value='defineframedtext'/> +		<cd:command name='definefrozenfont' value='definefrozenfont'/>  		<cd:command name='definehbox' value='definehbox'/>  		<cd:command name='definehead' value='definehead'/> +		<cd:command name='definehyphenationfeatures' value='definehyphenationfeatures'/>  		<cd:command name='defineindentedtext' value='defineindentedtext'/>  		<cd:command name='defineinmargin' value='defineinmargin'/>  		<cd:command name='defineinteractionmenu' value='defineinteractionmenu'/>  		<cd:command name='defineitemgroup' value='defineitemgroup'/> +		<cd:command name='defineitems' value='defineitems'/>  		<cd:command name='definelabel' value='definelabel'/>  		<cd:command name='definelayer' value='definelayer'/>  		<cd:command name='definelayout' value='definelayout'/> +		<cd:command name='definelinenote' value='definelinenote'/>  		<cd:command name='definelist' value='definelist'/>  		<cd:command name='definelogo' value='definelogo'/>  		<cd:command name='definemainfield' value='definemainfield'/>  		<cd:command name='definemakeup' value='definemakeup'/>  		<cd:command name='definemarking' value='definemarking'/>  		<cd:command name='definemathalignment' value='definemathalignment'/> +		<cd:command name='definemode' value='definemode'/> +		<cd:command name='definenamedcolor' value='definenamedcolor'/> +		<cd:command name='definenote' value='definenote'/>  		<cd:command name='defineoutput' value='defineoutput'/>  		<cd:command name='defineoverlay' value='defineoverlay'/>  		<cd:command name='definepagebreak' value='definepagebreak'/>  		<cd:command name='definepalet' value='definepalet'/>  		<cd:command name='definepapersize' value='definepapersize'/>  		<cd:command name='defineparagraphs' value='defineparagraphs'/> +		<cd:command name='defineperiodkerning' value='defineperiodkerning'/>  		<cd:command name='defineplacement' value='defineplacement'/>  		<cd:command name='defineprofile' value='defineprofile'/>  		<cd:command name='defineprogram' value='defineprogram'/> @@ -1496,33 +1543,45 @@  		<cd:command name='definetabulate' value='definetabulate'/>  		<cd:command name='definetext' value='definetext'/>  		<cd:command name='definetextbackground' value='definetextbackground'/> +		<cd:command name='definetextnote' value='definetextnote'/>  		<cd:command name='definetextposition' value='definetextposition'/>  		<cd:command name='definetextvariable' value='definetextvariable'/>  		<cd:command name='definetype' value='definetype'/>  		<cd:command name='definetyping' value='definetyping'/>  		<cd:command name='defineversion' value='defineversion'/> +		<cd:command name='depthspanningtext' value='depthspanningtext'/>  		<cd:command name='determineheadnumber' value='determineheadnumber'/>  		<cd:command name='determinelistcharacteristics' value='determinelistcharacteristics'/>  		<cd:command name='determineregistercharacteristics' value='determineregistercharacteristics'/>  		<cd:command name='dimension' value='dimension'/>  		<cd:command name='disableinteractionmenu' value='disableinteractionmenu'/> +		<cd:command name='disablemode' value='disablemode'/> +		<cd:command name='doaddfeature' value='doaddfeature'/>  		<cd:command name='domicile' value='domicile'/> +		<cd:command name='dontconvertfont' value='dontconvertfont'/>  		<cd:command name='donttest' value='donttest'/>  		<cd:command name='edgedistance' value='edgedistance'/>  		<cd:command name='edgewidth' value='edgewidth'/> +		<cd:command name='emphasisboldface' value='emphasisboldface'/>  		<cd:command name='emptylines' value='emptylines'/> +		<cd:command name='enablemode' value='enablemode'/>  		<cd:command name='environment' value='environment'/>  		<cd:command name='externalfigure' value='externalfigure'/>  		<cd:command name='fact' value='fact'/> +		<cd:command name='fastswitchtobodyfont' value='fastswitchtobodyfont'/> +		<cd:command name='feature' value='feature'/>  		<cd:command name='field' value='field'/>  		<cd:command name='fieldstack' value='fieldstack'/>  		<cd:command name='fillinfield' value='fillinfield'/>  		<cd:command name='fillinline' value='fillinline'/>  		<cd:command name='fillinrules' value='fillinrules'/>  		<cd:command name='fillintext' value='fillintext'/> +		<cd:command name='firstcharacter' value='firstcharacter'/>  		<cd:command name='fitfield' value='fitfield'/> +		<cd:command name='fittopbaselinegrid' value='fittopbaselinegrid'/>  		<cd:command name='fixedspace' value='fixedspace'/>  		<cd:command name='fixedspaces' value='fixedspaces'/> +		<cd:command name='flushnotes' value='flushnotes'/>  		<cd:command name='followprofile' value='followprofile'/>  		<cd:command name='followprofileversion' value='followprofileversion'/>  		<cd:command name='followversion' value='followversion'/> @@ -1531,13 +1590,19 @@  		<cd:command name='footnote' value='footnote'/>  		<cd:command name='footnotetext' value='footnotetext'/>  		<cd:command name='forceblocks' value='forceblocks'/> +		<cd:command name='forcecharacterstripping' value='forcecharacterstripping'/>  		<cd:command name='formulanumber' value='formulanumber'/>  		<cd:command name='fraction' value='fraction'/>  		<cd:command name='framed' value='framed'/>  		<cd:command name='from' value='from'/> +		<cd:command name='fromlinenote' value='fromlinenote'/>  		<cd:command name='getbuffer' value='getbuffer'/> +		<cd:command name='getfirstcharacter' value='getfirstcharacter'/>  		<cd:command name='getmarking' value='getmarking'/>  		<cd:command name='getnumber' value='getnumber'/> +		<cd:command name='globaldisablemode' value='globaldisablemode'/> +		<cd:command name='globalenablemode' value='globalenablemode'/> +		<cd:command name='globalpreventmode' value='globalpreventmode'/>  		<cd:command name='godown' value='godown'/>  		<cd:command name='goto' value='goto'/>  		<cd:command name='gotobox' value='gotobox'/> @@ -1553,6 +1618,7 @@  		<cd:command name='headnumber' value='headnumber'/>  		<cd:command name='headsym' value='headsym'/>  		<cd:command name='headtext' value='headtext'/> +		<cd:command name='heightspanningtext' value='heightspanningtext'/>  		<cd:command name='hideblocks' value='hideblocks'/>  		<cd:command name='high' value='high'/>  		<cd:command name='hl' value='hl'/> @@ -1584,26 +1650,37 @@  		<cd:command name='interactionbuttons' value='interactionbuttons'/>  		<cd:command name='interactionmenu' value='interactionmenu'/>  		<cd:command name='item' value='item'/> +		<cd:command name='itemgroup' value='itemgroup'/>  		<cd:command name='items' value='items'/> +		<cd:command name='itemtag' value='itemtag'/>  		<cd:command name='its' value='its'/>  		<cd:command name='keepblocks' value='keepblocks'/> +		<cd:command name='kerncharacters' value='kerncharacters'/>  		<cd:command name='label' value='label'/>  		<cd:command name='labels' value='labels'/>  		<cd:command name='labeltext' value='labeltext'/>  		<cd:command name='language' value='language'/> +		<cd:command name='languageCharacters' value='languageCharacters'/> +		<cd:command name='languagecharacters' value='languagecharacters'/>  		<cd:command name='leftaligned' value='leftaligned'/> +		<cd:command name='leftbottombox' value='leftbottombox'/>  		<cd:command name='leftedgedistance' value='leftedgedistance'/>  		<cd:command name='leftedgewidth' value='leftedgewidth'/> +		<cd:command name='leftline' value='leftline'/>  		<cd:command name='leftmargindistance' value='leftmargindistance'/>  		<cd:command name='leftmarginwidth' value='leftmarginwidth'/>  		<cd:command name='leg' value='leg'/>  		<cd:command name='linecorrection' value='linecorrection'/> +		<cd:command name='linenote' value='linenote'/> +		<cd:command name='linespanningtext' value='linespanningtext'/>  		<cd:command name='linewidth' value='linethickness'/>  		<cd:command name='listheight' value='listheight'/>  		<cd:command name='listlength' value='listlength'/>  		<cd:command name='listsymbol' value='listsymbol'/>  		<cd:command name='listwidth' value='listwidth'/> +		<cd:command name='loadfontgoodies' value='loadfontgoodies'/>  		<cd:command name='localfootnotes' value='localfootnotes'/> +		<cd:command name='localnotes' value='localnotes'/>  		<cd:command name='logfields' value='logfields'/>  		<cd:command name='lohi' value='lohi'/>  		<cd:command name='low' value='low'/> @@ -1634,6 +1711,7 @@  		<cd:command name='nodimension' value='nodimension'/>  		<cd:command name='noheaderandfooterlines' value='noheaderandfooterlines'/>  		<cd:command name='noindenting' value='noindenting'/> +		<cd:command name='noitem' value='noitem'/>  		<cd:command name='nolist' value='nolist'/>  		<cd:command name='nomarking' value='nomarking'/>  		<cd:command name='nomoreblocks' value='nomoreblocks'/> @@ -1641,6 +1719,7 @@  		<cd:command name='nop' value='nop'/>  		<cd:command name='nospace' value='nospace'/>  		<cd:command name='note' value='note'/> +		<cd:command name='notesymbol' value='notesymbol'/>  		<cd:command name='notopandbottomlines' value='notopandbottomlines'/>  		<cd:command name='notsmallcapped' value='nocap'/>  		<cd:command name='nowhitespace' value='nowhitespace'/> @@ -1652,6 +1731,7 @@  		<cd:command name='outermarginwidth' value='outermarginwidth'/>  		<cd:command name='packed' value='packed'/>  		<cd:command name='page' value='page'/> +		<cd:command name='pagebreak' value='pagebreak'/>  		<cd:command name='pagedepth' value='pagedepth'/>  		<cd:command name='pagenumber' value='pagenumber'/>  		<cd:command name='pageoffset' value='pageoffset'/> @@ -1670,7 +1750,10 @@  		<cd:command name='placelist' value='placelist'/>  		<cd:command name='placelistofsynonyms' value='placelistofsynonyms'/>  		<cd:command name='placelocalfootnotes' value='placelocalfootnotes'/> +		<cd:command name='placelocalnotes' value='placelocalnotes'/>  		<cd:command name='placelogos' value='placelogos'/> +		<cd:command name='placenamedfloat' value='placenamedfloat'/> +		<cd:command name='placenotes' value='placenotes'/>  		<cd:command name='placeongrid' value='placeongrid'/>  		<cd:command name='placeontopofeachother' value='placeontopofeachother'/>  		<cd:command name='placepagenumber' value='placepagenumber'/> @@ -1683,9 +1766,17 @@  		<cd:command name='placetextvariable' value='placetextvariable'/>  		<cd:command name='position' value='position'/>  		<cd:command name='positiontext' value='positiontext'/> +		<cd:command name='postponenotes' value='postponenotes'/> +		<cd:command name='postponingnotes' value='postponingnotes'/> +		<cd:command name='predefinedfont' value='predefinedfont'/> +		<cd:command name='predefinefont' value='predefinefont'/> +		<cd:command name='presetdocument' value='presetdocument'/> +		<cd:command name='prettyprintbuffer' value='prettyprintbuffer'/> +		<cd:command name='preventmode' value='preventmode'/>  		<cd:command name='printpaperheight' value='printpaperheight'/>  		<cd:command name='printpaperwidth' value='printpaperwidth'/>  		<cd:command name='processblocks' value='processblocks'/> +		<cd:command name='processbodyfontenvironmentlist' value='processbodyfontenvironmentlist'/>  		<cd:command name='processpage' value='processpage'/>  		<cd:command name='product' value='product'/>  		<cd:command name='program' value='program'/> @@ -1695,19 +1786,45 @@  		<cd:command name='quote' value='quote'/>  		<cd:command name='ran' value='ran'/>  		<cd:command name='redo' value='redo'/> +		<cd:command name='redoconvertfont' value='redoconvertfont'/>  		<cd:command name='ref' value='ref'/>  		<cd:command name='reference' value='reference'/>  		<cd:command name='referral' value='referral'/>  		<cd:command name='referraldate' value='referraldate'/>  		<cd:command name='referring' value='referring'/> +		<cd:command name='registerfontclass' value='registerfontclass'/> +		<cd:command name='registerhyphenationexception' value='registerhyphenationexception'/> +		<cd:command name='registerhyphenationpattern' value='registerhyphenationpattern'/>  		<cd:command name='remark' value='remark'/> +		<cd:command name='replacefeature' value='replacefeature'/>  		<cd:command name='reset' value='reset'/> +		<cd:command name='resetandaddfeature' value='resetandaddfeature'/> +		<cd:command name='resetcharacteralign' value='resetcharacteralign'/> +		<cd:command name='resetcharacterkerning' value='resetcharacterkerning'/> +		<cd:command name='resetcharacterspacing' value='resetcharacterspacing'/> +		<cd:command name='resetcharacterstripping' value='resetcharacterstripping'/> +		<cd:command name='resetfeature' value='resetfeature'/> +		<cd:command name='resetfontcolorsheme' value='resetfontcolorsheme'/> +		<cd:command name='resetfontfallback' value='resetfontfallback'/> +		<cd:command name='resetfontsolution' value='resetfontsolution'/> +		<cd:command name='resethyphenationfeatures' value='resethyphenationfeatures'/> +		<cd:command name='resetlocalfloats' value='resetlocalfloats'/>  		<cd:command name='resetmarking' value='resetmarking'/> +		<cd:command name='resetmode' value='resetmode'/>  		<cd:command name='resetnumber' value='resetnumber'/> +		<cd:command name='resetpath' value='resetpath'/> +		<cd:command name='resetperiodkerning' value='resetperiodkerning'/> +		<cd:command name='resetsystemmode' value='resetsystemmode'/>  		<cd:command name='resettext' value='resettextcontent'/> +		<cd:command name='resetvisualizers' value='resetvisualizers'/> +		<cd:command name='restoreglobalbodyfont' value='restoreglobalbodyfont'/> +		<cd:command name='retestfeature' value='retestfeature'/> +		<cd:command name='revivefeature' value='revivefeature'/>  		<cd:command name='rightaligned' value='rightaligned'/> +		<cd:command name='rightbottombox' value='rightbottombox'/>  		<cd:command name='rightedgedistance' value='rightedgedistance'/>  		<cd:command name='rightedgewidth' value='rightedgewidth'/> +		<cd:command name='rightline' value='rightline'/>  		<cd:command name='rightmargindistance' value='rightmargindistance'/>  		<cd:command name='rightmarginwidth' value='rightmarginwidth'/>  		<cd:command name='romannumerals' value='romannumerals'/> @@ -1718,12 +1835,38 @@  		<cd:command name='selectblocks' value='selectblocks'/>  		<cd:command name='selectpaper' value='selectpaper'/>  		<cd:command name='selectversion' value='selectversion'/> +		<cd:command name='setbigbodyfont' value='setbigbodyfont'/> +		<cd:command name='setcharacteralign' value='setcharacteralign'/> +		<cd:command name='setcharacteraligndetail' value='setcharacteraligndetail'/> +		<cd:command name='setcharactercasing' value='setcharactercasing'/> +		<cd:command name='setcharactercleaning' value='setcharactercleaning'/> +		<cd:command name='setcharacterkerning' value='setcharacterkerning'/> +		<cd:command name='setcharacterspacing' value='setcharacterspacing'/> +		<cd:command name='setcharacterstripping' value='setcharacterstripping'/> +		<cd:command name='setcurrentfontclass' value='setcurrentfontclass'/> +		<cd:command name='setfirstline' value='setfirstline'/> +		<cd:command name='setfirstpasscharacteralign' value='setfirstpasscharacteralign'/> +		<cd:command name='setfont' value='setfont'/> +		<cd:command name='setfontcolorsheme' value='setfontcolorsheme'/> +		<cd:command name='setfontfeature' value='setfontfeature'/> +		<cd:command name='setfontsolution' value='setfontsolution'/> +		<cd:command name='setfontstrut' value='setfontstrut'/> +		<cd:command name='sethyphenationfeatures' value='sethyphenationfeatures'/> +		<cd:command name='setmainbodyfont' value='setmainbodyfont'/> +		<cd:command name='setmode' value='setmode'/> +		<cd:command name='setnote' value='setnote'/> +		<cd:command name='setnotetext' value='setnotetext'/>  		<cd:command name='setnumber' value='setnumber'/> +		<cd:command name='setperiodkerning' value='setperiodkerning'/> +		<cd:command name='setsecondpasscharacteralign' value='setsecondpasscharacteralign'/> +		<cd:command name='setsmallbodyfont' value='setsmallbodyfont'/> +		<cd:command name='setsystemmode' value='setsystemmode'/>  		<cd:command name='settextcontent' value='settextcontent'/>  		<cd:command name='settextvariable' value='settextvariable'/>  		<cd:command name='setupalign' value='setupalign'/>  		<cd:command name='setupanswerarea' value='setupanswerarea'/>  		<cd:command name='setuparranging' value='setuparranging'/> +		<cd:command name='setupattachment' value='setupattachment'/>  		<cd:command name='setupbackground' value='setupbackground'/>  		<cd:command name='setupbackgrounds' value='setupbackgrounds'/>  		<cd:command name='setupblackrules' value='setupblackrules'/> @@ -1738,6 +1881,9 @@  		<cd:command name='setupcapitals' value='setupcapitals'/>  		<cd:command name='setupcaption' value='setupcaption'/>  		<cd:command name='setupcaptions' value='setupcaptions'/> +		<cd:command name='setupcharacteralign' value='setupcharacteralign'/> +		<cd:command name='setupcharacterkerning' value='setupcharacterkerning'/> +		<cd:command name='setupcharacterspacing' value='setupcharacterspacing'/>  		<cd:command name='setupclipping' value='setupclipping'/>  		<cd:command name='setupcolor' value='setupcolor'/>  		<cd:command name='setupcolors' value='setupcolors'/> @@ -1748,6 +1894,7 @@  		<cd:command name='setupcombinations' value='setupcombinations'/>  		<cd:command name='setupcombinedlist' value='setupcombinedlist'/>  		<cd:command name='setupcomment' value='setupcomment'/> +		<cd:command name='setupcounter' value='setupcounter'/>  		<cd:command name='setupdescription' value='setupdescription'/>  		<cd:command name='setupdescriptions' value='setupdescriptions'/>  		<cd:command name='setupenumeration' value='setupenumeration'/> @@ -1757,9 +1904,14 @@  		<cd:command name='setupfields' value='setupfields'/>  		<cd:command name='setupfillinlines' value='setupfillinlines'/>  		<cd:command name='setupfillinrules' value='setupfillinrules'/> +		<cd:command name='setupfirstline' value='setupfirstline'/>  		<cd:command name='setupfloat' value='setupfloat'/>  		<cd:command name='setupfloats' value='setupfloats'/>  		<cd:command name='setupfloatsplitting' value='setupfloatsplitting'/> +		<cd:command name='setupfontexpansion' value='setupfontexpansion'/> +		<cd:command name='setupfontprotrusion' value='setupfontprotrusion'/> +		<cd:command name='setupfonts' value='setupfonts'/> +		<cd:command name='setupfontsolution' value='setupfontsolution'/>  		<cd:command name='setupfooter' value='setupfooter'/>  		<cd:command name='setupfootertexts' value='setupfootertexts'/>  		<cd:command name='setupfootnotedefinition' value='setupfootnotedefinition'/> @@ -1776,6 +1928,7 @@  		<cd:command name='setupheadnumber' value='setupheadnumber'/>  		<cd:command name='setupheads' value='setupheads'/>  		<cd:command name='setupheadtext' value='setupheadtext'/> +		<cd:command name='setuphyphenation' value='setuphyphenation'/>  		<cd:command name='setuphyphenmark' value='setuphyphenmark'/>  		<cd:command name='setupindentedtext' value='setupindentedtext'/>  		<cd:command name='setupindenting' value='setupindenting'/> @@ -1792,6 +1945,7 @@  		<cd:command name='setuplanguage' value='setuplanguage'/>  		<cd:command name='setuplayout' value='setuplayout'/>  		<cd:command name='setuplegend' value='setuplegend'/> +		<cd:command name='setuplinenote' value='setuplinenote'/>  		<cd:command name='setuplinenumbering' value='setuplinenumbering'/>  		<cd:command name='setuplines' value='setuplines'/>  		<cd:command name='setuplinewidth' value='setuplinewidth'/> @@ -1804,6 +1958,10 @@  		<cd:command name='setupmarking' value='setupmarking'/>  		<cd:command name='setupmathalignment' value='setupmathalignment'/>  		<cd:command name='setupnarrower' value='setupnarrower'/> +		<cd:command name='setupnotation' value='setupnotation'/> +		<cd:command name='setupnotations' value='setupnotations'/> +		<cd:command name='setupnote' value='setupnote'/> +		<cd:command name='setupnotes' value='setupnotes'/>  		<cd:command name='setupnumber' value='setupnumber'/>  		<cd:command name='setupnumbering' value='setupnumbering'/>  		<cd:command name='setupoppositeplacing' value='setupoppositeplacing'/> @@ -1817,6 +1975,7 @@  		<cd:command name='setuppapersize' value='setuppapersize'/>  		<cd:command name='setupparagraphnumbering' value='setupparagraphnumbering'/>  		<cd:command name='setupparagraphs' value='setupparagraphs'/> +		<cd:command name='setupperiodkerning' value='setupperiodkerning'/>  		<cd:command name='setupplacement' value='setupplacement'/>  		<cd:command name='setuppositioning' value='setuppositioning'/>  		<cd:command name='setupprofiles' value='setupprofiles'/> @@ -1846,6 +2005,7 @@  		<cd:command name='setuptabulate' value='setuptabulate'/>  		<cd:command name='setuptext' value='setuptext'/>  		<cd:command name='setuptextbackground' value='setuptextbackground'/> +		<cd:command name='setuptextnote' value='setuptextnote'/>  		<cd:command name='setuptextposition' value='setuptextposition'/>  		<cd:command name='setuptextrules' value='setuptextrules'/>  		<cd:command name='setuptexttexts' value='setuptexttexts'/> @@ -1860,16 +2020,29 @@  		<cd:command name='setupurl' value='setupurl'/>  		<cd:command name='setupversions' value='setupversions'/>  		<cd:command name='setupwhitespace' value='setupwhitespace'/> +		<cd:command name='setvisualizerfont' value='setvisualizerfont'/>  		<cd:command name='showbodyfont' value='showbodyfont'/>  		<cd:command name='showbodyfontenvironment' value='showbodyfontenvironment'/>  		<cd:command name='showcolor' value='showcolor'/>  		<cd:command name='showcolorgroup' value='showcolorgroup'/> +		<cd:command name='showcounter' value='showcounter'/>  		<cd:command name='showexternalfigures' value='showexternalfigures'/>  		<cd:command name='showfields' value='showfields'/> +		<cd:command name='showfont' value='showfont'/> +		<cd:command name='showfontdata' value='showfontdata'/> +		<cd:command name='showfontexpansion' value='showfontexpansion'/> +		<cd:command name='showfontitalics' value='showfontitalics'/> +		<cd:command name='showfontkerns' value='showfontkerns'/> +		<cd:command name='showfontparameters' value='showfontparameters'/> +		<cd:command name='showfontstrip' value='showfontstrip'/> +		<cd:command name='showfontstyle' value='showfontstyle'/>  		<cd:command name='showframe' value='showframe'/>  		<cd:command name='showgrid' value='showgrid'/> +		<cd:command name='showhyphenationtrace' value='showhyphenationtrace'/> +		<cd:command name='showkerning' value='showkerning'/>  		<cd:command name='showlayout' value='showlayout'/>  		<cd:command name='showmakeup' value='showmakeup'/> +		<cd:command name='showminimalbaseline' value='showminimalbaseline'/>  		<cd:command name='showpalet' value='showpalet'/>  		<cd:command name='showprint' value='showprint'/>  		<cd:command name='showsetups' value='showsetups'/> @@ -1879,6 +2052,7 @@  		<cd:command name='someline' value='someline'/>  		<cd:command name='somewhere' value='somewhere'/>  		<cd:command name='space' value='space'/> +		<cd:command name='specialitem' value='specialitem'/>  		<cd:command name='splitfloat' value='splitfloat'/>  		<cd:command name='startalignment' value='startalignment'/>  		<cd:command name='startbackground' value='startbackground'/> @@ -1896,6 +2070,7 @@  		<cd:command name='startglobal' value='startglobal'/>  		<cd:command name='startline' value='startline'/>  		<cd:command name='startlinecorrection' value='startlinecorrection'/> +		<cd:command name='startlinenote' value='startlinenote'/>  		<cd:command name='startlinenumbering' value='startlinenumbering'/>  		<cd:command name='startlines' value='startlines'/>  		<cd:command name='startlocal' value='startlocal'/> @@ -1938,6 +2113,7 @@  		<cd:command name='stopglobal' value='stopglobal'/>  		<cd:command name='stopline' value='stopline'/>  		<cd:command name='stoplinecorrection' value='stoplinecorrection'/> +		<cd:command name='stoplinenote' value='stoplinenote'/>  		<cd:command name='stoplinenumbering' value='stoplinenumbering'/>  		<cd:command name='stoplines' value='stoplines'/>  		<cd:command name='stoplocal' value='stoplocal'/> @@ -1965,8 +2141,11 @@  		<cd:command name='stopunpacked' value='stopunpacked'/>  		<cd:command name='stopversion' value='stopversion'/>  		<cd:command name='stretched' value='stretched'/> +		<cd:command name='strictinspectnextcharacter' value='strictinspectnextcharacter'/> +		<cd:command name='stripcharacter' value='stripcharacter'/>  		<cd:command name='subformulanumber' value='subformulanumber'/>  		<cd:command name='subpagenumber' value='subpagenumber'/> +		<cd:command name='subtractfeature' value='subtractfeature'/>  		<cd:command name='switchtobodyfont' value='switchtobodyfont'/>  		<cd:command name='switchtorawfont' value='switchtorawfont'/>  		<cd:command name='sym' value='sym'/> @@ -1976,16 +2155,24 @@  		<cd:command name='synchronize' value='synchronize'/>  		<cd:command name='tab' value='tab'/>  		<cd:command name='testcolumn' value='testcolumn'/> +		<cd:command name='testfeature' value='testfeature'/> +		<cd:command name='testfeatureonce' value='testfeatureonce'/>  		<cd:command name='testpage' value='testpage'/>  		<cd:command name='tex' value='tex'/>  		<cd:command name='textbackground' value='textbackground'/> +		<cd:command name='textcolor' value='textcolor'/>  		<cd:command name='textheight' value='textheight'/> +		<cd:command name='textnote' value='textnote'/>  		<cd:command name='textreference' value='textreference'/>  		<cd:command name='textrule' value='textrule'/>  		<cd:command name='textvariable' value='textvariable'/>  		<cd:command name='textwidth' value='textwidth'/> +		<cd:command name='thefirstcharacter' value='thefirstcharacter'/> +		<cd:command name='thenormalizedbodyfontsize' value='thenormalizedbodyfontsize'/> +		<cd:command name='theremainingcharacters' value='theremainingcharacters'/>  		<cd:command name='thinrule' value='thinrule'/>  		<cd:command name='thinrules' value='thinrules'/> +		<cd:command name='tolinenote' value='tolinenote'/>  		<cd:command name='tooltip' value='tooltip'/>  		<cd:command name='topdistance' value='topdistance'/>  		<cd:command name='topheight' value='topheight'/> @@ -1996,13 +2183,19 @@  		<cd:command name='typ' value='typ'/>  		<cd:command name='type' value='type'/>  		<cd:command name='typebuffer' value='typebuffer'/> +		<cd:command name='typedefinedbuffer' value='typedefinedbuffer'/>  		<cd:command name='typefile' value='typefile'/> +		<cd:command name='typeinlinebuffer' value='typeinlinebuffer'/> +		<cd:command name='typing' value='typing'/>  		<cd:command name='unitmeaning' value='unitmeaning'/>  		<cd:command name='unknown' value='unknown'/> +		<cd:command name='unregisterhyphenationpattern' value='unregisterhyphenationpattern'/>  		<cd:command name='useJSscripts' value='useJSscripts'/>  		<cd:command name='useURL' value='useURL'/>  		<cd:command name='useXMLfilter' value='useXMLfilter'/>  		<cd:command name='useblocks' value='useblocks'/> +		<cd:command name='usebodyfont' value='usebodyfont'/> +		<cd:command name='usebodyfontparameter' value='usebodyfontparameter'/>  		<cd:command name='usecommands' value='usecommands'/>  		<cd:command name='useencoding' value='useencoding'/>  		<cd:command name='useexternaldocument' value='useexternaldocument'/> @@ -2019,10 +2212,12 @@  		<cd:command name='usetypescript' value='usetypescript'/>  		<cd:command name='usetypescriptfile' value='usetypescriptfile'/>  		<cd:command name='useurl' value='useurl'/> +		<cd:command name='verbatim' value='verbatim'/>  		<cd:command name='version' value='version'/>  		<cd:command name='vl' value='vl'/>  		<cd:command name='weekday' value='weekday'/>  		<cd:command name='whitespace' value='whitespace'/> +		<cd:command name='widthspanningtext' value='widthspanningtext'/>  		<cd:command name='wordright' value='wordright'/>  		<cd:command name='writebetweenlist' value='writebetweenlist'/>  		<cd:command name='writetolist' value='writetolist'/> diff --git a/tex/context/interface/mkii/keys-pe.xml b/tex/context/interface/mkii/keys-pe.xml index 98340b1d0..1d2d11dde 100644 --- a/tex/context/interface/mkii/keys-pe.xml +++ b/tex/context/interface/mkii/keys-pe.xml @@ -131,6 +131,9 @@  		<cd:variable name='camel' value='camel'/>  		<cd:variable name='cap' value='cap'/>  		<cd:variable name='capital' value='capital'/> +		<cd:variable name='category' value='category'/> +		<cd:variable name='cd:character' value='cd:character'/> +		<cd:variable name='cd:font' value='cd:font'/>  		<cd:variable name='center' value='مرکز'/>  		<cd:variable name='centerlast' value='centerlast'/>  		<cd:variable name='chapter' value='فصل'/> @@ -189,6 +192,7 @@  		<cd:variable name='external' value='خارجی'/>  		<cd:variable name='extremestretch' value='extremestretch'/>  		<cd:variable name='fact' value='fact'/> +		<cd:variable name='fallback' value='fallback'/>  		<cd:variable name='february' value='فوریه'/>  		<cd:variable name='field' value='field'/>  		<cd:variable name='figure' value='شکل'/> @@ -810,8 +814,10 @@  		<cd:constant name='extras' value='extras'/>  		<cd:constant name='factor' value='عامل'/>  		<cd:constant name='fallback' value='عقبریختن'/> +		<cd:constant name='fallbacks' value='fallbacks'/>  		<cd:constant name='family' value='خانواده'/>  		<cd:constant name='features' value='features'/> +		<cd:constant name='featureset' value='featureset'/>  		<cd:constant name='fences' value='fences'/>  		<cd:constant name='field' value='field'/>  		<cd:constant name='fieldbackgroundcolor' value='رنگپسزمینهمیدان'/> @@ -886,6 +892,7 @@  		<cd:constant name='increment' value='افزایش'/>  		<cd:constant name='incrementnumber' value='شمارهافزایش'/>  		<cd:constant name='indenting' value='تورفتگی'/> +		<cd:constant name='indentlist' value='indentlist'/>  		<cd:constant name='indentnext' value='متنتورفته'/>  		<cd:constant name='index' value='index'/>  		<cd:constant name='indicator' value='اندیکاتور'/> @@ -1090,6 +1097,7 @@  		<cd:constant name='period' value='period'/>  		<cd:constant name='place' value='بگذار'/>  		<cd:constant name='placehead' value='بگذارسر'/> +		<cd:constant name='placeholder' value='placeholder'/>  		<cd:constant name='placestopper' value='بگذارایست'/>  		<cd:constant name='position' value='موقعیت'/>  		<cd:constant name='prefix' value='پیشوند'/> @@ -1379,8 +1387,18 @@  		<cd:command name='Word' value='Word'/>  		<cd:command name='Words' value='Words'/>  		<cd:command name='about' value='درمورد'/> +		<cd:command name='adaptfontfeature' value='adaptfontfeature'/>  		<cd:command name='adaptlayout' value='تنظیمطرحبندی'/> +		<cd:command name='addfeature' value='addfeature'/> +		<cd:command name='alignbottom' value='alignbottom'/> +		<cd:command name='aligned' value='aligned'/> +		<cd:command name='alignedbox' value='alignedbox'/> +		<cd:command name='alignedline' value='alignedline'/> +		<cd:command name='alignhere' value='alignhere'/>  		<cd:command name='alignment' value='alignment'/> +		<cd:command name='alignmentcharacter' value='alignmentcharacter'/> +		<cd:command name='applytocharacters' value='applytocharacters'/> +		<cd:command name='applytofirstcharacter' value='applytofirstcharacter'/>  		<cd:command name='arg' value='افزودن'/>  		<cd:command name='at' value='در'/>  		<cd:command name='atleftmargin' value='درحاشیهچپ'/> @@ -1392,9 +1410,13 @@  		<cd:command name='blackrules' value='خطهایسیاه'/>  		<cd:command name='blank' value='خالی'/>  		<cd:command name='bookmark' value='چوبخط'/> +		<cd:command name='bottombox' value='bottombox'/>  		<cd:command name='bottomdistance' value='فاصلهپایین'/>  		<cd:command name='bottomheight' value='ارتفاعپایین'/> +		<cd:command name='bottomleftbox' value='bottomleftbox'/> +		<cd:command name='bottomrightbox' value='bottomrightbox'/>  		<cd:command name='bottomspace' value='فضایپایین'/> +		<cd:command name='buildtextbottomdot' value='buildtextbottomdot'/>  		<cd:command name='but' value='اما'/>  		<cd:command name='button' value='دکمه'/>  		<cd:command name='bypassblocks' value='عبوربلوکها'/> @@ -1433,8 +1455,11 @@  		<cd:command name='defineblock' value='تعریفبلوک'/>  		<cd:command name='definebodyfont' value='تعریفقلممتن'/>  		<cd:command name='definebodyfontenvironment' value='تعریفمحیطقلمبدنه'/> +		<cd:command name='definebodyfontswitch' value='definebodyfontswitch'/>  		<cd:command name='definebuffer' value='تعریفبافر'/>  		<cd:command name='definecharacter' value='تعریفحرف'/> +		<cd:command name='definecharacterkerning' value='definecharacterkerning'/> +		<cd:command name='definecharacterspacing' value='definecharacterspacing'/>  		<cd:command name='definecolor' value='تعریفرنگ'/>  		<cd:command name='definecolorgroup' value='تعریفگروهرنگ'/>  		<cd:command name='definecolumnbreak' value='تعریفشکستنستون'/> @@ -1444,37 +1469,57 @@  		<cd:command name='definecommand' value='تعریففرمان'/>  		<cd:command name='defineconversion' value='تعریفتبدیل'/>  		<cd:command name='definedescription' value='تعریفشرح'/> +		<cd:command name='definedfont' value='definedfont'/>  		<cd:command name='defineenumeration' value='تعریفشمارهبندی'/> +		<cd:command name='definefallbackfamily' value='definefallbackfamily'/>  		<cd:command name='definefield' value='تعریفمیدان'/>  		<cd:command name='definefieldstack' value='تعریفتودهمیدان'/>  		<cd:command name='definefiguresymbol' value='تعریفنمادشکل'/> +		<cd:command name='definefilefallback' value='definefilefallback'/> +		<cd:command name='definefirstline' value='definefirstline'/>  		<cd:command name='definefloat' value='تعریفشناور'/>  		<cd:command name='definefont' value='تعریفقلم'/> +		<cd:command name='definefontalternative' value='definefontalternative'/> +		<cd:command name='definefontfallback' value='definefontfallback'/> +		<cd:command name='definefontfamily' value='definefontfamily'/> +		<cd:command name='definefontfamilypreset' value='definefontfamilypreset'/> +		<cd:command name='definefontfeature' value='definefontfeature'/> +		<cd:command name='definefontfile' value='definefontfile'/> +		<cd:command name='definefontsize' value='definefontsize'/> +		<cd:command name='definefontsolution' value='definefontsolution'/>  		<cd:command name='definefontstyle' value='تعریفسبکقلم'/>  		<cd:command name='definefontsynonym' value='تعریفمترادفقلم'/>  		<cd:command name='defineframed' value='تعریفقالبی'/>  		<cd:command name='defineframedtext' value='تعریفمتنقالبی'/> +		<cd:command name='definefrozenfont' value='definefrozenfont'/>  		<cd:command name='definehbox' value='تعریفجعبهافقی'/>  		<cd:command name='definehead' value='تعریفسر'/> +		<cd:command name='definehyphenationfeatures' value='definehyphenationfeatures'/>  		<cd:command name='defineindentedtext' value='defineindentedtext'/>  		<cd:command name='defineinmargin' value='تعریفدرونحاشیه'/>  		<cd:command name='defineinteractionmenu' value='تعریفمنویپانل'/>  		<cd:command name='defineitemgroup' value='تعریفگروهآیتم'/> +		<cd:command name='defineitems' value='defineitems'/>  		<cd:command name='definelabel' value='تعریفبرچسب'/>  		<cd:command name='definelayer' value='تعریفلایه'/>  		<cd:command name='definelayout' value='تعریفطرحبندی'/> +		<cd:command name='definelinenote' value='definelinenote'/>  		<cd:command name='definelist' value='تعریفلیست'/>  		<cd:command name='definelogo' value='تعریفآرم'/>  		<cd:command name='definemainfield' value='تعریفمیداناصلی'/>  		<cd:command name='definemakeup' value='تعریفآرایش'/>  		<cd:command name='definemarking' value='تعریفنشانهگذاری'/>  		<cd:command name='definemathalignment' value='تعریفتنظیمریاضی'/> +		<cd:command name='definemode' value='definemode'/> +		<cd:command name='definenamedcolor' value='definenamedcolor'/> +		<cd:command name='definenote' value='definenote'/>  		<cd:command name='defineoutput' value='تعریفخروجی'/>  		<cd:command name='defineoverlay' value='تعریفپوشش'/>  		<cd:command name='definepagebreak' value='تعریفشکستصفحه'/>  		<cd:command name='definepalet' value='تعریفلوح'/>  		<cd:command name='definepapersize' value='تعریفاندازهبرگ'/>  		<cd:command name='defineparagraphs' value='تعریفپاراگرافها'/> +		<cd:command name='defineperiodkerning' value='defineperiodkerning'/>  		<cd:command name='defineplacement' value='تعریفجانشانی'/>  		<cd:command name='defineprofile' value='تعریفپروفایل'/>  		<cd:command name='defineprogram' value='تعریفبرنامه'/> @@ -1496,33 +1541,45 @@  		<cd:command name='definetabulate' value='تعریفجدولبندی'/>  		<cd:command name='definetext' value='تعریفمتن'/>  		<cd:command name='definetextbackground' value='definetextbackground'/> +		<cd:command name='definetextnote' value='definetextnote'/>  		<cd:command name='definetextposition' value='تعریفمکانمتن'/>  		<cd:command name='definetextvariable' value='تعریفمتغیرمتن'/>  		<cd:command name='definetype' value='تعریفتایپ'/>  		<cd:command name='definetyping' value='تعریفتایپکردن'/>  		<cd:command name='defineversion' value='تعریفنسخه'/> +		<cd:command name='depthspanningtext' value='depthspanningtext'/>  		<cd:command name='determineheadnumber' value='تعیینشمارهسر'/>  		<cd:command name='determinelistcharacteristics' value='تعیینمشخصاتلیست'/>  		<cd:command name='determineregistercharacteristics' value='تعیینمشخصاتثبت'/>  		<cd:command name='dimension' value='بعد'/>  		<cd:command name='disableinteractionmenu' value='ازکارانداختنمنویپانل'/> +		<cd:command name='disablemode' value='disablemode'/> +		<cd:command name='doaddfeature' value='doaddfeature'/>  		<cd:command name='domicile' value='مسکن'/> +		<cd:command name='dontconvertfont' value='dontconvertfont'/>  		<cd:command name='donttest' value='امتحاننکن'/>  		<cd:command name='edgedistance' value='فاصلهلبه'/>  		<cd:command name='edgewidth' value='عرضلبه'/> +		<cd:command name='emphasisboldface' value='emphasisboldface'/>  		<cd:command name='emptylines' value='خطهاخالی'/> +		<cd:command name='enablemode' value='enablemode'/>  		<cd:command name='environment' value='محیط'/>  		<cd:command name='externalfigure' value='شکلخارجی'/>  		<cd:command name='fact' value='حقیقت'/> +		<cd:command name='fastswitchtobodyfont' value='fastswitchtobodyfont'/> +		<cd:command name='feature' value='feature'/>  		<cd:command name='field' value='میدان'/>  		<cd:command name='fieldstack' value='میدانپشته'/>  		<cd:command name='fillinfield' value='درجدرمیدان'/>  		<cd:command name='fillinline' value='درجدرخط'/>  		<cd:command name='fillinrules' value='درجدرخطها'/>  		<cd:command name='fillintext' value='درجدرمتن'/> +		<cd:command name='firstcharacter' value='firstcharacter'/>  		<cd:command name='fitfield' value='پرکردنمیدان'/> +		<cd:command name='fittopbaselinegrid' value='fittopbaselinegrid'/>  		<cd:command name='fixedspace' value='فضایثابت'/>  		<cd:command name='fixedspaces' value='فضاهایثابت'/> +		<cd:command name='flushnotes' value='flushnotes'/>  		<cd:command name='followprofile' value='پیرویپروفایل'/>  		<cd:command name='followprofileversion' value='پیروینسخهپروفایل'/>  		<cd:command name='followversion' value='پیروینسخه'/> @@ -1531,13 +1588,19 @@  		<cd:command name='footnote' value='پانوشت'/>  		<cd:command name='footnotetext' value='متنپانوشت'/>  		<cd:command name='forceblocks' value='اجباربلوکها'/> +		<cd:command name='forcecharacterstripping' value='forcecharacterstripping'/>  		<cd:command name='formulanumber' value='شمارهفرمول'/>  		<cd:command name='fraction' value='کسر'/>  		<cd:command name='framed' value='قالبی'/>  		<cd:command name='from' value='از'/> +		<cd:command name='fromlinenote' value='fromlinenote'/>  		<cd:command name='getbuffer' value='دریافتبافر'/> +		<cd:command name='getfirstcharacter' value='getfirstcharacter'/>  		<cd:command name='getmarking' value='دریافتنشانه'/>  		<cd:command name='getnumber' value='دریافتشماره'/> +		<cd:command name='globaldisablemode' value='globaldisablemode'/> +		<cd:command name='globalenablemode' value='globalenablemode'/> +		<cd:command name='globalpreventmode' value='globalpreventmode'/>  		<cd:command name='godown' value='بروپایین'/>  		<cd:command name='goto' value='بروبه'/>  		<cd:command name='gotobox' value='بروبهجعبه'/> @@ -1553,6 +1616,7 @@  		<cd:command name='headnumber' value='شمارهسر'/>  		<cd:command name='headsym' value='نمادسر'/>  		<cd:command name='headtext' value='متنسر'/> +		<cd:command name='heightspanningtext' value='heightspanningtext'/>  		<cd:command name='hideblocks' value='بلوکهاپنهان'/>  		<cd:command name='high' value='بلند'/>  		<cd:command name='hl' value='خا'/> @@ -1584,26 +1648,37 @@  		<cd:command name='interactionbuttons' value='دکمهپانل'/>  		<cd:command name='interactionmenu' value='منویپانل'/>  		<cd:command name='item' value='آیتم'/> +		<cd:command name='itemgroup' value='itemgroup'/>  		<cd:command name='items' value='آیتمها'/> +		<cd:command name='itemtag' value='itemtag'/>  		<cd:command name='its' value='its'/>  		<cd:command name='keepblocks' value='حفظبلوکها'/> +		<cd:command name='kerncharacters' value='kerncharacters'/>  		<cd:command name='label' value='برچسب'/>  		<cd:command name='labels' value='برچسبها'/>  		<cd:command name='labeltext' value='متنبرچسب'/>  		<cd:command name='language' value='زبان'/> +		<cd:command name='languageCharacters' value='languageCharacters'/> +		<cd:command name='languagecharacters' value='languagecharacters'/>  		<cd:command name='leftaligned' value='چپچین'/> +		<cd:command name='leftbottombox' value='leftbottombox'/>  		<cd:command name='leftedgedistance' value='فاصلهلبهچپ'/>  		<cd:command name='leftedgewidth' value='عرضلبهچپ'/> +		<cd:command name='leftline' value='leftline'/>  		<cd:command name='leftmargindistance' value='فاصلهحاشیهچپ'/>  		<cd:command name='leftmarginwidth' value='عرضحاشیهچپ'/>  		<cd:command name='leg' value='پا'/>  		<cd:command name='linecorrection' value='linecorrection'/> +		<cd:command name='linenote' value='linenote'/> +		<cd:command name='linespanningtext' value='linespanningtext'/>  		<cd:command name='linewidth' value='عرضخط'/>  		<cd:command name='listheight' value='ارتفاعخط'/>  		<cd:command name='listlength' value='طوللیست'/>  		<cd:command name='listsymbol' value='نمادلیست'/>  		<cd:command name='listwidth' value='عرضلیست'/> +		<cd:command name='loadfontgoodies' value='loadfontgoodies'/>  		<cd:command name='localfootnotes' value='localfootnotes'/> +		<cd:command name='localnotes' value='localnotes'/>  		<cd:command name='logfields' value='میدانهایگزارش'/>  		<cd:command name='lohi' value='پابا'/>  		<cd:command name='low' value='پایین'/> @@ -1634,6 +1709,7 @@  		<cd:command name='nodimension' value='بدونبعد'/>  		<cd:command name='noheaderandfooterlines' value='بدونخطسروتهبرگ'/>  		<cd:command name='noindenting' value='بدونتورفتگی'/> +		<cd:command name='noitem' value='noitem'/>  		<cd:command name='nolist' value='بدونلیست'/>  		<cd:command name='nomarking' value='بدوننشانهگذاری'/>  		<cd:command name='nomoreblocks' value='بدونبلوکهایبیشتر'/> @@ -1641,6 +1717,7 @@  		<cd:command name='nop' value='منفی'/>  		<cd:command name='nospace' value='بدونفضا'/>  		<cd:command name='note' value='یادداشت'/> +		<cd:command name='notesymbol' value='notesymbol'/>  		<cd:command name='notopandbottomlines' value='بدونخطبالاوپایین'/>  		<cd:command name='notsmallcapped' value='سرپوشکوچکنه'/>  		<cd:command name='nowhitespace' value='بدونفضایسفید'/> @@ -1652,6 +1729,7 @@  		<cd:command name='outermarginwidth' value='عرضحاشیهخارجی'/>  		<cd:command name='packed' value='فشرده'/>  		<cd:command name='page' value='صفحه'/> +		<cd:command name='pagebreak' value='pagebreak'/>  		<cd:command name='pagedepth' value='عمقصفحه'/>  		<cd:command name='pagenumber' value='شمارهصفحه'/>  		<cd:command name='pageoffset' value='آفستصفحه'/> @@ -1670,7 +1748,10 @@  		<cd:command name='placelist' value='درجلیست'/>  		<cd:command name='placelistofsynonyms' value='placelistofsynonyms'/>  		<cd:command name='placelocalfootnotes' value='درجپانوشتهایموضعی'/> +		<cd:command name='placelocalnotes' value='placelocalnotes'/>  		<cd:command name='placelogos' value='درجآرمها'/> +		<cd:command name='placenamedfloat' value='placenamedfloat'/> +		<cd:command name='placenotes' value='placenotes'/>  		<cd:command name='placeongrid' value='درجدرتوری'/>  		<cd:command name='placeontopofeachother' value='درجدربالاییکدیگر'/>  		<cd:command name='placepagenumber' value='درجشمارهصفحه'/> @@ -1683,9 +1764,17 @@  		<cd:command name='placetextvariable' value='درجمتغیرمتن'/>  		<cd:command name='position' value='مکان'/>  		<cd:command name='positiontext' value='مکانمتن'/> +		<cd:command name='postponenotes' value='postponenotes'/> +		<cd:command name='postponingnotes' value='postponingnotes'/> +		<cd:command name='predefinedfont' value='predefinedfont'/> +		<cd:command name='predefinefont' value='predefinefont'/> +		<cd:command name='presetdocument' value='presetdocument'/> +		<cd:command name='prettyprintbuffer' value='prettyprintbuffer'/> +		<cd:command name='preventmode' value='preventmode'/>  		<cd:command name='printpaperheight' value='چاپارتفاعبرگ'/>  		<cd:command name='printpaperwidth' value='چاپعرضبرگ'/>  		<cd:command name='processblocks' value='بلوکهایپردازش'/> +		<cd:command name='processbodyfontenvironmentlist' value='processbodyfontenvironmentlist'/>  		<cd:command name='processpage' value='صفحهپردازش'/>  		<cd:command name='product' value='تولید'/>  		<cd:command name='program' value='برنامه'/> @@ -1695,19 +1784,45 @@  		<cd:command name='quote' value='نقل'/>  		<cd:command name='ran' value='ran'/>  		<cd:command name='redo' value='انجامدوباره'/> +		<cd:command name='redoconvertfont' value='redoconvertfont'/>  		<cd:command name='ref' value='رج'/>  		<cd:command name='reference' value='مرجع'/>  		<cd:command name='referral' value='رجوع'/>  		<cd:command name='referraldate' value='تاریخرجوع'/>  		<cd:command name='referring' value='مراجعه'/> +		<cd:command name='registerfontclass' value='registerfontclass'/> +		<cd:command name='registerhyphenationexception' value='registerhyphenationexception'/> +		<cd:command name='registerhyphenationpattern' value='registerhyphenationpattern'/>  		<cd:command name='remark' value='توجه'/> +		<cd:command name='replacefeature' value='replacefeature'/>  		<cd:command name='reset' value='بازنشانی'/> +		<cd:command name='resetandaddfeature' value='resetandaddfeature'/> +		<cd:command name='resetcharacteralign' value='resetcharacteralign'/> +		<cd:command name='resetcharacterkerning' value='resetcharacterkerning'/> +		<cd:command name='resetcharacterspacing' value='resetcharacterspacing'/> +		<cd:command name='resetcharacterstripping' value='resetcharacterstripping'/> +		<cd:command name='resetfeature' value='resetfeature'/> +		<cd:command name='resetfontcolorsheme' value='resetfontcolorsheme'/> +		<cd:command name='resetfontfallback' value='resetfontfallback'/> +		<cd:command name='resetfontsolution' value='resetfontsolution'/> +		<cd:command name='resethyphenationfeatures' value='resethyphenationfeatures'/> +		<cd:command name='resetlocalfloats' value='resetlocalfloats'/>  		<cd:command name='resetmarking' value='بازنشانینشانهگذاری'/> +		<cd:command name='resetmode' value='resetmode'/>  		<cd:command name='resetnumber' value='بازنشانیشماره'/> +		<cd:command name='resetpath' value='resetpath'/> +		<cd:command name='resetperiodkerning' value='resetperiodkerning'/> +		<cd:command name='resetsystemmode' value='resetsystemmode'/>  		<cd:command name='resettext' value='بازنشانیمتن'/> +		<cd:command name='resetvisualizers' value='resetvisualizers'/> +		<cd:command name='restoreglobalbodyfont' value='restoreglobalbodyfont'/> +		<cd:command name='retestfeature' value='retestfeature'/> +		<cd:command name='revivefeature' value='revivefeature'/>  		<cd:command name='rightaligned' value='تنظیمراست'/> +		<cd:command name='rightbottombox' value='rightbottombox'/>  		<cd:command name='rightedgedistance' value='فاصلهلبهراست'/>  		<cd:command name='rightedgewidth' value='عرضلبهراست'/> +		<cd:command name='rightline' value='rightline'/>  		<cd:command name='rightmargindistance' value='فاصلهحاشیهراست'/>  		<cd:command name='rightmarginwidth' value='عرضحاشیهراست'/>  		<cd:command name='romannumerals' value='اعدادلاتین'/> @@ -1718,12 +1833,38 @@  		<cd:command name='selectblocks' value='انتخاببلوکها'/>  		<cd:command name='selectpaper' value='انتخاببرگ'/>  		<cd:command name='selectversion' value='انتخابنسخه'/> +		<cd:command name='setbigbodyfont' value='setbigbodyfont'/> +		<cd:command name='setcharacteralign' value='setcharacteralign'/> +		<cd:command name='setcharacteraligndetail' value='setcharacteraligndetail'/> +		<cd:command name='setcharactercasing' value='setcharactercasing'/> +		<cd:command name='setcharactercleaning' value='setcharactercleaning'/> +		<cd:command name='setcharacterkerning' value='setcharacterkerning'/> +		<cd:command name='setcharacterspacing' value='setcharacterspacing'/> +		<cd:command name='setcharacterstripping' value='setcharacterstripping'/> +		<cd:command name='setcurrentfontclass' value='setcurrentfontclass'/> +		<cd:command name='setfirstline' value='setfirstline'/> +		<cd:command name='setfirstpasscharacteralign' value='setfirstpasscharacteralign'/> +		<cd:command name='setfont' value='setfont'/> +		<cd:command name='setfontcolorsheme' value='setfontcolorsheme'/> +		<cd:command name='setfontfeature' value='setfontfeature'/> +		<cd:command name='setfontsolution' value='setfontsolution'/> +		<cd:command name='setfontstrut' value='setfontstrut'/> +		<cd:command name='sethyphenationfeatures' value='sethyphenationfeatures'/> +		<cd:command name='setmainbodyfont' value='setmainbodyfont'/> +		<cd:command name='setmode' value='setmode'/> +		<cd:command name='setnote' value='setnote'/> +		<cd:command name='setnotetext' value='setnotetext'/>  		<cd:command name='setnumber' value='تعیینشماره'/> +		<cd:command name='setperiodkerning' value='setperiodkerning'/> +		<cd:command name='setsecondpasscharacteralign' value='setsecondpasscharacteralign'/> +		<cd:command name='setsmallbodyfont' value='setsmallbodyfont'/> +		<cd:command name='setsystemmode' value='setsystemmode'/>  		<cd:command name='settextcontent' value='تعیینمحتوایمتن'/>  		<cd:command name='settextvariable' value='تعیینمتغیرمتن'/>  		<cd:command name='setupalign' value='بارگذاریتنظیم'/>  		<cd:command name='setupanswerarea' value='setupanswerarea'/>  		<cd:command name='setuparranging' value='بارگذاریترتیب'/> +		<cd:command name='setupattachment' value='setupattachment'/>  		<cd:command name='setupbackground' value='بارگذاریپسزمینه'/>  		<cd:command name='setupbackgrounds' value='بارگذاریپسزمینهها'/>  		<cd:command name='setupblackrules' value='بارگذاریخطهایسیاه'/> @@ -1738,6 +1879,9 @@  		<cd:command name='setupcapitals' value='setupcapitals'/>  		<cd:command name='setupcaption' value='بارگذاریشرح'/>  		<cd:command name='setupcaptions' value='بارگذاریشرحها'/> +		<cd:command name='setupcharacteralign' value='setupcharacteralign'/> +		<cd:command name='setupcharacterkerning' value='setupcharacterkerning'/> +		<cd:command name='setupcharacterspacing' value='setupcharacterspacing'/>  		<cd:command name='setupclipping' value='بارگذاریچیدن'/>  		<cd:command name='setupcolor' value='بارگذاریرنگ'/>  		<cd:command name='setupcolors' value='بارگذاریرنگها'/> @@ -1748,6 +1892,7 @@  		<cd:command name='setupcombinations' value='بارگذاریترکیبها'/>  		<cd:command name='setupcombinedlist' value='بارگذاریلیستترکیبی'/>  		<cd:command name='setupcomment' value='بارگذاریتوضیح'/> +		<cd:command name='setupcounter' value='setupcounter'/>  		<cd:command name='setupdescription' value='setupdescription'/>  		<cd:command name='setupdescriptions' value='بارگذاریشرح'/>  		<cd:command name='setupenumeration' value='setupenumeration'/> @@ -1757,9 +1902,14 @@  		<cd:command name='setupfields' value='بارگذاریمیدانها'/>  		<cd:command name='setupfillinlines' value='بارگذاریپرکردنخطها'/>  		<cd:command name='setupfillinrules' value='بارگذاریدرجدرخطها'/> +		<cd:command name='setupfirstline' value='setupfirstline'/>  		<cd:command name='setupfloat' value='بارگذاریشناور'/>  		<cd:command name='setupfloats' value='بارگذاریشناورها'/>  		<cd:command name='setupfloatsplitting' value='بارگذاریشکافتنشناورها'/> +		<cd:command name='setupfontexpansion' value='setupfontexpansion'/> +		<cd:command name='setupfontprotrusion' value='setupfontprotrusion'/> +		<cd:command name='setupfonts' value='setupfonts'/> +		<cd:command name='setupfontsolution' value='setupfontsolution'/>  		<cd:command name='setupfooter' value='بارگذاریتهبرگ'/>  		<cd:command name='setupfootertexts' value='بارگذاریمتنپانوشت'/>  		<cd:command name='setupfootnotedefinition' value='بارگذاریتعریفپانوشت'/> @@ -1776,6 +1926,7 @@  		<cd:command name='setupheadnumber' value='بارگذاریشمارهسر'/>  		<cd:command name='setupheads' value='بارگذاریسرها'/>  		<cd:command name='setupheadtext' value='بارگذاریمتنسر'/> +		<cd:command name='setuphyphenation' value='setuphyphenation'/>  		<cd:command name='setuphyphenmark' value='بارگذارینشانهشکستن'/>  		<cd:command name='setupindentedtext' value='setupindentedtext'/>  		<cd:command name='setupindenting' value='بارگذاریتورفتگی'/> @@ -1792,6 +1943,7 @@  		<cd:command name='setuplanguage' value='بارگذاریزبان'/>  		<cd:command name='setuplayout' value='بارگذاریطرحبندی'/>  		<cd:command name='setuplegend' value='بارگذاریراهنما'/> +		<cd:command name='setuplinenote' value='setuplinenote'/>  		<cd:command name='setuplinenumbering' value='بارگذاریشمارهگذاریخط'/>  		<cd:command name='setuplines' value='بارگذاریخطها'/>  		<cd:command name='setuplinewidth' value='بارگذاریعرضخط'/> @@ -1804,6 +1956,10 @@  		<cd:command name='setupmarking' value='بارگذارینشانهگذاری'/>  		<cd:command name='setupmathalignment' value='بارگذاریتنظیمریاضی'/>  		<cd:command name='setupnarrower' value='بارگذاریباریکتر'/> +		<cd:command name='setupnotation' value='setupnotation'/> +		<cd:command name='setupnotations' value='setupnotations'/> +		<cd:command name='setupnote' value='setupnote'/> +		<cd:command name='setupnotes' value='setupnotes'/>  		<cd:command name='setupnumber' value='بارگذاریشماره'/>  		<cd:command name='setupnumbering' value='بارگذاریشمارهگذاری'/>  		<cd:command name='setupoppositeplacing' value='بارگذاریدرجمخالف'/> @@ -1817,6 +1973,7 @@  		<cd:command name='setuppapersize' value='بارگذاریاندازهبرگ'/>  		<cd:command name='setupparagraphnumbering' value='بارگذاریشمارهگذاریپاراگراف'/>  		<cd:command name='setupparagraphs' value='بارگذاریپاراگرافها'/> +		<cd:command name='setupperiodkerning' value='setupperiodkerning'/>  		<cd:command name='setupplacement' value='بارگذاریجانشانی'/>  		<cd:command name='setuppositioning' value='بارگذاریمکانگذاری'/>  		<cd:command name='setupprofiles' value='بارگذاریپروفایلها'/> @@ -1846,6 +2003,7 @@  		<cd:command name='setuptabulate' value='بارگذاریجدولبندی'/>  		<cd:command name='setuptext' value='بارگذاریمتن'/>  		<cd:command name='setuptextbackground' value='setuptextbackground'/> +		<cd:command name='setuptextnote' value='setuptextnote'/>  		<cd:command name='setuptextposition' value='بارگذاریمکانمتن'/>  		<cd:command name='setuptextrules' value='بارگذاریخطهایمتن'/>  		<cd:command name='setuptexttexts' value='بارگذاریمتنمتنها'/> @@ -1860,16 +2018,29 @@  		<cd:command name='setupurl' value='setupurl'/>  		<cd:command name='setupversions' value='بارگذارینسخهها'/>  		<cd:command name='setupwhitespace' value='بارگذاریفضایسفید'/> +		<cd:command name='setvisualizerfont' value='setvisualizerfont'/>  		<cd:command name='showbodyfont' value='نمایشقلمبدنه'/>  		<cd:command name='showbodyfontenvironment' value='نمایشمحیطقلمبدنه'/>  		<cd:command name='showcolor' value='نمایشرنگ'/>  		<cd:command name='showcolorgroup' value='نمایشگروهرنگ'/> +		<cd:command name='showcounter' value='showcounter'/>  		<cd:command name='showexternalfigures' value='نمایششکلهایخارجی'/>  		<cd:command name='showfields' value='نمایشمیدانها'/> +		<cd:command name='showfont' value='showfont'/> +		<cd:command name='showfontdata' value='showfontdata'/> +		<cd:command name='showfontexpansion' value='showfontexpansion'/> +		<cd:command name='showfontitalics' value='showfontitalics'/> +		<cd:command name='showfontkerns' value='showfontkerns'/> +		<cd:command name='showfontparameters' value='showfontparameters'/> +		<cd:command name='showfontstrip' value='showfontstrip'/> +		<cd:command name='showfontstyle' value='showfontstyle'/>  		<cd:command name='showframe' value='نمایشقالب'/>  		<cd:command name='showgrid' value='نمایشتوری'/> +		<cd:command name='showhyphenationtrace' value='showhyphenationtrace'/> +		<cd:command name='showkerning' value='showkerning'/>  		<cd:command name='showlayout' value='نمایشطرحبندی'/>  		<cd:command name='showmakeup' value='نمایشآرایش'/> +		<cd:command name='showminimalbaseline' value='showminimalbaseline'/>  		<cd:command name='showpalet' value='نمایشلوح'/>  		<cd:command name='showprint' value='نمایشچاپ'/>  		<cd:command name='showsetups' value='نمایشبارگذاریها'/> @@ -1879,6 +2050,7 @@  		<cd:command name='someline' value='یکخط'/>  		<cd:command name='somewhere' value='یکجا'/>  		<cd:command name='space' value='فضا'/> +		<cd:command name='specialitem' value='specialitem'/>  		<cd:command name='splitfloat' value='شکافتنشناور'/>  		<cd:command name='startalignment' value='شروعتنظیم'/>  		<cd:command name='startbackground' value='شروعپسزمینه'/> @@ -1896,6 +2068,7 @@  		<cd:command name='startglobal' value='شروعسراسری'/>  		<cd:command name='startline' value='شروعخط'/>  		<cd:command name='startlinecorrection' value='شروعتصحیحخط'/> +		<cd:command name='startlinenote' value='startlinenote'/>  		<cd:command name='startlinenumbering' value='شروعشمارهگذاریخط'/>  		<cd:command name='startlines' value='شروعخطها'/>  		<cd:command name='startlocal' value='شروعموضعی'/> @@ -1938,6 +2111,7 @@  		<cd:command name='stopglobal' value='پایانسراسری'/>  		<cd:command name='stopline' value='پایانخط'/>  		<cd:command name='stoplinecorrection' value='پایانتصحیحخط'/> +		<cd:command name='stoplinenote' value='stoplinenote'/>  		<cd:command name='stoplinenumbering' value='پایانشمارهگذاریخط'/>  		<cd:command name='stoplines' value='پایانخطها'/>  		<cd:command name='stoplocal' value='پایانموضعی'/> @@ -1965,8 +2139,11 @@  		<cd:command name='stopunpacked' value='پایانغیرفشرده'/>  		<cd:command name='stopversion' value='پایاننسخه'/>  		<cd:command name='stretched' value='کشیده'/> +		<cd:command name='strictinspectnextcharacter' value='strictinspectnextcharacter'/> +		<cd:command name='stripcharacter' value='stripcharacter'/>  		<cd:command name='subformulanumber' value='شمارهزیرفرمول'/>  		<cd:command name='subpagenumber' value='شمارهزیرصفحه'/> +		<cd:command name='subtractfeature' value='subtractfeature'/>  		<cd:command name='switchtobodyfont' value='تغییربهقلمبدنه'/>  		<cd:command name='switchtorawfont' value='تغییربهقلمخام'/>  		<cd:command name='sym' value='نم'/> @@ -1976,16 +2153,24 @@  		<cd:command name='synchronize' value='تطابق'/>  		<cd:command name='tab' value='تب'/>  		<cd:command name='testcolumn' value='ستونامتحان'/> +		<cd:command name='testfeature' value='testfeature'/> +		<cd:command name='testfeatureonce' value='testfeatureonce'/>  		<cd:command name='testpage' value='صفحهتست'/>  		<cd:command name='tex' value='تک'/>  		<cd:command name='textbackground' value='textbackground'/> +		<cd:command name='textcolor' value='textcolor'/>  		<cd:command name='textheight' value='ارتفاعمتن'/> +		<cd:command name='textnote' value='textnote'/>  		<cd:command name='textreference' value='مرجعمتن'/>  		<cd:command name='textrule' value='خطمتن'/>  		<cd:command name='textvariable' value='متغیر متن'/>  		<cd:command name='textwidth' value='عرضمتن'/> +		<cd:command name='thefirstcharacter' value='thefirstcharacter'/> +		<cd:command name='thenormalizedbodyfontsize' value='thenormalizedbodyfontsize'/> +		<cd:command name='theremainingcharacters' value='theremainingcharacters'/>  		<cd:command name='thinrule' value='خطنازک'/>  		<cd:command name='thinrules' value='خطهاینازک'/> +		<cd:command name='tolinenote' value='tolinenote'/>  		<cd:command name='tooltip' value='tooltip'/>  		<cd:command name='topdistance' value='فاصلهبالا'/>  		<cd:command name='topheight' value='ارتفاعبالا'/> @@ -1996,13 +2181,19 @@  		<cd:command name='typ' value='typ'/>  		<cd:command name='type' value='تایپ'/>  		<cd:command name='typebuffer' value='تایپبافر'/> +		<cd:command name='typedefinedbuffer' value='typedefinedbuffer'/>  		<cd:command name='typefile' value='تایپپرونده'/> +		<cd:command name='typeinlinebuffer' value='typeinlinebuffer'/> +		<cd:command name='typing' value='typing'/>  		<cd:command name='unitmeaning' value='معنیواحد'/>  		<cd:command name='unknown' value='ناشناس'/> +		<cd:command name='unregisterhyphenationpattern' value='unregisterhyphenationpattern'/>  		<cd:command name='useJSscripts' value='useJSscripts'/>  		<cd:command name='useURL' value='useURL'/>  		<cd:command name='useXMLfilter' value='useXMLfilter'/>  		<cd:command name='useblocks' value='استفادهبلوکها'/> +		<cd:command name='usebodyfont' value='usebodyfont'/> +		<cd:command name='usebodyfontparameter' value='usebodyfontparameter'/>  		<cd:command name='usecommands' value='استفادهفرمانها'/>  		<cd:command name='useencoding' value='استفادهرمزینه'/>  		<cd:command name='useexternaldocument' value='استفادهنوشتارخارجی'/> @@ -2019,10 +2210,12 @@  		<cd:command name='usetypescript' value='استفادهدستخطتایپ'/>  		<cd:command name='usetypescriptfile' value='استفادهپروندهدستخطتایپ'/>  		<cd:command name='useurl' value='useurl'/> +		<cd:command name='verbatim' value='verbatim'/>  		<cd:command name='version' value='نسخه'/>  		<cd:command name='vl' value='خع'/>  		<cd:command name='weekday' value='روزهفته'/>  		<cd:command name='whitespace' value='فضایسفید'/> +		<cd:command name='widthspanningtext' value='widthspanningtext'/>  		<cd:command name='wordright' value='کلمهراست'/>  		<cd:command name='writebetweenlist' value='بنویسبینلیست'/>  		<cd:command name='writetolist' value='بنویسدرلیست'/> diff --git a/tex/context/interface/mkii/keys-ro.xml b/tex/context/interface/mkii/keys-ro.xml index 00f0388d9..382804b74 100644 --- a/tex/context/interface/mkii/keys-ro.xml +++ b/tex/context/interface/mkii/keys-ro.xml @@ -214,6 +214,7 @@  		<cd:variable name='flushouter' value='flushouter'/>  		<cd:variable name='flushright' value='flushright'/>  		<cd:variable name='followingpage' value='followingpage'/> +		<cd:variable name='font' value='font'/>  		<cd:variable name='footer' value='subsol'/>  		<cd:variable name='footnote' value='notasubsol'/>  		<cd:variable name='force' value='fortat'/> @@ -838,6 +839,7 @@  		<cd:constant name='focusin' value='focusin'/>  		<cd:constant name='focusoffset' value='focusoffset'/>  		<cd:constant name='focusout' value='focusout'/> +		<cd:constant name='font' value='font'/>  		<cd:constant name='footer' value='subsol'/>  		<cd:constant name='footerdistance' value='distantasubsol'/>  		<cd:constant name='footerstate' value='staresubsol'/> diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua index a890d3e0b..26b5e38bf 100644 --- a/tex/generic/context/luatex/luatex-fonts-merged.lua +++ b/tex/generic/context/luatex/luatex-fonts-merged.lua @@ -1,6 +1,6 @@  -- merged file : c:/data/develop/context/sources/luatex-fonts-merged.lua  -- parent file : c:/data/develop/context/sources/luatex-fonts.lua --- merge date  : 2020-07-24 15:15 +-- merge date  : 2020-07-27 16:21  do -- begin closure to overcome local limits and interference | 
