diff options
-rw-r--r-- | doc/context/documents/general/manuals/luametatex.pdf | bin | 1233630 -> 1233533 bytes | |||
-rw-r--r-- | doc/context/sources/general/manuals/luametatex/luametatex-tex.tex | 5 | ||||
-rw-r--r-- | tex/context/base/mkii/cont-new.mkii | 2 | ||||
-rw-r--r-- | tex/context/base/mkii/context.mkii | 2 | ||||
-rw-r--r-- | tex/context/base/mkii/mult-nl.mkii | 193 | ||||
-rw-r--r-- | tex/context/base/mkiv/cont-new.mkiv | 2 | ||||
-rw-r--r-- | tex/context/base/mkiv/context.mkiv | 2 | ||||
-rw-r--r-- | tex/context/base/mkiv/context.mkxl | 2 | ||||
-rw-r--r-- | tex/context/base/mkiv/lpdf-lmt.lmt | 4 | ||||
-rw-r--r-- | tex/context/base/mkiv/luat-fio.lmt | 90 | ||||
-rw-r--r-- | tex/context/base/mkiv/luat-fio.lua | 1 | ||||
-rw-r--r-- | tex/context/base/mkiv/luat-lib.mkiv | 2 | ||||
-rw-r--r-- | tex/context/base/mkiv/status-files.pdf | bin | 28112 -> 27809 bytes | |||
-rw-r--r-- | tex/context/base/mkiv/status-lua.pdf | bin | 254795 -> 254762 bytes | |||
-rw-r--r-- | tex/context/base/mkiv/trac-deb.lua | 48 | ||||
-rw-r--r-- | tex/context/base/mkiv/trac-deb.mkiv | 10 | ||||
-rw-r--r-- | tex/context/interface/mkii/keys-nl.xml | 193 | ||||
-rw-r--r-- | tex/generic/context/luatex/luatex-fonts-merged.lua | 2 |
18 files changed, 546 insertions, 12 deletions
diff --git a/doc/context/documents/general/manuals/luametatex.pdf b/doc/context/documents/general/manuals/luametatex.pdf Binary files differindex 50d999568..538fcfa26 100644 --- a/doc/context/documents/general/manuals/luametatex.pdf +++ b/doc/context/documents/general/manuals/luametatex.pdf diff --git a/doc/context/sources/general/manuals/luametatex/luametatex-tex.tex b/doc/context/sources/general/manuals/luametatex/luametatex-tex.tex index af058197b..648ee5eef 100644 --- a/doc/context/sources/general/manuals/luametatex/luametatex-tex.tex +++ b/doc/context/sources/general/manuals/luametatex/luametatex-tex.tex @@ -1539,14 +1539,15 @@ an error: This function has two optional arguments in case a token register is passed: \startfunctioncall -tex.runtoks(<token register>,force,grouped) +tex.runtoks(<token register>,force,grouped,obeymode) \stopfunctioncall Inside for instance an \type {\edef} the \type {runtoks} function behaves (at least tries to) like it were an \type {\the}. This prevents unwanted side effects: normally in such an definition tokens remain tokens and (for instance) characters don't become nodes. With the second argument you can force the local -main loop, no matter what. The third argument adds a level of grouping. +main loop, no matter what. The third argument adds a level of grouping. The last +argument tells the scanner to stay in the current mode. You can quit the local loop with \type {\endlocalcontrol} or from the \LUA\ end with \type {tex.quittoks}. In that case you end one level up! Of course in the diff --git a/tex/context/base/mkii/cont-new.mkii b/tex/context/base/mkii/cont-new.mkii index 57d7fd42c..5dfe01da9 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.22 10:51} +\newcontextversion{2020.07.22 21:15} %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 b6aee08f6..00fd9716e 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.22 10:51} +\edef\contextversion{2020.07.22 21:15} %D For those who want to use this: diff --git a/tex/context/base/mkii/mult-nl.mkii b/tex/context/base/mkii/mult-nl.mkii index 247813a81..d944ecccf 100644 --- a/tex/context/base/mkii/mult-nl.mkii +++ b/tex/context/base/mkii/mult-nl.mkii @@ -128,6 +128,9 @@ \setinterfacevariable{camel}{camel} \setinterfacevariable{cap}{kap} \setinterfacevariable{capital}{kapitaal} +\setinterfacevariable{category}{category} +\setinterfacevariable{cd:character}{cd:character} +\setinterfacevariable{cd:font}{cd:font} \setinterfacevariable{center}{centreer} \setinterfacevariable{centerlast}{centerlast} \setinterfacevariable{chapter}{hoofdstuk} @@ -186,6 +189,7 @@ \setinterfacevariable{external}{extern} \setinterfacevariable{extremestretch}{extremestretch} \setinterfacevariable{fact}{gegeven} +\setinterfacevariable{fallback}{fallback} \setinterfacevariable{february}{februari} \setinterfacevariable{field}{veld} \setinterfacevariable{figure}{figuur} @@ -804,8 +808,10 @@ \setinterfaceconstant{extras}{extras} \setinterfaceconstant{factor}{factor} \setinterfaceconstant{fallback}{terugval} +\setinterfaceconstant{fallbacks}{fallbacks} \setinterfaceconstant{family}{soort} \setinterfaceconstant{features}{features} +\setinterfaceconstant{featureset}{featureset} \setinterfaceconstant{fences}{fences} \setinterfaceconstant{field}{veld} \setinterfaceconstant{fieldbackgroundcolor}{veldachtergrondkleur} @@ -880,6 +886,7 @@ \setinterfaceconstant{increment}{verhoog} \setinterfaceconstant{incrementnumber}{verhoognummer} \setinterfaceconstant{indenting}{inspringen} +\setinterfaceconstant{indentlist}{indentlist} \setinterfaceconstant{indentnext}{springvolgendein} \setinterfaceconstant{index}{index} \setinterfaceconstant{indicator}{aanduiding} @@ -1084,6 +1091,7 @@ \setinterfaceconstant{period}{period} \setinterfaceconstant{place}{plaatsen} \setinterfaceconstant{placehead}{plaatskop} +\setinterfaceconstant{placeholder}{placeholder} \setinterfaceconstant{placestopper}{plaatsafsluiter} \setinterfaceconstant{position}{positie} \setinterfaceconstant{prefix}{prefix} @@ -1367,8 +1375,18 @@ \setinterfacecommand{Word}{Woord} \setinterfacecommand{Words}{Woorden} \setinterfacecommand{about}{about} +\setinterfacecommand{adaptfontfeature}{adaptfontfeature} \setinterfacecommand{adaptlayout}{paslayoutaan} +\setinterfacecommand{addfeature}{addfeature} +\setinterfacecommand{alignbottom}{alignbottom} +\setinterfacecommand{aligned}{aligned} +\setinterfacecommand{alignedbox}{alignedbox} +\setinterfacecommand{alignedline}{alignedline} +\setinterfacecommand{alignhere}{alignhere} \setinterfacecommand{alignment}{uitlijnen} +\setinterfacecommand{alignmentcharacter}{alignmentcharacter} +\setinterfacecommand{applytocharacters}{applytocharacters} +\setinterfacecommand{applytofirstcharacter}{applytofirstcharacter} \setinterfacecommand{arg}{arg} \setinterfacecommand{at}{op} \setinterfacecommand{atleftmargin}{oplinkermarge} @@ -1380,9 +1398,13 @@ \setinterfacecommand{blackrules}{blokjes} \setinterfacecommand{blank}{blanko} \setinterfacecommand{bookmark}{bookmark} +\setinterfacecommand{bottombox}{bottombox} \setinterfacecommand{bottomdistance}{onderafstand} \setinterfacecommand{bottomheight}{onderhoogte} +\setinterfacecommand{bottomleftbox}{bottomleftbox} +\setinterfacecommand{bottomrightbox}{bottomrightbox} \setinterfacecommand{bottomspace}{bodemwit} +\setinterfacecommand{buildtextbottomdot}{buildtextbottomdot} \setinterfacecommand{but}{but} \setinterfacecommand{button}{button} \setinterfacecommand{bypassblocks}{passeerblokken} @@ -1421,8 +1443,11 @@ \setinterfacecommand{defineblock}{definieerblok} \setinterfacecommand{definebodyfont}{definieerkorps} \setinterfacecommand{definebodyfontenvironment}{definieerkorpsomgeving} +\setinterfacecommand{definebodyfontswitch}{definebodyfontswitch} \setinterfacecommand{definebuffer}{definieerbuffer} \setinterfacecommand{definecharacter}{definieerkarakter} +\setinterfacecommand{definecharacterkerning}{definecharacterkerning} +\setinterfacecommand{definecharacterspacing}{definecharacterspacing} \setinterfacecommand{definecolor}{definieerkleur} \setinterfacecommand{definecolorgroup}{definieerkleurgroep} \setinterfacecommand{definecolumnbreak}{definieerkolomovergang} @@ -1432,37 +1457,57 @@ \setinterfacecommand{definecommand}{definieercommando} \setinterfacecommand{defineconversion}{definieerconversie} \setinterfacecommand{definedescription}{doordefinieren} +\setinterfacecommand{definedfont}{definedfont} \setinterfacecommand{defineenumeration}{doornummeren} +\setinterfacecommand{definefallbackfamily}{definefallbackfamily} \setinterfacecommand{definefield}{definieerveld} \setinterfacecommand{definefieldstack}{definieerveldstapel} \setinterfacecommand{definefiguresymbol}{definieerfiguursymbool} +\setinterfacecommand{definefilefallback}{definefilefallback} +\setinterfacecommand{definefirstline}{definefirstline} \setinterfacecommand{definefloat}{definieerplaatsblok} \setinterfacecommand{definefont}{definieerfont} +\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}{definieerfontstijl} \setinterfacecommand{definefontsynonym}{definieerfontsynoniem} \setinterfacecommand{defineframed}{definieeromlijnd} \setinterfacecommand{defineframedtext}{definieerkadertekst} +\setinterfacecommand{definefrozenfont}{definefrozenfont} \setinterfacecommand{definehbox}{definieerhbox} \setinterfacecommand{definehead}{definieerkop} +\setinterfacecommand{definehyphenationfeatures}{definehyphenationfeatures} \setinterfacecommand{defineindentedtext}{definieeringesprongentext} \setinterfacecommand{defineinmargin}{definieerinmarge} \setinterfacecommand{defineinteractionmenu}{definieerinteractiemenu} \setinterfacecommand{defineitemgroup}{definieeritemgroep} +\setinterfacecommand{defineitems}{defineitems} \setinterfacecommand{definelabel}{doorlabelen} \setinterfacecommand{definelayer}{definieerlayer} \setinterfacecommand{definelayout}{definieerlayout} +\setinterfacecommand{definelinenote}{definelinenote} \setinterfacecommand{definelist}{definieerlijst} \setinterfacecommand{definelogo}{definieerbeeldmerk} \setinterfacecommand{definemainfield}{definieerhoofdveld} \setinterfacecommand{definemakeup}{definieeropmaak} \setinterfacecommand{definemarking}{definieermarkering} \setinterfacecommand{definemathalignment}{definieerwiskundeuitlijnen} +\setinterfacecommand{definemode}{definemode} +\setinterfacecommand{definenamedcolor}{definenamedcolor} +\setinterfacecommand{definenote}{definenote} \setinterfacecommand{defineoutput}{definieeruitvoer} \setinterfacecommand{defineoverlay}{definieeroverlay} \setinterfacecommand{definepagebreak}{definieerpaginaovergang} \setinterfacecommand{definepalet}{definieerpalet} \setinterfacecommand{definepapersize}{definieerpapierformaat} \setinterfacecommand{defineparagraphs}{definieeralineas} +\setinterfacecommand{defineperiodkerning}{defineperiodkerning} \setinterfacecommand{defineplacement}{definieerplaats} \setinterfacecommand{defineprofile}{definieerprofiel} \setinterfacecommand{defineprogram}{definieerprogramma} @@ -1484,33 +1529,45 @@ \setinterfacecommand{definetabulate}{definieertabulatie} \setinterfacecommand{definetext}{definieertekst} \setinterfacecommand{definetextbackground}{definieertekstachtergrond} +\setinterfacecommand{definetextnote}{definetextnote} \setinterfacecommand{definetextposition}{definieertekstpositie} \setinterfacecommand{definetextvariable}{definieertekstvariabele} \setinterfacecommand{definetype}{definieertype} \setinterfacecommand{definetyping}{definieertypen} \setinterfacecommand{defineversion}{definieerversie} +\setinterfacecommand{depthspanningtext}{depthspanningtext} \setinterfacecommand{determineheadnumber}{bepaalkopnummer} \setinterfacecommand{determinelistcharacteristics}{bepaallijstkenmerken} \setinterfacecommand{determineregistercharacteristics}{bepaalregisterkenmerken} \setinterfacecommand{dimension}{dimensie} \setinterfacecommand{disableinteractionmenu}{blokkeerinteractiemenu} +\setinterfacecommand{disablemode}{disablemode} +\setinterfacecommand{doaddfeature}{doaddfeature} \setinterfacecommand{domicile}{woonplaats} +\setinterfacecommand{dontconvertfont}{dontconvertfont} \setinterfacecommand{donttest}{geentest} \setinterfacecommand{edgedistance}{randafstand} \setinterfacecommand{edgewidth}{randbreedte} +\setinterfacecommand{emphasisboldface}{emphasisboldface} \setinterfacecommand{emptylines}{legeregels} +\setinterfacecommand{enablemode}{enablemode} \setinterfacecommand{environment}{omgeving} \setinterfacecommand{externalfigure}{externfiguur} \setinterfacecommand{fact}{geg} +\setinterfacecommand{fastswitchtobodyfont}{fastswitchtobodyfont} +\setinterfacecommand{feature}{feature} \setinterfacecommand{field}{veld} \setinterfacecommand{fieldstack}{veldstapel} \setinterfacecommand{fillinfield}{invulveld} \setinterfacecommand{fillinline}{invulregel} \setinterfacecommand{fillinrules}{invullijnen} \setinterfacecommand{fillintext}{invultekst} +\setinterfacecommand{firstcharacter}{firstcharacter} \setinterfacecommand{fitfield}{passendveld} +\setinterfacecommand{fittopbaselinegrid}{fittopbaselinegrid} \setinterfacecommand{fixedspace}{vastespatie} \setinterfacecommand{fixedspaces}{vastespaties} +\setinterfacecommand{flushnotes}{flushnotes} \setinterfacecommand{followprofile}{volgprofiel} \setinterfacecommand{followprofileversion}{volgprofielversie} \setinterfacecommand{followversion}{volgversie} @@ -1519,13 +1576,19 @@ \setinterfacecommand{footnote}{voetnoot} \setinterfacecommand{footnotetext}{voetnoottekst} \setinterfacecommand{forceblocks}{forceerblokken} +\setinterfacecommand{forcecharacterstripping}{forcecharacterstripping} \setinterfacecommand{formulanumber}{formulenummer} \setinterfacecommand{fraction}{breuk} \setinterfacecommand{framed}{omlijnd} \setinterfacecommand{from}{uit} +\setinterfacecommand{fromlinenote}{fromlinenote} \setinterfacecommand{getbuffer}{haalbuffer} +\setinterfacecommand{getfirstcharacter}{getfirstcharacter} \setinterfacecommand{getmarking}{haalmarkering} \setinterfacecommand{getnumber}{haalnummer} +\setinterfacecommand{globaldisablemode}{globaldisablemode} +\setinterfacecommand{globalenablemode}{globalenablemode} +\setinterfacecommand{globalpreventmode}{globalpreventmode} \setinterfacecommand{godown}{omlaag} \setinterfacecommand{goto}{naar} \setinterfacecommand{gotobox}{naarbox} @@ -1541,6 +1604,7 @@ \setinterfacecommand{headnumber}{kopnummer} \setinterfacecommand{headsym}{kopsym} \setinterfacecommand{headtext}{koptekst} +\setinterfacecommand{heightspanningtext}{heightspanningtext} \setinterfacecommand{hideblocks}{verbergblokken} \setinterfacecommand{high}{hoog} \setinterfacecommand{hl}{hl} @@ -1572,26 +1636,37 @@ \setinterfacecommand{interactionbuttons}{interactiebuttons} \setinterfacecommand{interactionmenu}{interactiemenu} \setinterfacecommand{item}{som} +\setinterfacecommand{itemgroup}{itemgroup} \setinterfacecommand{items}{items} +\setinterfacecommand{itemtag}{itemtag} \setinterfacecommand{its}{its} \setinterfacecommand{keepblocks}{handhaafblokken} +\setinterfacecommand{kerncharacters}{kerncharacters} \setinterfacecommand{label}{label} \setinterfacecommand{labels}{labels} \setinterfacecommand{labeltext}{labeltekst} \setinterfacecommand{language}{taal} +\setinterfacecommand{languageCharacters}{languageCharacters} +\setinterfacecommand{languagecharacters}{languagecharacters} \setinterfacecommand{leftaligned}{regellinks} +\setinterfacecommand{leftbottombox}{leftbottombox} \setinterfacecommand{leftedgedistance}{linkerrandafstand} \setinterfacecommand{leftedgewidth}{linkerrandbreedte} +\setinterfacecommand{leftline}{leftline} \setinterfacecommand{leftmargindistance}{linkermargeafstand} \setinterfacecommand{leftmarginwidth}{linkermargebreedte} \setinterfacecommand{leg}{leg} \setinterfacecommand{linecorrection}{regelcorrectie} +\setinterfacecommand{linenote}{linenote} +\setinterfacecommand{linespanningtext}{linespanningtext} \setinterfacecommand{linewidth}{lijndikte} \setinterfacecommand{listheight}{lijsthoogte} \setinterfacecommand{listlength}{lijstlengte} \setinterfacecommand{listsymbol}{lijstsymbool} \setinterfacecommand{listwidth}{lijstbreedte} +\setinterfacecommand{loadfontgoodies}{loadfontgoodies} \setinterfacecommand{localfootnotes}{lokalevoetnoten} +\setinterfacecommand{localnotes}{localnotes} \setinterfacecommand{logfields}{registreervelden} \setinterfacecommand{lohi}{laho} \setinterfacecommand{low}{laag} @@ -1622,6 +1697,7 @@ \setinterfacecommand{nodimension}{geendimensie} \setinterfacecommand{noheaderandfooterlines}{geenhoofdenvoetregels} \setinterfacecommand{noindenting}{nietinspringen} +\setinterfacecommand{noitem}{noitem} \setinterfacecommand{nolist}{geenlijst} \setinterfacecommand{nomarking}{geenmarkering} \setinterfacecommand{nomoreblocks}{geenblokkenmeer} @@ -1629,6 +1705,7 @@ \setinterfacecommand{nop}{nop} \setinterfacecommand{nospace}{geenspatie} \setinterfacecommand{note}{noot} +\setinterfacecommand{notesymbol}{notesymbol} \setinterfacecommand{notopandbottomlines}{geenbovenenonderregels} \setinterfacecommand{notsmallcapped}{nokap} \setinterfacecommand{nowhitespace}{geenwitruimte} @@ -1640,6 +1717,7 @@ \setinterfacecommand{outermarginwidth}{buitenmargebreedte} \setinterfacecommand{packed}{opelkaar} \setinterfacecommand{page}{pagina} +\setinterfacecommand{pagebreak}{pagebreak} \setinterfacecommand{pagedepth}{paginadiepte} \setinterfacecommand{pagenumber}{paginanummer} \setinterfacecommand{pageoffset}{paginaoffset} @@ -1658,7 +1736,10 @@ \setinterfacecommand{placelist}{plaatslijst} \setinterfacecommand{placelistofsynonyms}{plaatslijstmetsynoniemen} \setinterfacecommand{placelocalfootnotes}{plaatslokalevoetnoten} +\setinterfacecommand{placelocalnotes}{placelocalnotes} \setinterfacecommand{placelogos}{plaatsbeeldmerken} +\setinterfacecommand{placenamedfloat}{placenamedfloat} +\setinterfacecommand{placenotes}{placenotes} \setinterfacecommand{placeongrid}{plaatsopgrid} \setinterfacecommand{placeontopofeachother}{plaatsonderelkaar} \setinterfacecommand{placepagenumber}{plaatspaginanummer} @@ -1671,9 +1752,17 @@ \setinterfacecommand{placetextvariable}{plaatstekstvariabele} \setinterfacecommand{position}{positioneer} \setinterfacecommand{positiontext}{positioneertekst} +\setinterfacecommand{postponenotes}{postponenotes} +\setinterfacecommand{postponingnotes}{postponingnotes} +\setinterfacecommand{predefinedfont}{predefinedfont} +\setinterfacecommand{predefinefont}{predefinefont} +\setinterfacecommand{presetdocument}{presetdocument} +\setinterfacecommand{prettyprintbuffer}{prettyprintbuffer} +\setinterfacecommand{preventmode}{preventmode} \setinterfacecommand{printpaperheight}{printpapierhoogte} \setinterfacecommand{printpaperwidth}{printpapierbreedte} \setinterfacecommand{processblocks}{verwerkblokken} +\setinterfacecommand{processbodyfontenvironmentlist}{processbodyfontenvironmentlist} \setinterfacecommand{processpage}{verwerkpagina} \setinterfacecommand{product}{produkt} \setinterfacecommand{program}{programma} @@ -1683,19 +1772,45 @@ \setinterfacecommand{quote}{citeer} \setinterfacecommand{ran}{ran} \setinterfacecommand{redo}{herhaal} +\setinterfacecommand{redoconvertfont}{redoconvertfont} \setinterfacecommand{ref}{ref} \setinterfacecommand{reference}{referentie} \setinterfacecommand{referral}{kenmerk} \setinterfacecommand{referraldate}{kenmerkdatum} \setinterfacecommand{referring}{refereer} +\setinterfacecommand{registerfontclass}{registerfontclass} +\setinterfacecommand{registerhyphenationexception}{registerhyphenationexception} +\setinterfacecommand{registerhyphenationpattern}{registerhyphenationpattern} \setinterfacecommand{remark}{toelichting} +\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}{resetmarkering} +\setinterfacecommand{resetmode}{resetmode} \setinterfacecommand{resetnumber}{resetnummer} +\setinterfacecommand{resetpath}{resetpath} +\setinterfacecommand{resetperiodkerning}{resetperiodkerning} +\setinterfacecommand{resetsystemmode}{resetsystemmode} \setinterfacecommand{resettext}{resettekstinhoud} +\setinterfacecommand{resetvisualizers}{resetvisualizers} +\setinterfacecommand{restoreglobalbodyfont}{restoreglobalbodyfont} +\setinterfacecommand{retestfeature}{retestfeature} +\setinterfacecommand{revivefeature}{revivefeature} \setinterfacecommand{rightaligned}{regelrechts} +\setinterfacecommand{rightbottombox}{rightbottombox} \setinterfacecommand{rightedgedistance}{rechterrandafstand} \setinterfacecommand{rightedgewidth}{rechterrandbreedte} +\setinterfacecommand{rightline}{rightline} \setinterfacecommand{rightmargindistance}{rechtermargeafstand} \setinterfacecommand{rightmarginwidth}{rechtermargebreedte} \setinterfacecommand{romannumerals}{romeins} @@ -1706,12 +1821,38 @@ \setinterfacecommand{selectblocks}{selecteerblokken} \setinterfacecommand{selectpaper}{selecteerpapier} \setinterfacecommand{selectversion}{selecteerversie} +\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}{setnummer} +\setinterfacecommand{setperiodkerning}{setperiodkerning} +\setinterfacecommand{setsecondpasscharacteralign}{setsecondpasscharacteralign} +\setinterfacecommand{setsmallbodyfont}{setsmallbodyfont} +\setinterfacecommand{setsystemmode}{setsystemmode} \setinterfacecommand{settextcontent}{steltekstinhoudin} \setinterfacecommand{settextvariable}{kentekstvariabeletoe} \setinterfacecommand{setupalign}{steluitlijnenin} \setinterfacecommand{setupanswerarea}{stelantwoordgebiedin} \setinterfacecommand{setuparranging}{stelarrangerenin} +\setinterfacecommand{setupattachment}{setupattachment} \setinterfacecommand{setupbackground}{stelachtergrondin} \setinterfacecommand{setupbackgrounds}{stelachtergrondenin} \setinterfacecommand{setupblackrules}{stelblokjesin} @@ -1726,6 +1867,9 @@ \setinterfacecommand{setupcapitals}{stelkapitalenin} \setinterfacecommand{setupcaption}{stelblokkopjein} \setinterfacecommand{setupcaptions}{stelblokkopjesin} +\setinterfacecommand{setupcharacteralign}{setupcharacteralign} +\setinterfacecommand{setupcharacterkerning}{setupcharacterkerning} +\setinterfacecommand{setupcharacterspacing}{setupcharacterspacing} \setinterfacecommand{setupclipping}{stelclipin} \setinterfacecommand{setupcolor}{stelkleurin} \setinterfacecommand{setupcolors}{stelkleurenin} @@ -1736,6 +1880,7 @@ \setinterfacecommand{setupcombinations}{stelcombinatiesin} \setinterfacecommand{setupcombinedlist}{stelsamengesteldelijstin} \setinterfacecommand{setupcomment}{stelcommentaarin} +\setinterfacecommand{setupcounter}{setupcounter} \setinterfacecommand{setupdescription}{steldoordefinierenin} \setinterfacecommand{setupdescriptions}{steldoordefinierenin} \setinterfacecommand{setupenumeration}{steldoornummerenin} @@ -1745,9 +1890,14 @@ \setinterfacecommand{setupfields}{stelveldenin} \setinterfacecommand{setupfillinlines}{stelinvulregelsin} \setinterfacecommand{setupfillinrules}{stelinvullijnenin} +\setinterfacecommand{setupfirstline}{setupfirstline} \setinterfacecommand{setupfloat}{stelplaatsblokin} \setinterfacecommand{setupfloats}{stelplaatsblokkenin} \setinterfacecommand{setupfloatsplitting}{stelplaatsbloksplitsenin} +\setinterfacecommand{setupfontexpansion}{setupfontexpansion} +\setinterfacecommand{setupfontprotrusion}{setupfontprotrusion} +\setinterfacecommand{setupfonts}{setupfonts} +\setinterfacecommand{setupfontsolution}{setupfontsolution} \setinterfacecommand{setupfooter}{stelvoetin} \setinterfacecommand{setupfootertexts}{stelvoettekstenin} \setinterfacecommand{setupfootnotedefinition}{stelvoetnootdefinitiein} @@ -1764,6 +1914,7 @@ \setinterfacecommand{setupheadnumber}{stelkopnummerin} \setinterfacecommand{setupheads}{stelkoppenin} \setinterfacecommand{setupheadtext}{stelkoptekstin} +\setinterfacecommand{setuphyphenation}{setuphyphenation} \setinterfacecommand{setuphyphenmark}{stelkoppeltekenin} \setinterfacecommand{setupindentedtext}{stelingesprongentextin} \setinterfacecommand{setupindenting}{stelinspringenin} @@ -1780,6 +1931,7 @@ \setinterfacecommand{setuplanguage}{steltaalin} \setinterfacecommand{setuplayout}{stellayoutin} \setinterfacecommand{setuplegend}{stellegendain} +\setinterfacecommand{setuplinenote}{setuplinenote} \setinterfacecommand{setuplinenumbering}{stelregelnummerenin} \setinterfacecommand{setuplines}{stelregelsin} \setinterfacecommand{setuplinewidth}{stellijndiktein} @@ -1792,6 +1944,10 @@ \setinterfacecommand{setupmarking}{stelmarkeringin} \setinterfacecommand{setupmathalignment}{stelwiskundeuitlijnenin} \setinterfacecommand{setupnarrower}{stelsmallerin} +\setinterfacecommand{setupnotation}{setupnotation} +\setinterfacecommand{setupnotations}{setupnotations} +\setinterfacecommand{setupnote}{setupnote} +\setinterfacecommand{setupnotes}{setupnotes} \setinterfacecommand{setupnumber}{stelnummerin} \setinterfacecommand{setupnumbering}{stelnummerenin} \setinterfacecommand{setupoppositeplacing}{stelnaastplaatsenin} @@ -1805,6 +1961,7 @@ \setinterfacecommand{setuppapersize}{stelpapierformaatin} \setinterfacecommand{setupparagraphnumbering}{stelparagraafnummerenin} \setinterfacecommand{setupparagraphs}{stelalineasin} +\setinterfacecommand{setupperiodkerning}{setupperiodkerning} \setinterfacecommand{setupplacement}{stelplaatsin} \setinterfacecommand{setuppositioning}{stelpositionerenin} \setinterfacecommand{setupprofiles}{stelprofielenin} @@ -1834,6 +1991,7 @@ \setinterfacecommand{setuptabulate}{steltabulatiein} \setinterfacecommand{setuptext}{steltekstin} \setinterfacecommand{setuptextbackground}{steltekstachtergrondin} +\setinterfacecommand{setuptextnote}{setuptextnote} \setinterfacecommand{setuptextposition}{steltekstpositiein} \setinterfacecommand{setuptextrules}{steltekstlijnenin} \setinterfacecommand{setuptexttexts}{stelteksttekstenin} @@ -1848,16 +2006,29 @@ \setinterfacecommand{setupurl}{stelurlin} \setinterfacecommand{setupversions}{stelversiesin} \setinterfacecommand{setupwhitespace}{stelwitruimtein} +\setinterfacecommand{setvisualizerfont}{setvisualizerfont} \setinterfacecommand{showbodyfont}{toonkorps} \setinterfacecommand{showbodyfontenvironment}{toonkorpsomgeving} \setinterfacecommand{showcolor}{toonkleur} \setinterfacecommand{showcolorgroup}{toonkleurgroep} +\setinterfacecommand{showcounter}{showcounter} \setinterfacecommand{showexternalfigures}{toonexternefiguren} \setinterfacecommand{showfields}{toonvelden} +\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}{toonkader} \setinterfacecommand{showgrid}{toongrid} +\setinterfacecommand{showhyphenationtrace}{showhyphenationtrace} +\setinterfacecommand{showkerning}{showkerning} \setinterfacecommand{showlayout}{toonlayout} \setinterfacecommand{showmakeup}{toonopmaak} +\setinterfacecommand{showminimalbaseline}{showminimalbaseline} \setinterfacecommand{showpalet}{toonpalet} \setinterfacecommand{showprint}{toonprint} \setinterfacecommand{showsetups}{tooninstellingen} @@ -1867,6 +2038,7 @@ \setinterfacecommand{someline}{eenregel} \setinterfacecommand{somewhere}{ergens} \setinterfacecommand{space}{spatie} +\setinterfacecommand{specialitem}{specialitem} \setinterfacecommand{splitfloat}{splitsplaatsblok} \setinterfacecommand{startalignment}{startuitlijnen} \setinterfacecommand{startbackground}{startachtergrond} @@ -1884,6 +2056,7 @@ \setinterfacecommand{startglobal}{startglobaal} \setinterfacecommand{startline}{startregel} \setinterfacecommand{startlinecorrection}{startregelcorrectie} +\setinterfacecommand{startlinenote}{startlinenote} \setinterfacecommand{startlinenumbering}{startregelnummeren} \setinterfacecommand{startlines}{startregels} \setinterfacecommand{startlocal}{startlokaal} @@ -1926,6 +2099,7 @@ \setinterfacecommand{stopglobal}{stopglobaal} \setinterfacecommand{stopline}{stopregel} \setinterfacecommand{stoplinecorrection}{stopregelcorrectie} +\setinterfacecommand{stoplinenote}{stoplinenote} \setinterfacecommand{stoplinenumbering}{stopregelnummeren} \setinterfacecommand{stoplines}{stopregels} \setinterfacecommand{stoplocal}{stoplokaal} @@ -1953,8 +2127,11 @@ \setinterfacecommand{stopunpacked}{stopvanelkaar} \setinterfacecommand{stopversion}{stopversie} \setinterfacecommand{stretched}{uitgerekt} +\setinterfacecommand{strictinspectnextcharacter}{strictinspectnextcharacter} +\setinterfacecommand{stripcharacter}{stripcharacter} \setinterfacecommand{subformulanumber}{subformulenummer} \setinterfacecommand{subpagenumber}{subpaginanummer} +\setinterfacecommand{subtractfeature}{subtractfeature} \setinterfacecommand{switchtobodyfont}{switchnaarkorps} \setinterfacecommand{switchtorawfont}{switchtorawfont} \setinterfacecommand{sym}{sym} @@ -1964,16 +2141,24 @@ \setinterfacecommand{synchronize}{synchroniseer} \setinterfacecommand{tab}{tab} \setinterfacecommand{testcolumn}{testkolom} +\setinterfacecommand{testfeature}{testfeature} +\setinterfacecommand{testfeatureonce}{testfeatureonce} \setinterfacecommand{testpage}{testpagina} \setinterfacecommand{tex}{tex} \setinterfacecommand{textbackground}{tekstachtergrond} +\setinterfacecommand{textcolor}{textcolor} \setinterfacecommand{textheight}{teksthoogte} +\setinterfacecommand{textnote}{textnote} \setinterfacecommand{textreference}{tekstreferentie} \setinterfacecommand{textrule}{tekstlijn} \setinterfacecommand{textvariable}{tekstvariabele} \setinterfacecommand{textwidth}{tekstbreedte} +\setinterfacecommand{thefirstcharacter}{thefirstcharacter} +\setinterfacecommand{thenormalizedbodyfontsize}{thenormalizedbodyfontsize} +\setinterfacecommand{theremainingcharacters}{theremainingcharacters} \setinterfacecommand{thinrule}{dunnelijn} \setinterfacecommand{thinrules}{dunnelijnen} +\setinterfacecommand{tolinenote}{tolinenote} \setinterfacecommand{tooltip}{suggestie} \setinterfacecommand{topdistance}{bovenafstand} \setinterfacecommand{topheight}{bovenhoogte} @@ -1984,13 +2169,19 @@ \setinterfacecommand{typ}{typ} \setinterfacecommand{type}{type} \setinterfacecommand{typebuffer}{typebuffer} +\setinterfacecommand{typedefinedbuffer}{typedefinedbuffer} \setinterfacecommand{typefile}{typefile} +\setinterfacecommand{typeinlinebuffer}{typeinlinebuffer} +\setinterfacecommand{typing}{typing} \setinterfacecommand{unitmeaning}{betekenis} \setinterfacecommand{unknown}{onbekend} +\setinterfacecommand{unregisterhyphenationpattern}{unregisterhyphenationpattern} \setinterfacecommand{useJSscripts}{gebruikJSscripts} \setinterfacecommand{useURL}{gebruikURL} \setinterfacecommand{useXMLfilter}{gebruikXMLfilter} \setinterfacecommand{useblocks}{gebruikblokken} +\setinterfacecommand{usebodyfont}{usebodyfont} +\setinterfacecommand{usebodyfontparameter}{usebodyfontparameter} \setinterfacecommand{usecommands}{gebruikcommandos} \setinterfacecommand{useencoding}{usecodering} \setinterfacecommand{useexternaldocument}{gebruikexterndocument} @@ -2007,10 +2198,12 @@ \setinterfacecommand{usetypescript}{gebruiktypescript} \setinterfacecommand{usetypescriptfile}{gebruiktypescriptfile} \setinterfacecommand{useurl}{gebruikurl} +\setinterfacecommand{verbatim}{verbatim} \setinterfacecommand{version}{versie} \setinterfacecommand{vl}{vl} \setinterfacecommand{weekday}{weekdag} \setinterfacecommand{whitespace}{witruimte} +\setinterfacecommand{widthspanningtext}{widthspanningtext} \setinterfacecommand{wordright}{woordrechts} \setinterfacecommand{writebetweenlist}{schrijftussenlijst} \setinterfacecommand{writetolist}{schrijfnaarlijst} diff --git a/tex/context/base/mkiv/cont-new.mkiv b/tex/context/base/mkiv/cont-new.mkiv index cead1eed6..52b08dcf1 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.22 10:51} +\newcontextversion{2020.07.22 21:15} %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 81b89f509..70030293a 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.22 10:51} +\edef\contextversion{2020.07.22 21:15} %D Kind of special: diff --git a/tex/context/base/mkiv/context.mkxl b/tex/context/base/mkiv/context.mkxl index 13b31cc27..7581dc085 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.22 10:51} +\edef\contextversion{2020.07.22 21:15} %D Kind of special: diff --git a/tex/context/base/mkiv/lpdf-lmt.lmt b/tex/context/base/mkiv/lpdf-lmt.lmt index 7e992f79e..48297846e 100644 --- a/tex/context/base/mkiv/lpdf-lmt.lmt +++ b/tex/context/base/mkiv/lpdf-lmt.lmt @@ -927,7 +927,7 @@ local flushrule, flushsimplerule, flushspecialrule, flushimage, flushgroup do local f_w = formatters["[] 0 d 0 J %.6N w 0 0 %.6N %.6N re S"] local f_b = formatters["%.6N w 0 %.6N %.6N %.6N re f"] - local f_f = formatters["[] 0 d 0 J %.6N w %.6N %.6N %.6N %.6N re S"] + local f_x = formatters["[] 0 d 0 J %.6N w %.6N %.6N %.6N %.6N re S"] -- Historically the index is an object which is kind of bad. @@ -1357,7 +1357,7 @@ local flushrule, flushsimplerule, flushspecialrule, flushimage, flushgroup do local rule if outline then - rule = f_f(line,half,-depth+half,width-line,total-line) + rule = f_x(line,half,-depth+half,width-line,total-line) else rule = f_b(line,-depth,width,total) end diff --git a/tex/context/base/mkiv/luat-fio.lmt b/tex/context/base/mkiv/luat-fio.lmt new file mode 100644 index 000000000..4ce981c48 --- /dev/null +++ b/tex/context/base/mkiv/luat-fio.lmt @@ -0,0 +1,90 @@ +if not modules then modules = { } end modules ['luat-fio'] = { + version = 1.001, + comment = "companion to luat-lib.mkiv", + author = "Hans Hagen, PRAGMA-ADE, Hasselt NL", + copyright = "PRAGMA ADE / ConTeXt Development Team", + license = "see context related readme files" +} + +local format = string.format +local concat = table.concat + +texconfig.kpse_init = false -- can go away +texconfig.shell_escape = 't' -- can go away +texconfig.max_print_line = 100000 -- can go away +texconfig.max_in_open = 1000 -- can go away + +if not resolvers.initialized() then + + resolvers.reset() + + -- we now load the file database as we might need files other than + -- tex and lua file on the given path + + resolvers.load() + + if callback then + + local findbinfile = resolvers.findbinfile + local loadbinfile = resolvers.loadbinfile + local findtexfile = resolvers.findtexfile + local opentexfile = resolvers.opentexfile + local register = callbacks.register + + local ioflush = io.flush + local ioread = io.read + local writenl = texio.write_nl + + local function terminal() + writenl("\ntex console > ") + ioflush() + local line = ioread() + writenl("") + ioflush() + return line + end + + local function find_data_file(name, index) + if index == 0 then + return "terminal" + else + return findbinfile(name,"tex") + end + end + + local function open_data_file(name, index) + if index == 0 and name == "terminal" then + return { + reader = terminal, + noflines = 1, + filename = name, + } + else + return opentexfile(name) + end + end + + local function find_any_file(name) + return name + end + + register('find_data_file' , find_data_file, true) + register('open_data_file' , open_data_file, true) + register('find_log_file' , find_any_file, true) + register('find_format_file', find_any_file, true) + + end + +end + +statistics.register("resource resolver", function() + local scandata = resolvers.scandata() + return format("loadtime %s seconds, %s scans with scantime %s seconds, %s shared scans, %s found files, scanned paths: %s", + resolvers.loadtime(), + scandata.n, + scandata.time, + scandata.shared, + #resolvers.foundintrees(), + #scandata.paths > 0 and concat(scandata.paths," ") or "<none>" + ) +end) diff --git a/tex/context/base/mkiv/luat-fio.lua b/tex/context/base/mkiv/luat-fio.lua index 26db46a88..2418eec1b 100644 --- a/tex/context/base/mkiv/luat-fio.lua +++ b/tex/context/base/mkiv/luat-fio.lua @@ -8,7 +8,6 @@ if not modules then modules = { } end modules ['luat-fio'] = { local format = string.format local concat = table.concat -local sequenced = table.sequenced texconfig.kpse_init = false texconfig.shell_escape = 't' diff --git a/tex/context/base/mkiv/luat-lib.mkiv b/tex/context/base/mkiv/luat-lib.mkiv index a42d73f6d..4d3fd1823 100644 --- a/tex/context/base/mkiv/luat-lib.mkiv +++ b/tex/context/base/mkiv/luat-lib.mkiv @@ -79,7 +79,7 @@ \registerctxluafile{luat-cbk}{} \registerctxluafile{luat-run}{} -\registerctxluafile{luat-fio}{} +\registerctxluafile{luat-fio}{autosuffix} \registerctxluafile{luat-cnf}{} \registerctxluafile{luat-lua}{} \registerctxluafile{luat-sto}{} diff --git a/tex/context/base/mkiv/status-files.pdf b/tex/context/base/mkiv/status-files.pdf Binary files differindex ad9fe84a5..a2fbd86a7 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.pdf Binary files differindex 5eb3b2c86..d95c43f54 100644 --- a/tex/context/base/mkiv/status-lua.pdf +++ b/tex/context/base/mkiv/status-lua.pdf diff --git a/tex/context/base/mkiv/trac-deb.lua b/tex/context/base/mkiv/trac-deb.lua index c219b3cbd..c5d0183ff 100644 --- a/tex/context/base/mkiv/trac-deb.lua +++ b/tex/context/base/mkiv/trac-deb.lua @@ -25,6 +25,8 @@ local report_str = logs.writer tracers = tracers or { } local tracers = tracers +-- this is old tracing stuff ... will go to its own module + tracers.lists = { } local lists = tracers.lists @@ -108,6 +110,52 @@ function tracers.knownlist(name) return l and #l > 0 end +-- till here + +-- for now here + +if CONTEXTLMTXMODE > 0 then + + local ioflush = io.flush + local ioread = io.read + local writenl = texio.write_nl + local write = texio.write + + local runtoks = tex.runtoks + local terminaldata = false + local context = context + + interfaces.implement { + name = "fetchterminaldata", + actions = function() + context(terminaldata) + end, + } + + function texio.terminal() + writenl("\n" .. "entering interactive mode, use \\quit to abort reading" .."\n\n") + while true do + write(">") + ioflush() + terminaldata = ioread() + if terminaldata == "\\quit" then + terminaldata = false + break + else + runtoks("t_syst_terminal_data",nil,nil,true) -- obeymode + end + end + end + + interfaces.implement { + name = "readfromterminal", + public = true, + protected = true, + actions = texio.terminal, + } + +end + local savedluaerror = nil local usescitelexer = nil local quitonerror = true diff --git a/tex/context/base/mkiv/trac-deb.mkiv b/tex/context/base/mkiv/trac-deb.mkiv index b5366d88c..fcf58f37f 100644 --- a/tex/context/base/mkiv/trac-deb.mkiv +++ b/tex/context/base/mkiv/trac-deb.mkiv @@ -40,4 +40,14 @@ % \enabledirectives[system.showerror] +\unprotect + +\ifcase\contextlmtxmode \else + \newtoks \t_syst_terminal_data + % \t_syst_terminal_data {\beginlocalcontrol\clf_fetchterminaldata\endlocalcontrol} + \t_syst_terminal_data {\clf_fetchterminaldata} +\fi + +\protect + \protect \endinput diff --git a/tex/context/interface/mkii/keys-nl.xml b/tex/context/interface/mkii/keys-nl.xml index 913c60d56..e07dc1aaf 100644 --- a/tex/context/interface/mkii/keys-nl.xml +++ b/tex/context/interface/mkii/keys-nl.xml @@ -131,6 +131,9 @@ <cd:variable name='camel' value='camel'/> <cd:variable name='cap' value='kap'/> <cd:variable name='capital' value='kapitaal'/> + <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='centreer'/> <cd:variable name='centerlast' value='centerlast'/> <cd:variable name='chapter' value='hoofdstuk'/> @@ -189,6 +192,7 @@ <cd:variable name='external' value='extern'/> <cd:variable name='extremestretch' value='extremestretch'/> <cd:variable name='fact' value='gegeven'/> + <cd:variable name='fallback' value='fallback'/> <cd:variable name='february' value='februari'/> <cd:variable name='field' value='veld'/> <cd:variable name='figure' value='figuur'/> @@ -810,8 +814,10 @@ <cd:constant name='extras' value='extras'/> <cd:constant name='factor' value='factor'/> <cd:constant name='fallback' value='terugval'/> + <cd:constant name='fallbacks' value='fallbacks'/> <cd:constant name='family' value='soort'/> <cd:constant name='features' value='features'/> + <cd:constant name='featureset' value='featureset'/> <cd:constant name='fences' value='fences'/> <cd:constant name='field' value='veld'/> <cd:constant name='fieldbackgroundcolor' value='veldachtergrondkleur'/> @@ -886,6 +892,7 @@ <cd:constant name='increment' value='verhoog'/> <cd:constant name='incrementnumber' value='verhoognummer'/> <cd:constant name='indenting' value='inspringen'/> + <cd:constant name='indentlist' value='indentlist'/> <cd:constant name='indentnext' value='springvolgendein'/> <cd:constant name='index' value='index'/> <cd:constant name='indicator' value='aanduiding'/> @@ -1090,6 +1097,7 @@ <cd:constant name='period' value='period'/> <cd:constant name='place' value='plaatsen'/> <cd:constant name='placehead' value='plaatskop'/> + <cd:constant name='placeholder' value='placeholder'/> <cd:constant name='placestopper' value='plaatsafsluiter'/> <cd:constant name='position' value='positie'/> <cd:constant name='prefix' value='prefix'/> @@ -1379,8 +1387,18 @@ <cd:command name='Word' value='Woord'/> <cd:command name='Words' value='Woorden'/> <cd:command name='about' value='about'/> + <cd:command name='adaptfontfeature' value='adaptfontfeature'/> <cd:command name='adaptlayout' value='paslayoutaan'/> + <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='uitlijnen'/> + <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='op'/> <cd:command name='atleftmargin' value='oplinkermarge'/> @@ -1392,9 +1410,13 @@ <cd:command name='blackrules' value='blokjes'/> <cd:command name='blank' value='blanko'/> <cd:command name='bookmark' value='bookmark'/> + <cd:command name='bottombox' value='bottombox'/> <cd:command name='bottomdistance' value='onderafstand'/> <cd:command name='bottomheight' value='onderhoogte'/> + <cd:command name='bottomleftbox' value='bottomleftbox'/> + <cd:command name='bottomrightbox' value='bottomrightbox'/> <cd:command name='bottomspace' value='bodemwit'/> + <cd:command name='buildtextbottomdot' value='buildtextbottomdot'/> <cd:command name='but' value='but'/> <cd:command name='button' value='button'/> <cd:command name='bypassblocks' value='passeerblokken'/> @@ -1433,8 +1455,11 @@ <cd:command name='defineblock' value='definieerblok'/> <cd:command name='definebodyfont' value='definieerkorps'/> <cd:command name='definebodyfontenvironment' value='definieerkorpsomgeving'/> + <cd:command name='definebodyfontswitch' value='definebodyfontswitch'/> <cd:command name='definebuffer' value='definieerbuffer'/> <cd:command name='definecharacter' value='definieerkarakter'/> + <cd:command name='definecharacterkerning' value='definecharacterkerning'/> + <cd:command name='definecharacterspacing' value='definecharacterspacing'/> <cd:command name='definecolor' value='definieerkleur'/> <cd:command name='definecolorgroup' value='definieerkleurgroep'/> <cd:command name='definecolumnbreak' value='definieerkolomovergang'/> @@ -1444,37 +1469,57 @@ <cd:command name='definecommand' value='definieercommando'/> <cd:command name='defineconversion' value='definieerconversie'/> <cd:command name='definedescription' value='doordefinieren'/> + <cd:command name='definedfont' value='definedfont'/> <cd:command name='defineenumeration' value='doornummeren'/> + <cd:command name='definefallbackfamily' value='definefallbackfamily'/> <cd:command name='definefield' value='definieerveld'/> <cd:command name='definefieldstack' value='definieerveldstapel'/> <cd:command name='definefiguresymbol' value='definieerfiguursymbool'/> + <cd:command name='definefilefallback' value='definefilefallback'/> + <cd:command name='definefirstline' value='definefirstline'/> <cd:command name='definefloat' value='definieerplaatsblok'/> <cd:command name='definefont' value='definieerfont'/> + <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='definieerfontstijl'/> <cd:command name='definefontsynonym' value='definieerfontsynoniem'/> <cd:command name='defineframed' value='definieeromlijnd'/> <cd:command name='defineframedtext' value='definieerkadertekst'/> + <cd:command name='definefrozenfont' value='definefrozenfont'/> <cd:command name='definehbox' value='definieerhbox'/> <cd:command name='definehead' value='definieerkop'/> + <cd:command name='definehyphenationfeatures' value='definehyphenationfeatures'/> <cd:command name='defineindentedtext' value='definieeringesprongentext'/> <cd:command name='defineinmargin' value='definieerinmarge'/> <cd:command name='defineinteractionmenu' value='definieerinteractiemenu'/> <cd:command name='defineitemgroup' value='definieeritemgroep'/> + <cd:command name='defineitems' value='defineitems'/> <cd:command name='definelabel' value='doorlabelen'/> <cd:command name='definelayer' value='definieerlayer'/> <cd:command name='definelayout' value='definieerlayout'/> + <cd:command name='definelinenote' value='definelinenote'/> <cd:command name='definelist' value='definieerlijst'/> <cd:command name='definelogo' value='definieerbeeldmerk'/> <cd:command name='definemainfield' value='definieerhoofdveld'/> <cd:command name='definemakeup' value='definieeropmaak'/> <cd:command name='definemarking' value='definieermarkering'/> <cd:command name='definemathalignment' value='definieerwiskundeuitlijnen'/> + <cd:command name='definemode' value='definemode'/> + <cd:command name='definenamedcolor' value='definenamedcolor'/> + <cd:command name='definenote' value='definenote'/> <cd:command name='defineoutput' value='definieeruitvoer'/> <cd:command name='defineoverlay' value='definieeroverlay'/> <cd:command name='definepagebreak' value='definieerpaginaovergang'/> <cd:command name='definepalet' value='definieerpalet'/> <cd:command name='definepapersize' value='definieerpapierformaat'/> <cd:command name='defineparagraphs' value='definieeralineas'/> + <cd:command name='defineperiodkerning' value='defineperiodkerning'/> <cd:command name='defineplacement' value='definieerplaats'/> <cd:command name='defineprofile' value='definieerprofiel'/> <cd:command name='defineprogram' value='definieerprogramma'/> @@ -1496,33 +1541,45 @@ <cd:command name='definetabulate' value='definieertabulatie'/> <cd:command name='definetext' value='definieertekst'/> <cd:command name='definetextbackground' value='definieertekstachtergrond'/> + <cd:command name='definetextnote' value='definetextnote'/> <cd:command name='definetextposition' value='definieertekstpositie'/> <cd:command name='definetextvariable' value='definieertekstvariabele'/> <cd:command name='definetype' value='definieertype'/> <cd:command name='definetyping' value='definieertypen'/> <cd:command name='defineversion' value='definieerversie'/> + <cd:command name='depthspanningtext' value='depthspanningtext'/> <cd:command name='determineheadnumber' value='bepaalkopnummer'/> <cd:command name='determinelistcharacteristics' value='bepaallijstkenmerken'/> <cd:command name='determineregistercharacteristics' value='bepaalregisterkenmerken'/> <cd:command name='dimension' value='dimensie'/> <cd:command name='disableinteractionmenu' value='blokkeerinteractiemenu'/> + <cd:command name='disablemode' value='disablemode'/> + <cd:command name='doaddfeature' value='doaddfeature'/> <cd:command name='domicile' value='woonplaats'/> + <cd:command name='dontconvertfont' value='dontconvertfont'/> <cd:command name='donttest' value='geentest'/> <cd:command name='edgedistance' value='randafstand'/> <cd:command name='edgewidth' value='randbreedte'/> + <cd:command name='emphasisboldface' value='emphasisboldface'/> <cd:command name='emptylines' value='legeregels'/> + <cd:command name='enablemode' value='enablemode'/> <cd:command name='environment' value='omgeving'/> <cd:command name='externalfigure' value='externfiguur'/> <cd:command name='fact' value='geg'/> + <cd:command name='fastswitchtobodyfont' value='fastswitchtobodyfont'/> + <cd:command name='feature' value='feature'/> <cd:command name='field' value='veld'/> <cd:command name='fieldstack' value='veldstapel'/> <cd:command name='fillinfield' value='invulveld'/> <cd:command name='fillinline' value='invulregel'/> <cd:command name='fillinrules' value='invullijnen'/> <cd:command name='fillintext' value='invultekst'/> + <cd:command name='firstcharacter' value='firstcharacter'/> <cd:command name='fitfield' value='passendveld'/> + <cd:command name='fittopbaselinegrid' value='fittopbaselinegrid'/> <cd:command name='fixedspace' value='vastespatie'/> <cd:command name='fixedspaces' value='vastespaties'/> + <cd:command name='flushnotes' value='flushnotes'/> <cd:command name='followprofile' value='volgprofiel'/> <cd:command name='followprofileversion' value='volgprofielversie'/> <cd:command name='followversion' value='volgversie'/> @@ -1531,13 +1588,19 @@ <cd:command name='footnote' value='voetnoot'/> <cd:command name='footnotetext' value='voetnoottekst'/> <cd:command name='forceblocks' value='forceerblokken'/> + <cd:command name='forcecharacterstripping' value='forcecharacterstripping'/> <cd:command name='formulanumber' value='formulenummer'/> <cd:command name='fraction' value='breuk'/> <cd:command name='framed' value='omlijnd'/> <cd:command name='from' value='uit'/> + <cd:command name='fromlinenote' value='fromlinenote'/> <cd:command name='getbuffer' value='haalbuffer'/> + <cd:command name='getfirstcharacter' value='getfirstcharacter'/> <cd:command name='getmarking' value='haalmarkering'/> <cd:command name='getnumber' value='haalnummer'/> + <cd:command name='globaldisablemode' value='globaldisablemode'/> + <cd:command name='globalenablemode' value='globalenablemode'/> + <cd:command name='globalpreventmode' value='globalpreventmode'/> <cd:command name='godown' value='omlaag'/> <cd:command name='goto' value='naar'/> <cd:command name='gotobox' value='naarbox'/> @@ -1553,6 +1616,7 @@ <cd:command name='headnumber' value='kopnummer'/> <cd:command name='headsym' value='kopsym'/> <cd:command name='headtext' value='koptekst'/> + <cd:command name='heightspanningtext' value='heightspanningtext'/> <cd:command name='hideblocks' value='verbergblokken'/> <cd:command name='high' value='hoog'/> <cd:command name='hl' value='hl'/> @@ -1584,26 +1648,37 @@ <cd:command name='interactionbuttons' value='interactiebuttons'/> <cd:command name='interactionmenu' value='interactiemenu'/> <cd:command name='item' value='som'/> + <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='handhaafblokken'/> + <cd:command name='kerncharacters' value='kerncharacters'/> <cd:command name='label' value='label'/> <cd:command name='labels' value='labels'/> <cd:command name='labeltext' value='labeltekst'/> <cd:command name='language' value='taal'/> + <cd:command name='languageCharacters' value='languageCharacters'/> + <cd:command name='languagecharacters' value='languagecharacters'/> <cd:command name='leftaligned' value='regellinks'/> + <cd:command name='leftbottombox' value='leftbottombox'/> <cd:command name='leftedgedistance' value='linkerrandafstand'/> <cd:command name='leftedgewidth' value='linkerrandbreedte'/> + <cd:command name='leftline' value='leftline'/> <cd:command name='leftmargindistance' value='linkermargeafstand'/> <cd:command name='leftmarginwidth' value='linkermargebreedte'/> <cd:command name='leg' value='leg'/> <cd:command name='linecorrection' value='regelcorrectie'/> + <cd:command name='linenote' value='linenote'/> + <cd:command name='linespanningtext' value='linespanningtext'/> <cd:command name='linewidth' value='lijndikte'/> <cd:command name='listheight' value='lijsthoogte'/> <cd:command name='listlength' value='lijstlengte'/> <cd:command name='listsymbol' value='lijstsymbool'/> <cd:command name='listwidth' value='lijstbreedte'/> + <cd:command name='loadfontgoodies' value='loadfontgoodies'/> <cd:command name='localfootnotes' value='lokalevoetnoten'/> + <cd:command name='localnotes' value='localnotes'/> <cd:command name='logfields' value='registreervelden'/> <cd:command name='lohi' value='laho'/> <cd:command name='low' value='laag'/> @@ -1634,6 +1709,7 @@ <cd:command name='nodimension' value='geendimensie'/> <cd:command name='noheaderandfooterlines' value='geenhoofdenvoetregels'/> <cd:command name='noindenting' value='nietinspringen'/> + <cd:command name='noitem' value='noitem'/> <cd:command name='nolist' value='geenlijst'/> <cd:command name='nomarking' value='geenmarkering'/> <cd:command name='nomoreblocks' value='geenblokkenmeer'/> @@ -1641,6 +1717,7 @@ <cd:command name='nop' value='nop'/> <cd:command name='nospace' value='geenspatie'/> <cd:command name='note' value='noot'/> + <cd:command name='notesymbol' value='notesymbol'/> <cd:command name='notopandbottomlines' value='geenbovenenonderregels'/> <cd:command name='notsmallcapped' value='nokap'/> <cd:command name='nowhitespace' value='geenwitruimte'/> @@ -1652,6 +1729,7 @@ <cd:command name='outermarginwidth' value='buitenmargebreedte'/> <cd:command name='packed' value='opelkaar'/> <cd:command name='page' value='pagina'/> + <cd:command name='pagebreak' value='pagebreak'/> <cd:command name='pagedepth' value='paginadiepte'/> <cd:command name='pagenumber' value='paginanummer'/> <cd:command name='pageoffset' value='paginaoffset'/> @@ -1670,7 +1748,10 @@ <cd:command name='placelist' value='plaatslijst'/> <cd:command name='placelistofsynonyms' value='plaatslijstmetsynoniemen'/> <cd:command name='placelocalfootnotes' value='plaatslokalevoetnoten'/> + <cd:command name='placelocalnotes' value='placelocalnotes'/> <cd:command name='placelogos' value='plaatsbeeldmerken'/> + <cd:command name='placenamedfloat' value='placenamedfloat'/> + <cd:command name='placenotes' value='placenotes'/> <cd:command name='placeongrid' value='plaatsopgrid'/> <cd:command name='placeontopofeachother' value='plaatsonderelkaar'/> <cd:command name='placepagenumber' value='plaatspaginanummer'/> @@ -1683,9 +1764,17 @@ <cd:command name='placetextvariable' value='plaatstekstvariabele'/> <cd:command name='position' value='positioneer'/> <cd:command name='positiontext' value='positioneertekst'/> + <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='printpapierhoogte'/> <cd:command name='printpaperwidth' value='printpapierbreedte'/> <cd:command name='processblocks' value='verwerkblokken'/> + <cd:command name='processbodyfontenvironmentlist' value='processbodyfontenvironmentlist'/> <cd:command name='processpage' value='verwerkpagina'/> <cd:command name='product' value='produkt'/> <cd:command name='program' value='programma'/> @@ -1695,19 +1784,45 @@ <cd:command name='quote' value='citeer'/> <cd:command name='ran' value='ran'/> <cd:command name='redo' value='herhaal'/> + <cd:command name='redoconvertfont' value='redoconvertfont'/> <cd:command name='ref' value='ref'/> <cd:command name='reference' value='referentie'/> <cd:command name='referral' value='kenmerk'/> <cd:command name='referraldate' value='kenmerkdatum'/> <cd:command name='referring' value='refereer'/> + <cd:command name='registerfontclass' value='registerfontclass'/> + <cd:command name='registerhyphenationexception' value='registerhyphenationexception'/> + <cd:command name='registerhyphenationpattern' value='registerhyphenationpattern'/> <cd:command name='remark' value='toelichting'/> + <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='resetmarkering'/> + <cd:command name='resetmode' value='resetmode'/> <cd:command name='resetnumber' value='resetnummer'/> + <cd:command name='resetpath' value='resetpath'/> + <cd:command name='resetperiodkerning' value='resetperiodkerning'/> + <cd:command name='resetsystemmode' value='resetsystemmode'/> <cd:command name='resettext' value='resettekstinhoud'/> + <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='regelrechts'/> + <cd:command name='rightbottombox' value='rightbottombox'/> <cd:command name='rightedgedistance' value='rechterrandafstand'/> <cd:command name='rightedgewidth' value='rechterrandbreedte'/> + <cd:command name='rightline' value='rightline'/> <cd:command name='rightmargindistance' value='rechtermargeafstand'/> <cd:command name='rightmarginwidth' value='rechtermargebreedte'/> <cd:command name='romannumerals' value='romeins'/> @@ -1718,12 +1833,38 @@ <cd:command name='selectblocks' value='selecteerblokken'/> <cd:command name='selectpaper' value='selecteerpapier'/> <cd:command name='selectversion' value='selecteerversie'/> + <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='setnummer'/> + <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='steltekstinhoudin'/> <cd:command name='settextvariable' value='kentekstvariabeletoe'/> <cd:command name='setupalign' value='steluitlijnenin'/> <cd:command name='setupanswerarea' value='stelantwoordgebiedin'/> <cd:command name='setuparranging' value='stelarrangerenin'/> + <cd:command name='setupattachment' value='setupattachment'/> <cd:command name='setupbackground' value='stelachtergrondin'/> <cd:command name='setupbackgrounds' value='stelachtergrondenin'/> <cd:command name='setupblackrules' value='stelblokjesin'/> @@ -1738,6 +1879,9 @@ <cd:command name='setupcapitals' value='stelkapitalenin'/> <cd:command name='setupcaption' value='stelblokkopjein'/> <cd:command name='setupcaptions' value='stelblokkopjesin'/> + <cd:command name='setupcharacteralign' value='setupcharacteralign'/> + <cd:command name='setupcharacterkerning' value='setupcharacterkerning'/> + <cd:command name='setupcharacterspacing' value='setupcharacterspacing'/> <cd:command name='setupclipping' value='stelclipin'/> <cd:command name='setupcolor' value='stelkleurin'/> <cd:command name='setupcolors' value='stelkleurenin'/> @@ -1748,6 +1892,7 @@ <cd:command name='setupcombinations' value='stelcombinatiesin'/> <cd:command name='setupcombinedlist' value='stelsamengesteldelijstin'/> <cd:command name='setupcomment' value='stelcommentaarin'/> + <cd:command name='setupcounter' value='setupcounter'/> <cd:command name='setupdescription' value='steldoordefinierenin'/> <cd:command name='setupdescriptions' value='steldoordefinierenin'/> <cd:command name='setupenumeration' value='steldoornummerenin'/> @@ -1757,9 +1902,14 @@ <cd:command name='setupfields' value='stelveldenin'/> <cd:command name='setupfillinlines' value='stelinvulregelsin'/> <cd:command name='setupfillinrules' value='stelinvullijnenin'/> + <cd:command name='setupfirstline' value='setupfirstline'/> <cd:command name='setupfloat' value='stelplaatsblokin'/> <cd:command name='setupfloats' value='stelplaatsblokkenin'/> <cd:command name='setupfloatsplitting' value='stelplaatsbloksplitsenin'/> + <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='stelvoetin'/> <cd:command name='setupfootertexts' value='stelvoettekstenin'/> <cd:command name='setupfootnotedefinition' value='stelvoetnootdefinitiein'/> @@ -1776,6 +1926,7 @@ <cd:command name='setupheadnumber' value='stelkopnummerin'/> <cd:command name='setupheads' value='stelkoppenin'/> <cd:command name='setupheadtext' value='stelkoptekstin'/> + <cd:command name='setuphyphenation' value='setuphyphenation'/> <cd:command name='setuphyphenmark' value='stelkoppeltekenin'/> <cd:command name='setupindentedtext' value='stelingesprongentextin'/> <cd:command name='setupindenting' value='stelinspringenin'/> @@ -1792,6 +1943,7 @@ <cd:command name='setuplanguage' value='steltaalin'/> <cd:command name='setuplayout' value='stellayoutin'/> <cd:command name='setuplegend' value='stellegendain'/> + <cd:command name='setuplinenote' value='setuplinenote'/> <cd:command name='setuplinenumbering' value='stelregelnummerenin'/> <cd:command name='setuplines' value='stelregelsin'/> <cd:command name='setuplinewidth' value='stellijndiktein'/> @@ -1804,6 +1956,10 @@ <cd:command name='setupmarking' value='stelmarkeringin'/> <cd:command name='setupmathalignment' value='stelwiskundeuitlijnenin'/> <cd:command name='setupnarrower' value='stelsmallerin'/> + <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='stelnummerin'/> <cd:command name='setupnumbering' value='stelnummerenin'/> <cd:command name='setupoppositeplacing' value='stelnaastplaatsenin'/> @@ -1817,6 +1973,7 @@ <cd:command name='setuppapersize' value='stelpapierformaatin'/> <cd:command name='setupparagraphnumbering' value='stelparagraafnummerenin'/> <cd:command name='setupparagraphs' value='stelalineasin'/> + <cd:command name='setupperiodkerning' value='setupperiodkerning'/> <cd:command name='setupplacement' value='stelplaatsin'/> <cd:command name='setuppositioning' value='stelpositionerenin'/> <cd:command name='setupprofiles' value='stelprofielenin'/> @@ -1846,6 +2003,7 @@ <cd:command name='setuptabulate' value='steltabulatiein'/> <cd:command name='setuptext' value='steltekstin'/> <cd:command name='setuptextbackground' value='steltekstachtergrondin'/> + <cd:command name='setuptextnote' value='setuptextnote'/> <cd:command name='setuptextposition' value='steltekstpositiein'/> <cd:command name='setuptextrules' value='steltekstlijnenin'/> <cd:command name='setuptexttexts' value='stelteksttekstenin'/> @@ -1860,16 +2018,29 @@ <cd:command name='setupurl' value='stelurlin'/> <cd:command name='setupversions' value='stelversiesin'/> <cd:command name='setupwhitespace' value='stelwitruimtein'/> + <cd:command name='setvisualizerfont' value='setvisualizerfont'/> <cd:command name='showbodyfont' value='toonkorps'/> <cd:command name='showbodyfontenvironment' value='toonkorpsomgeving'/> <cd:command name='showcolor' value='toonkleur'/> <cd:command name='showcolorgroup' value='toonkleurgroep'/> + <cd:command name='showcounter' value='showcounter'/> <cd:command name='showexternalfigures' value='toonexternefiguren'/> <cd:command name='showfields' value='toonvelden'/> + <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='toonkader'/> <cd:command name='showgrid' value='toongrid'/> + <cd:command name='showhyphenationtrace' value='showhyphenationtrace'/> + <cd:command name='showkerning' value='showkerning'/> <cd:command name='showlayout' value='toonlayout'/> <cd:command name='showmakeup' value='toonopmaak'/> + <cd:command name='showminimalbaseline' value='showminimalbaseline'/> <cd:command name='showpalet' value='toonpalet'/> <cd:command name='showprint' value='toonprint'/> <cd:command name='showsetups' value='tooninstellingen'/> @@ -1879,6 +2050,7 @@ <cd:command name='someline' value='eenregel'/> <cd:command name='somewhere' value='ergens'/> <cd:command name='space' value='spatie'/> + <cd:command name='specialitem' value='specialitem'/> <cd:command name='splitfloat' value='splitsplaatsblok'/> <cd:command name='startalignment' value='startuitlijnen'/> <cd:command name='startbackground' value='startachtergrond'/> @@ -1896,6 +2068,7 @@ <cd:command name='startglobal' value='startglobaal'/> <cd:command name='startline' value='startregel'/> <cd:command name='startlinecorrection' value='startregelcorrectie'/> + <cd:command name='startlinenote' value='startlinenote'/> <cd:command name='startlinenumbering' value='startregelnummeren'/> <cd:command name='startlines' value='startregels'/> <cd:command name='startlocal' value='startlokaal'/> @@ -1938,6 +2111,7 @@ <cd:command name='stopglobal' value='stopglobaal'/> <cd:command name='stopline' value='stopregel'/> <cd:command name='stoplinecorrection' value='stopregelcorrectie'/> + <cd:command name='stoplinenote' value='stoplinenote'/> <cd:command name='stoplinenumbering' value='stopregelnummeren'/> <cd:command name='stoplines' value='stopregels'/> <cd:command name='stoplocal' value='stoplokaal'/> @@ -1965,8 +2139,11 @@ <cd:command name='stopunpacked' value='stopvanelkaar'/> <cd:command name='stopversion' value='stopversie'/> <cd:command name='stretched' value='uitgerekt'/> + <cd:command name='strictinspectnextcharacter' value='strictinspectnextcharacter'/> + <cd:command name='stripcharacter' value='stripcharacter'/> <cd:command name='subformulanumber' value='subformulenummer'/> <cd:command name='subpagenumber' value='subpaginanummer'/> + <cd:command name='subtractfeature' value='subtractfeature'/> <cd:command name='switchtobodyfont' value='switchnaarkorps'/> <cd:command name='switchtorawfont' value='switchtorawfont'/> <cd:command name='sym' value='sym'/> @@ -1976,16 +2153,24 @@ <cd:command name='synchronize' value='synchroniseer'/> <cd:command name='tab' value='tab'/> <cd:command name='testcolumn' value='testkolom'/> + <cd:command name='testfeature' value='testfeature'/> + <cd:command name='testfeatureonce' value='testfeatureonce'/> <cd:command name='testpage' value='testpagina'/> <cd:command name='tex' value='tex'/> <cd:command name='textbackground' value='tekstachtergrond'/> + <cd:command name='textcolor' value='textcolor'/> <cd:command name='textheight' value='teksthoogte'/> + <cd:command name='textnote' value='textnote'/> <cd:command name='textreference' value='tekstreferentie'/> <cd:command name='textrule' value='tekstlijn'/> <cd:command name='textvariable' value='tekstvariabele'/> <cd:command name='textwidth' value='tekstbreedte'/> + <cd:command name='thefirstcharacter' value='thefirstcharacter'/> + <cd:command name='thenormalizedbodyfontsize' value='thenormalizedbodyfontsize'/> + <cd:command name='theremainingcharacters' value='theremainingcharacters'/> <cd:command name='thinrule' value='dunnelijn'/> <cd:command name='thinrules' value='dunnelijnen'/> + <cd:command name='tolinenote' value='tolinenote'/> <cd:command name='tooltip' value='suggestie'/> <cd:command name='topdistance' value='bovenafstand'/> <cd:command name='topheight' value='bovenhoogte'/> @@ -1996,13 +2181,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='betekenis'/> <cd:command name='unknown' value='onbekend'/> + <cd:command name='unregisterhyphenationpattern' value='unregisterhyphenationpattern'/> <cd:command name='useJSscripts' value='gebruikJSscripts'/> <cd:command name='useURL' value='gebruikURL'/> <cd:command name='useXMLfilter' value='gebruikXMLfilter'/> <cd:command name='useblocks' value='gebruikblokken'/> + <cd:command name='usebodyfont' value='usebodyfont'/> + <cd:command name='usebodyfontparameter' value='usebodyfontparameter'/> <cd:command name='usecommands' value='gebruikcommandos'/> <cd:command name='useencoding' value='usecodering'/> <cd:command name='useexternaldocument' value='gebruikexterndocument'/> @@ -2019,10 +2210,12 @@ <cd:command name='usetypescript' value='gebruiktypescript'/> <cd:command name='usetypescriptfile' value='gebruiktypescriptfile'/> <cd:command name='useurl' value='gebruikurl'/> + <cd:command name='verbatim' value='verbatim'/> <cd:command name='version' value='versie'/> <cd:command name='vl' value='vl'/> <cd:command name='weekday' value='weekdag'/> <cd:command name='whitespace' value='witruimte'/> + <cd:command name='widthspanningtext' value='widthspanningtext'/> <cd:command name='wordright' value='woordrechts'/> <cd:command name='writebetweenlist' value='schrijftussenlijst'/> <cd:command name='writetolist' value='schrijfnaarlijst'/> diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua index 55fcfd27b..33efe4581 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-22 10:51 +-- merge date : 2020-07-22 21:15 do -- begin closure to overcome local limits and interference |