From e853a2d8be8fc29f524a8a77edf216cb93c80606 Mon Sep 17 00:00:00 2001 From: Hans Hagen Date: Wed, 22 Jul 2020 21:49:53 +0200 Subject: 2020-07-22 21:18:00 --- .../documents/general/manuals/luametatex.pdf | Bin 1233630 -> 1233533 bytes .../general/manuals/luametatex/luametatex-tex.tex | 5 +- tex/context/base/mkii/cont-new.mkii | 2 +- tex/context/base/mkii/context.mkii | 2 +- tex/context/base/mkii/mult-nl.mkii | 193 +++++++++++++++++++++ tex/context/base/mkiv/cont-new.mkiv | 2 +- tex/context/base/mkiv/context.mkiv | 2 +- tex/context/base/mkiv/context.mkxl | 2 +- tex/context/base/mkiv/lpdf-lmt.lmt | 4 +- tex/context/base/mkiv/luat-fio.lmt | 90 ++++++++++ tex/context/base/mkiv/luat-fio.lua | 1 - tex/context/base/mkiv/luat-lib.mkiv | 2 +- tex/context/base/mkiv/status-files.pdf | Bin 28112 -> 27809 bytes tex/context/base/mkiv/status-lua.pdf | Bin 254795 -> 254762 bytes tex/context/base/mkiv/trac-deb.lua | 48 +++++ tex/context/base/mkiv/trac-deb.mkiv | 10 ++ tex/context/interface/mkii/keys-nl.xml | 193 +++++++++++++++++++++ tex/generic/context/luatex/luatex-fonts-merged.lua | 2 +- 18 files changed, 546 insertions(+), 12 deletions(-) create mode 100644 tex/context/base/mkiv/luat-fio.lmt diff --git a/doc/context/documents/general/manuals/luametatex.pdf b/doc/context/documents/general/manuals/luametatex.pdf index 50d999568..538fcfa26 100644 Binary files a/doc/context/documents/general/manuals/luametatex.pdf and b/doc/context/documents/general/manuals/luametatex.pdf differ 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(,force,grouped) +tex.runtoks(,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 "" + ) +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 index ad9fe84a5..a2fbd86a7 100644 Binary files a/tex/context/base/mkiv/status-files.pdf and b/tex/context/base/mkiv/status-files.pdf differ diff --git a/tex/context/base/mkiv/status-lua.pdf b/tex/context/base/mkiv/status-lua.pdf index 5eb3b2c86..d95c43f54 100644 Binary files a/tex/context/base/mkiv/status-lua.pdf and b/tex/context/base/mkiv/status-lua.pdf differ 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 @@ + + + @@ -189,6 +192,7 @@ + @@ -810,8 +814,10 @@ + + @@ -886,6 +892,7 @@ + @@ -1090,6 +1097,7 @@ + @@ -1379,8 +1387,18 @@ + + + + + + + + + + @@ -1392,9 +1410,13 @@ + + + + @@ -1433,8 +1455,11 @@ + + + @@ -1444,37 +1469,57 @@ + + + + + + + + + + + + + + + + + + + + @@ -1496,33 +1541,45 @@ + + + + + + + + + + + + @@ -1531,13 +1588,19 @@ + + + + + + @@ -1553,6 +1616,7 @@ + @@ -1584,26 +1648,37 @@ + + + + + + + + + + + @@ -1634,6 +1709,7 @@ + @@ -1641,6 +1717,7 @@ + @@ -1652,6 +1729,7 @@ + @@ -1670,7 +1748,10 @@ + + + @@ -1683,9 +1764,17 @@ + + + + + + + + @@ -1695,19 +1784,45 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1718,12 +1833,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1738,6 +1879,9 @@ + + + @@ -1748,6 +1892,7 @@ + @@ -1757,9 +1902,14 @@ + + + + + @@ -1776,6 +1926,7 @@ + @@ -1792,6 +1943,7 @@ + @@ -1804,6 +1956,10 @@ + + + + @@ -1817,6 +1973,7 @@ + @@ -1846,6 +2003,7 @@ + @@ -1860,16 +2018,29 @@ + + + + + + + + + + + + + @@ -1879,6 +2050,7 @@ + @@ -1896,6 +2068,7 @@ + @@ -1938,6 +2111,7 @@ + @@ -1965,8 +2139,11 @@ + + + @@ -1976,16 +2153,24 @@ + + + + + + + + @@ -1996,13 +2181,19 @@ + + + + + + @@ -2019,10 +2210,12 @@ + + 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 -- cgit v1.2.3