From 1dfbcb6ad4d660b8714c6bc5097c99497ce1a95d Mon Sep 17 00:00:00 2001 From: Hans Hagen Date: Mon, 20 Jul 2020 20:15:53 +0200 Subject: 2020-07-20 19:49:00 --- .../documents/general/manuals/luametatex.pdf | Bin 1366640 -> 1366739 bytes tex/context/base/mkii/cont-new.mkii | 2 +- tex/context/base/mkii/context.mkii | 2 +- tex/context/base/mkii/mult-cs.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/file-job.lua | 4 +- tex/context/base/mkiv/lpdf-lmt.lmt | 8 +- tex/context/base/mkiv/luat-cod.lua | 2 +- tex/context/base/mkiv/mult-def.lua | 6 + tex/context/base/mkiv/mult-ini.lua | 216 ++++++++------------- tex/context/base/mkiv/mult-ini.mkiv | 23 +-- tex/context/base/mkiv/status-files.pdf | Bin 28121 -> 28102 bytes tex/context/base/mkiv/status-lua.pdf | Bin 254753 -> 254946 bytes tex/context/base/mkiv/syst-ini.mkiv | 2 +- tex/context/base/mkiv/syst-ini.mkxl | 2 +- tex/context/interface/mkii/keys-cs.xml | 193 ++++++++++++++++++ tex/generic/context/luatex/luatex-fonts-merged.lua | 2 +- 19 files changed, 497 insertions(+), 164 deletions(-) diff --git a/doc/context/documents/general/manuals/luametatex.pdf b/doc/context/documents/general/manuals/luametatex.pdf index c4b036151..3ede0311e 100644 Binary files a/doc/context/documents/general/manuals/luametatex.pdf and b/doc/context/documents/general/manuals/luametatex.pdf differ diff --git a/tex/context/base/mkii/cont-new.mkii b/tex/context/base/mkii/cont-new.mkii index e4b73272e..aa8687cd7 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.20 15:33} +\newcontextversion{2020.07.20 19:47} %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 d0e63d10c..37073c6a1 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.20 15:33} +\edef\contextversion{2020.07.20 19:47} %D For those who want to use this: diff --git a/tex/context/base/mkii/mult-cs.mkii b/tex/context/base/mkii/mult-cs.mkii index 7842559e8..473946376 100644 --- a/tex/context/base/mkii/mult-cs.mkii +++ b/tex/context/base/mkii/mult-cs.mkii @@ -128,6 +128,9 @@ \setinterfacevariable{camel}{camel} \setinterfacevariable{cap}{kap} \setinterfacevariable{capital}{kapitalky} +\setinterfacevariable{category}{category} +\setinterfacevariable{cd:character}{cd:character} +\setinterfacevariable{cd:font}{cd:font} \setinterfacevariable{center}{center} \setinterfacevariable{centerlast}{centerlast} \setinterfacevariable{chapter}{kapitola} @@ -186,6 +189,7 @@ \setinterfacevariable{external}{externi} \setinterfacevariable{extremestretch}{extremestretch} \setinterfacevariable{fact}{fakt} +\setinterfacevariable{fallback}{fallback} \setinterfacevariable{february}{unor} \setinterfacevariable{field}{field} \setinterfacevariable{figure}{obrazek} @@ -804,8 +808,10 @@ \setinterfaceconstant{extras}{extras} \setinterfaceconstant{factor}{faktor} \setinterfaceconstant{fallback}{fallback} +\setinterfaceconstant{fallbacks}{fallbacks} \setinterfaceconstant{family}{rodina} \setinterfaceconstant{features}{features} +\setinterfaceconstant{featureset}{featureset} \setinterfaceconstant{fences}{fences} \setinterfaceconstant{field}{field} \setinterfaceconstant{fieldbackgroundcolor}{barvapozadipole} @@ -880,6 +886,7 @@ \setinterfaceconstant{increment}{zvysit} \setinterfaceconstant{incrementnumber}{zvysujicicislo} \setinterfaceconstant{indenting}{odsazovani} +\setinterfaceconstant{indentlist}{indentlist} \setinterfaceconstant{indentnext}{odsadpristi} \setinterfaceconstant{index}{index} \setinterfaceconstant{indicator}{indikator} @@ -1084,6 +1091,7 @@ \setinterfaceconstant{period}{period} \setinterfaceconstant{place}{umistit} \setinterfaceconstant{placehead}{umistihlavicku} +\setinterfaceconstant{placeholder}{placeholder} \setinterfaceconstant{placestopper}{predelmista} \setinterfaceconstant{position}{position} \setinterfaceconstant{prefix}{prefix} @@ -1367,8 +1375,18 @@ \setinterfacecommand{Word}{Slovo} \setinterfacecommand{Words}{Slova} \setinterfacecommand{about}{oref} +\setinterfacecommand{adaptfontfeature}{adaptfontfeature} \setinterfacecommand{adaptlayout}{prizpusobvzhled} +\setinterfacecommand{addfeature}{addfeature} +\setinterfacecommand{alignbottom}{alignbottom} +\setinterfacecommand{aligned}{aligned} +\setinterfacecommand{alignedbox}{alignedbox} +\setinterfacecommand{alignedline}{alignedline} +\setinterfacecommand{alignhere}{alignhere} \setinterfacecommand{alignment}{alignment} +\setinterfacecommand{alignmentcharacter}{alignmentcharacter} +\setinterfacecommand{applytocharacters}{applytocharacters} +\setinterfacecommand{applytofirstcharacter}{applytofirstcharacter} \setinterfacecommand{arg}{arg} \setinterfacecommand{at}{pref} \setinterfacecommand{atleftmargin}{atleftmargin} @@ -1380,9 +1398,13 @@ \setinterfacecommand{blackrules}{cernelinky} \setinterfacecommand{blank}{preskoc} \setinterfacecommand{bookmark}{zalozka} +\setinterfacecommand{bottombox}{bottombox} \setinterfacecommand{bottomdistance}{vzdalenostspodku} \setinterfacecommand{bottomheight}{vyskaspodku} +\setinterfacecommand{bottomleftbox}{bottomleftbox} +\setinterfacecommand{bottomrightbox}{bottomrightbox} \setinterfacecommand{bottomspace}{bottomspace} +\setinterfacecommand{buildtextbottomdot}{buildtextbottomdot} \setinterfacecommand{but}{spodek} \setinterfacecommand{button}{tlacitko} \setinterfacecommand{bypassblocks}{bypassblocks} @@ -1421,8 +1443,11 @@ \setinterfacecommand{defineblock}{definujblok} \setinterfacecommand{definebodyfont}{definujzakladnifont} \setinterfacecommand{definebodyfontenvironment}{definujprostredizakladnihofontu} +\setinterfacecommand{definebodyfontswitch}{definebodyfontswitch} \setinterfacecommand{definebuffer}{definujbuffer} \setinterfacecommand{definecharacter}{definujznak} +\setinterfacecommand{definecharacterkerning}{definecharacterkerning} +\setinterfacecommand{definecharacterspacing}{definecharacterspacing} \setinterfacecommand{definecolor}{definujbarvu} \setinterfacecommand{definecolorgroup}{definujskupinubarev} \setinterfacecommand{definecolumnbreak}{definecolumnbreak} @@ -1432,37 +1457,57 @@ \setinterfacecommand{definecommand}{definujprikaz} \setinterfacecommand{defineconversion}{definujkonverzi} \setinterfacecommand{definedescription}{definujpopis} +\setinterfacecommand{definedfont}{definedfont} \setinterfacecommand{defineenumeration}{definujvycet} +\setinterfacecommand{definefallbackfamily}{definefallbackfamily} \setinterfacecommand{definefield}{definujpole} \setinterfacecommand{definefieldstack}{definujzasobnikpoli} \setinterfacecommand{definefiguresymbol}{definujobrazeksymbol} +\setinterfacecommand{definefilefallback}{definefilefallback} +\setinterfacecommand{definefirstline}{definefirstline} \setinterfacecommand{definefloat}{definujplvouciobjekt} \setinterfacecommand{definefont}{definujfont} +\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}{definujstylfontu} \setinterfacecommand{definefontsynonym}{definujsynonumumfontu} \setinterfacecommand{defineframed}{definujoramovani} \setinterfacecommand{defineframedtext}{definujoramovanytext} +\setinterfacecommand{definefrozenfont}{definefrozenfont} \setinterfacecommand{definehbox}{definujhbox} \setinterfacecommand{definehead}{definujnadpis} +\setinterfacecommand{definehyphenationfeatures}{definehyphenationfeatures} \setinterfacecommand{defineindentedtext}{defineindentedtext} \setinterfacecommand{defineinmargin}{defineinmargin} \setinterfacecommand{defineinteractionmenu}{definujinterakcnimenu} \setinterfacecommand{defineitemgroup}{defineitemgroup} +\setinterfacecommand{defineitems}{defineitems} \setinterfacecommand{definelabel}{definujpopisek} \setinterfacecommand{definelayer}{definelayer} \setinterfacecommand{definelayout}{definelayout} +\setinterfacecommand{definelinenote}{definelinenote} \setinterfacecommand{definelist}{definujseznam} \setinterfacecommand{definelogo}{definujlogo} \setinterfacecommand{definemainfield}{definujhlavnipole} \setinterfacecommand{definemakeup}{definujupravu} \setinterfacecommand{definemarking}{definujznaceni} \setinterfacecommand{definemathalignment}{definemathalignment} +\setinterfacecommand{definemode}{definemode} +\setinterfacecommand{definenamedcolor}{definenamedcolor} +\setinterfacecommand{definenote}{definenote} \setinterfacecommand{defineoutput}{definujvystup} \setinterfacecommand{defineoverlay}{definujprekryv} \setinterfacecommand{definepagebreak}{definepagebreak} \setinterfacecommand{definepalet}{definujpaletu} \setinterfacecommand{definepapersize}{definujvelikostpapiru} \setinterfacecommand{defineparagraphs}{definujodstavce} +\setinterfacecommand{defineperiodkerning}{defineperiodkerning} \setinterfacecommand{defineplacement}{defineplacement} \setinterfacecommand{defineprofile}{definujprofil} \setinterfacecommand{defineprogram}{definujprogram} @@ -1484,33 +1529,45 @@ \setinterfacecommand{definetabulate}{definujtabelaci} \setinterfacecommand{definetext}{definujtext} \setinterfacecommand{definetextbackground}{definetextbackground} +\setinterfacecommand{definetextnote}{definetextnote} \setinterfacecommand{definetextposition}{definetextposition} \setinterfacecommand{definetextvariable}{definetextvariable} \setinterfacecommand{definetype}{definetype} \setinterfacecommand{definetyping}{definujopis} \setinterfacecommand{defineversion}{definujverzi} +\setinterfacecommand{depthspanningtext}{depthspanningtext} \setinterfacecommand{determineheadnumber}{stanovcislonadpisu} \setinterfacecommand{determinelistcharacteristics}{stanovcharakteristickuseznamu} \setinterfacecommand{determineregistercharacteristics}{urcicharakteristikurejstriku} \setinterfacecommand{dimension}{rozmer} \setinterfacecommand{disableinteractionmenu}{zablokujinterakcnimenu} +\setinterfacecommand{disablemode}{disablemode} +\setinterfacecommand{doaddfeature}{doaddfeature} \setinterfacecommand{domicile}{bydliste} +\setinterfacecommand{dontconvertfont}{dontconvertfont} \setinterfacecommand{donttest}{zadnytest} \setinterfacecommand{edgedistance}{vzdalenostokraje} \setinterfacecommand{edgewidth}{sirkaokraje} +\setinterfacecommand{emphasisboldface}{emphasisboldface} \setinterfacecommand{emptylines}{emptylines} +\setinterfacecommand{enablemode}{enablemode} \setinterfacecommand{environment}{prostredi} \setinterfacecommand{externalfigure}{externiobraz} \setinterfacecommand{fact}{fakt} +\setinterfacecommand{fastswitchtobodyfont}{fastswitchtobodyfont} +\setinterfacecommand{feature}{feature} \setinterfacecommand{field}{pole} \setinterfacecommand{fieldstack}{zasobnikpoli} \setinterfacecommand{fillinfield}{vyplnovepole} \setinterfacecommand{fillinline}{vyplnovyradek} \setinterfacecommand{fillinrules}{vyplnovelinky} \setinterfacecommand{fillintext}{vyplnenytext} +\setinterfacecommand{firstcharacter}{firstcharacter} \setinterfacecommand{fitfield}{prizpusobivepole} +\setinterfacecommand{fittopbaselinegrid}{fittopbaselinegrid} \setinterfacecommand{fixedspace}{tvrdamezera} \setinterfacecommand{fixedspaces}{tvrdemezery} +\setinterfacecommand{flushnotes}{flushnotes} \setinterfacecommand{followprofile}{dodrzujprofil} \setinterfacecommand{followprofileversion}{dodrzujverziprofilu} \setinterfacecommand{followversion}{dodrzujverzi} @@ -1519,13 +1576,19 @@ \setinterfacecommand{footnote}{poznamkapodcarou} \setinterfacecommand{footnotetext}{footnotetext} \setinterfacecommand{forceblocks}{forceblocks} +\setinterfacecommand{forcecharacterstripping}{forcecharacterstripping} \setinterfacecommand{formulanumber}{cislorovnice} \setinterfacecommand{fraction}{zlomek} \setinterfacecommand{framed}{oramovani} \setinterfacecommand{from}{zref} +\setinterfacecommand{fromlinenote}{fromlinenote} \setinterfacecommand{getbuffer}{ziskejbuffer} +\setinterfacecommand{getfirstcharacter}{getfirstcharacter} \setinterfacecommand{getmarking}{ziskejznaceni} \setinterfacecommand{getnumber}{getnumber} +\setinterfacecommand{globaldisablemode}{globaldisablemode} +\setinterfacecommand{globalenablemode}{globalenablemode} +\setinterfacecommand{globalpreventmode}{globalpreventmode} \setinterfacecommand{godown}{jdidolu} \setinterfacecommand{goto}{jdina} \setinterfacecommand{gotobox}{jdinabox} @@ -1541,6 +1604,7 @@ \setinterfacecommand{headnumber}{cislonadpisu} \setinterfacecommand{headsym}{headsym} \setinterfacecommand{headtext}{texthlavicky} +\setinterfacecommand{heightspanningtext}{heightspanningtext} \setinterfacecommand{hideblocks}{schovejbloky} \setinterfacecommand{high}{vysoky} \setinterfacecommand{hl}{hl} @@ -1572,26 +1636,37 @@ \setinterfacecommand{interactionbuttons}{interakcnitlacitka} \setinterfacecommand{interactionmenu}{interaktivnimenu} \setinterfacecommand{item}{polozka} +\setinterfacecommand{itemgroup}{itemgroup} \setinterfacecommand{items}{polozky} +\setinterfacecommand{itemtag}{itemtag} \setinterfacecommand{its}{pol} \setinterfacecommand{keepblocks}{zachovejbloky} +\setinterfacecommand{kerncharacters}{kerncharacters} \setinterfacecommand{label}{poppisek} \setinterfacecommand{labels}{popisky} \setinterfacecommand{labeltext}{textpopisku} \setinterfacecommand{language}{jazyk} +\setinterfacecommand{languageCharacters}{languageCharacters} +\setinterfacecommand{languagecharacters}{languagecharacters} \setinterfacecommand{leftaligned}{zarovnanovlevo} +\setinterfacecommand{leftbottombox}{leftbottombox} \setinterfacecommand{leftedgedistance}{vzdalenostlevehookraje} \setinterfacecommand{leftedgewidth}{sirkalevehookraje} +\setinterfacecommand{leftline}{leftline} \setinterfacecommand{leftmargindistance}{vzdalenostlevemarginalie} \setinterfacecommand{leftmarginwidth}{sirkalevemarginalie} \setinterfacecommand{leg}{leg} \setinterfacecommand{linecorrection}{linecorrection} +\setinterfacecommand{linenote}{linenote} +\setinterfacecommand{linespanningtext}{linespanningtext} \setinterfacecommand{linewidth}{tloustkacary} \setinterfacecommand{listheight}{vyskaseznamu} \setinterfacecommand{listlength}{delkaseznamu} \setinterfacecommand{listsymbol}{listsymbol} \setinterfacecommand{listwidth}{sirkaseznamu} +\setinterfacecommand{loadfontgoodies}{loadfontgoodies} \setinterfacecommand{localfootnotes}{localfootnotes} +\setinterfacecommand{localnotes}{localnotes} \setinterfacecommand{logfields}{zaznamovepole} \setinterfacecommand{lohi}{nivy} \setinterfacecommand{low}{nizky} @@ -1622,6 +1697,7 @@ \setinterfacecommand{nodimension}{zadnyrozmer} \setinterfacecommand{noheaderandfooterlines}{zadnezahlaviaupati} \setinterfacecommand{noindenting}{zadneodsazovani} +\setinterfacecommand{noitem}{noitem} \setinterfacecommand{nolist}{zadnyseznam} \setinterfacecommand{nomarking}{zadneznaceni} \setinterfacecommand{nomoreblocks}{zadnedalsibloky} @@ -1629,6 +1705,7 @@ \setinterfacecommand{nop}{nop} \setinterfacecommand{nospace}{zadnamezera} \setinterfacecommand{note}{poznamka} +\setinterfacecommand{notesymbol}{notesymbol} \setinterfacecommand{notopandbottomlines}{zadnehorniadolniradky} \setinterfacecommand{notsmallcapped}{nokap} \setinterfacecommand{nowhitespace}{zadnebilemisto} @@ -1640,6 +1717,7 @@ \setinterfacecommand{outermarginwidth}{outermarginwidth} \setinterfacecommand{packed}{zhustene} \setinterfacecommand{page}{strana} +\setinterfacecommand{pagebreak}{pagebreak} \setinterfacecommand{pagedepth}{pagedepth} \setinterfacecommand{pagenumber}{cislostrany} \setinterfacecommand{pageoffset}{pageoffset} @@ -1658,7 +1736,10 @@ \setinterfacecommand{placelist}{umistiseznam} \setinterfacecommand{placelistofsynonyms}{placelistofsynonyms} \setinterfacecommand{placelocalfootnotes}{umistilokalnipoznamkypodcarou} +\setinterfacecommand{placelocalnotes}{placelocalnotes} \setinterfacecommand{placelogos}{umistiloga} +\setinterfacecommand{placenamedfloat}{placenamedfloat} +\setinterfacecommand{placenotes}{placenotes} \setinterfacecommand{placeongrid}{umistinamrizku} \setinterfacecommand{placeontopofeachother}{umistinadsebe} \setinterfacecommand{placepagenumber}{placepagenumber} @@ -1671,9 +1752,17 @@ \setinterfacecommand{placetextvariable}{placetextvariable} \setinterfacecommand{position}{pozice} \setinterfacecommand{positiontext}{positiontext} +\setinterfacecommand{postponenotes}{postponenotes} +\setinterfacecommand{postponingnotes}{postponingnotes} +\setinterfacecommand{predefinedfont}{predefinedfont} +\setinterfacecommand{predefinefont}{predefinefont} +\setinterfacecommand{presetdocument}{presetdocument} +\setinterfacecommand{prettyprintbuffer}{prettyprintbuffer} +\setinterfacecommand{preventmode}{preventmode} \setinterfacecommand{printpaperheight}{vyskatiskpapiru} \setinterfacecommand{printpaperwidth}{sirkatiskpapiru} \setinterfacecommand{processblocks}{zpracujbloky} +\setinterfacecommand{processbodyfontenvironmentlist}{processbodyfontenvironmentlist} \setinterfacecommand{processpage}{zpracujstranu} \setinterfacecommand{product}{produkt} \setinterfacecommand{program}{program} @@ -1683,19 +1772,45 @@ \setinterfacecommand{quote}{citovat} \setinterfacecommand{ran}{ran} \setinterfacecommand{redo}{opakovat} +\setinterfacecommand{redoconvertfont}{redoconvertfont} \setinterfacecommand{ref}{ref} \setinterfacecommand{reference}{odkaz} \setinterfacecommand{referral}{odkaz} \setinterfacecommand{referraldate}{odkaznadatum} \setinterfacecommand{referring}{odkazujici} +\setinterfacecommand{registerfontclass}{registerfontclass} +\setinterfacecommand{registerhyphenationexception}{registerhyphenationexception} +\setinterfacecommand{registerhyphenationpattern}{registerhyphenationpattern} \setinterfacecommand{remark}{oznaceni} +\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}{resetznaceni} +\setinterfacecommand{resetmode}{resetmode} \setinterfacecommand{resetnumber}{resetnumber} +\setinterfacecommand{resetpath}{resetpath} +\setinterfacecommand{resetperiodkerning}{resetperiodkerning} +\setinterfacecommand{resetsystemmode}{resetsystemmode} \setinterfacecommand{resettext}{resettextcontent} +\setinterfacecommand{resetvisualizers}{resetvisualizers} +\setinterfacecommand{restoreglobalbodyfont}{restoreglobalbodyfont} +\setinterfacecommand{retestfeature}{retestfeature} +\setinterfacecommand{revivefeature}{revivefeature} \setinterfacecommand{rightaligned}{zarovnanovpravo} +\setinterfacecommand{rightbottombox}{rightbottombox} \setinterfacecommand{rightedgedistance}{vzdalenostpravehookraje} \setinterfacecommand{rightedgewidth}{sirkapravehookraje} +\setinterfacecommand{rightline}{rightline} \setinterfacecommand{rightmargindistance}{vzdalenostpravemarginalie} \setinterfacecommand{rightmarginwidth}{sirkapravemarginalie} \setinterfacecommand{romannumerals}{rimskecislice} @@ -1706,12 +1821,38 @@ \setinterfacecommand{selectblocks}{vyberbloky} \setinterfacecommand{selectpaper}{vyberpapir} \setinterfacecommand{selectversion}{vyberverzi} +\setinterfacecommand{setbigbodyfont}{setbigbodyfont} +\setinterfacecommand{setcharacteralign}{setcharacteralign} +\setinterfacecommand{setcharacteraligndetail}{setcharacteraligndetail} +\setinterfacecommand{setcharactercasing}{setcharactercasing} +\setinterfacecommand{setcharactercleaning}{setcharactercleaning} +\setinterfacecommand{setcharacterkerning}{setcharacterkerning} +\setinterfacecommand{setcharacterspacing}{setcharacterspacing} +\setinterfacecommand{setcharacterstripping}{setcharacterstripping} +\setinterfacecommand{setcurrentfontclass}{setcurrentfontclass} +\setinterfacecommand{setfirstline}{setfirstline} +\setinterfacecommand{setfirstpasscharacteralign}{setfirstpasscharacteralign} +\setinterfacecommand{setfont}{setfont} +\setinterfacecommand{setfontcolorsheme}{setfontcolorsheme} +\setinterfacecommand{setfontfeature}{setfontfeature} +\setinterfacecommand{setfontsolution}{setfontsolution} +\setinterfacecommand{setfontstrut}{setfontstrut} +\setinterfacecommand{sethyphenationfeatures}{sethyphenationfeatures} +\setinterfacecommand{setmainbodyfont}{setmainbodyfont} +\setinterfacecommand{setmode}{setmode} +\setinterfacecommand{setnote}{setnote} +\setinterfacecommand{setnotetext}{setnotetext} \setinterfacecommand{setnumber}{setnumber} +\setinterfacecommand{setperiodkerning}{setperiodkerning} +\setinterfacecommand{setsecondpasscharacteralign}{setsecondpasscharacteralign} +\setinterfacecommand{setsmallbodyfont}{setsmallbodyfont} +\setinterfacecommand{setsystemmode}{setsystemmode} \setinterfacecommand{settextcontent}{settextcontent} \setinterfacecommand{settextvariable}{settextvariable} \setinterfacecommand{setupalign}{nastavzarovnani} \setinterfacecommand{setupanswerarea}{setupanswerarea} \setinterfacecommand{setuparranging}{nastavusporadani} +\setinterfacecommand{setupattachment}{setupattachment} \setinterfacecommand{setupbackground}{nastavpozadi} \setinterfacecommand{setupbackgrounds}{nastavpozadi} \setinterfacecommand{setupblackrules}{nastavcernelinky} @@ -1726,6 +1867,9 @@ \setinterfacecommand{setupcapitals}{nastavkapitalky} \setinterfacecommand{setupcaption}{nastavpopisek} \setinterfacecommand{setupcaptions}{nastavpopisky} +\setinterfacecommand{setupcharacteralign}{setupcharacteralign} +\setinterfacecommand{setupcharacterkerning}{setupcharacterkerning} +\setinterfacecommand{setupcharacterspacing}{setupcharacterspacing} \setinterfacecommand{setupclipping}{nastavorez} \setinterfacecommand{setupcolor}{nastavbarvu} \setinterfacecommand{setupcolors}{nastavbarvy} @@ -1736,6 +1880,7 @@ \setinterfacecommand{setupcombinations}{nastavspojeni} \setinterfacecommand{setupcombinedlist}{nastavkombinovanyseznam} \setinterfacecommand{setupcomment}{nastavkomentar} +\setinterfacecommand{setupcounter}{setupcounter} \setinterfacecommand{setupdescription}{setupdescription} \setinterfacecommand{setupdescriptions}{nastavpopisy} \setinterfacecommand{setupenumeration}{setupenumeration} @@ -1745,9 +1890,14 @@ \setinterfacecommand{setupfields}{nastavvsechnapole} \setinterfacecommand{setupfillinlines}{nastavvyplnoveradky} \setinterfacecommand{setupfillinrules}{nastavvyplnovelinky} +\setinterfacecommand{setupfirstline}{setupfirstline} \setinterfacecommand{setupfloat}{nastavplvouciobjekt} \setinterfacecommand{setupfloats}{nastavplvouciobjekty} \setinterfacecommand{setupfloatsplitting}{nastavdeleniplvoucichobjektu} +\setinterfacecommand{setupfontexpansion}{setupfontexpansion} +\setinterfacecommand{setupfontprotrusion}{setupfontprotrusion} +\setinterfacecommand{setupfonts}{setupfonts} +\setinterfacecommand{setupfontsolution}{setupfontsolution} \setinterfacecommand{setupfooter}{nastavupati} \setinterfacecommand{setupfootertexts}{nastavtextyupati} \setinterfacecommand{setupfootnotedefinition}{nastavdefinicipoznamekpodcarou} @@ -1764,6 +1914,7 @@ \setinterfacecommand{setupheadnumber}{nastavcislonadpisu} \setinterfacecommand{setupheads}{nastavnadpisy} \setinterfacecommand{setupheadtext}{nastavtexthlavicky} +\setinterfacecommand{setuphyphenation}{setuphyphenation} \setinterfacecommand{setuphyphenmark}{nastavdelitko} \setinterfacecommand{setupindentedtext}{setupindentedtext} \setinterfacecommand{setupindenting}{nastavodsazovani} @@ -1780,6 +1931,7 @@ \setinterfacecommand{setuplanguage}{nastavjazyk} \setinterfacecommand{setuplayout}{nastavvzhled} \setinterfacecommand{setuplegend}{nastavlegendu} +\setinterfacecommand{setuplinenote}{setuplinenote} \setinterfacecommand{setuplinenumbering}{nastavcislovaniradku} \setinterfacecommand{setuplines}{nastavradky} \setinterfacecommand{setuplinewidth}{nastavsirkucary} @@ -1792,6 +1944,10 @@ \setinterfacecommand{setupmarking}{nastavznaceni} \setinterfacecommand{setupmathalignment}{setupmathalignment} \setinterfacecommand{setupnarrower}{nastavzuzeni} +\setinterfacecommand{setupnotation}{setupnotation} +\setinterfacecommand{setupnotations}{setupnotations} +\setinterfacecommand{setupnote}{setupnote} +\setinterfacecommand{setupnotes}{setupnotes} \setinterfacecommand{setupnumber}{setupnumber} \setinterfacecommand{setupnumbering}{nastavcislovani} \setinterfacecommand{setupoppositeplacing}{nastavumisteniprotejsku} @@ -1805,6 +1961,7 @@ \setinterfacecommand{setuppapersize}{nastavvelikostpapiru} \setinterfacecommand{setupparagraphnumbering}{nastavcislovaniodstavcu} \setinterfacecommand{setupparagraphs}{nastavodstavce} +\setinterfacecommand{setupperiodkerning}{setupperiodkerning} \setinterfacecommand{setupplacement}{setupplacement} \setinterfacecommand{setuppositioning}{nastavumistovani} \setinterfacecommand{setupprofiles}{nastavprofily} @@ -1834,6 +1991,7 @@ \setinterfacecommand{setuptabulate}{nastavtabelaci} \setinterfacecommand{setuptext}{nastavtext} \setinterfacecommand{setuptextbackground}{setuptextbackground} +\setinterfacecommand{setuptextnote}{setuptextnote} \setinterfacecommand{setuptextposition}{setuptextposition} \setinterfacecommand{setuptextrules}{nastavtextovelinky} \setinterfacecommand{setuptexttexts}{nastavtexttexty} @@ -1848,16 +2006,29 @@ \setinterfacecommand{setupurl}{nastavurl} \setinterfacecommand{setupversions}{nastavverze} \setinterfacecommand{setupwhitespace}{nastavbilamista} +\setinterfacecommand{setvisualizerfont}{setvisualizerfont} \setinterfacecommand{showbodyfont}{ukazzakladnifont} \setinterfacecommand{showbodyfontenvironment}{ukazpostredizakladnihofontu} \setinterfacecommand{showcolor}{ukazbarvu} \setinterfacecommand{showcolorgroup}{ukazskupinubarev} +\setinterfacecommand{showcounter}{showcounter} \setinterfacecommand{showexternalfigures}{ukazexterniobrazy} \setinterfacecommand{showfields}{ukazpole} +\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}{ukazramecek} \setinterfacecommand{showgrid}{ukazmrizku} +\setinterfacecommand{showhyphenationtrace}{showhyphenationtrace} +\setinterfacecommand{showkerning}{showkerning} \setinterfacecommand{showlayout}{ukazvzhled} \setinterfacecommand{showmakeup}{ukazupravu} +\setinterfacecommand{showminimalbaseline}{showminimalbaseline} \setinterfacecommand{showpalet}{ukazpaletu} \setinterfacecommand{showprint}{ukazvytisk} \setinterfacecommand{showsetups}{ukaznastaveni} @@ -1867,6 +2038,7 @@ \setinterfacecommand{someline}{nejakyradek} \setinterfacecommand{somewhere}{nekde} \setinterfacecommand{space}{mezera} +\setinterfacecommand{specialitem}{specialitem} \setinterfacecommand{splitfloat}{rozdelplvouciobjekt} \setinterfacecommand{startalignment}{startzarovnavani} \setinterfacecommand{startbackground}{startpozadi} @@ -1884,6 +2056,7 @@ \setinterfacecommand{startglobal}{startglobalni} \setinterfacecommand{startline}{startradek} \setinterfacecommand{startlinecorrection}{startkorekceradku} +\setinterfacecommand{startlinenote}{startlinenote} \setinterfacecommand{startlinenumbering}{startcislovaniradku} \setinterfacecommand{startlines}{startradky} \setinterfacecommand{startlocal}{startlokalni} @@ -1926,6 +2099,7 @@ \setinterfacecommand{stopglobal}{stopglobalni} \setinterfacecommand{stopline}{stopradek} \setinterfacecommand{stoplinecorrection}{stopkorekceradku} +\setinterfacecommand{stoplinenote}{stoplinenote} \setinterfacecommand{stoplinenumbering}{stopcislovaniradku} \setinterfacecommand{stoplines}{stopradky} \setinterfacecommand{stoplocal}{stoplokalni} @@ -1953,8 +2127,11 @@ \setinterfacecommand{stopunpacked}{stopnezhustene} \setinterfacecommand{stopversion}{stopverze} \setinterfacecommand{stretched}{roztazene} +\setinterfacecommand{strictinspectnextcharacter}{strictinspectnextcharacter} +\setinterfacecommand{stripcharacter}{stripcharacter} \setinterfacecommand{subformulanumber}{cislopodrovnice} \setinterfacecommand{subpagenumber}{subpagenumber} +\setinterfacecommand{subtractfeature}{subtractfeature} \setinterfacecommand{switchtobodyfont}{prepninazakladnifont} \setinterfacecommand{switchtorawfont}{switchtorawfont} \setinterfacecommand{sym}{sym} @@ -1964,16 +2141,24 @@ \setinterfacecommand{synchronize}{synchronizovat} \setinterfacecommand{tab}{tab} \setinterfacecommand{testcolumn}{testcolumn} +\setinterfacecommand{testfeature}{testfeature} +\setinterfacecommand{testfeatureonce}{testfeatureonce} \setinterfacecommand{testpage}{testpage} \setinterfacecommand{tex}{tex} \setinterfacecommand{textbackground}{textbackground} +\setinterfacecommand{textcolor}{textcolor} \setinterfacecommand{textheight}{vyskatextu} +\setinterfacecommand{textnote}{textnote} \setinterfacecommand{textreference}{odkaznatext} \setinterfacecommand{textrule}{textovalinka} \setinterfacecommand{textvariable}{textvariable} \setinterfacecommand{textwidth}{sirkatextu} +\setinterfacecommand{thefirstcharacter}{thefirstcharacter} +\setinterfacecommand{thenormalizedbodyfontsize}{thenormalizedbodyfontsize} +\setinterfacecommand{theremainingcharacters}{theremainingcharacters} \setinterfacecommand{thinrule}{tenkalinka} \setinterfacecommand{thinrules}{tenkelinky} +\setinterfacecommand{tolinenote}{tolinenote} \setinterfacecommand{tooltip}{bublinkovanapoveda} \setinterfacecommand{topdistance}{vzdalenosthorejsku} \setinterfacecommand{topheight}{vyskahorejsku} @@ -1984,13 +2169,19 @@ \setinterfacecommand{typ}{pis} \setinterfacecommand{type}{opis} \setinterfacecommand{typebuffer}{typebuffer} +\setinterfacecommand{typedefinedbuffer}{typedefinedbuffer} \setinterfacecommand{typefile}{opissoubor} +\setinterfacecommand{typeinlinebuffer}{typeinlinebuffer} +\setinterfacecommand{typing}{typing} \setinterfacecommand{unitmeaning}{vyznam} \setinterfacecommand{unknown}{neznamo} +\setinterfacecommand{unregisterhyphenationpattern}{unregisterhyphenationpattern} \setinterfacecommand{useJSscripts}{uzijJSscripts} \setinterfacecommand{useURL}{uzijURL} \setinterfacecommand{useXMLfilter}{useXMLfilter} \setinterfacecommand{useblocks}{uzijbloky} +\setinterfacecommand{usebodyfont}{usebodyfont} +\setinterfacecommand{usebodyfontparameter}{usebodyfontparameter} \setinterfacecommand{usecommands}{uzijprikazy} \setinterfacecommand{useencoding}{uzijkodovani} \setinterfacecommand{useexternaldocument}{uzijexternidokument} @@ -2007,10 +2198,12 @@ \setinterfacecommand{usetypescript}{usetypescript} \setinterfacecommand{usetypescriptfile}{usetypescriptfile} \setinterfacecommand{useurl}{uzijurl} +\setinterfacecommand{verbatim}{verbatim} \setinterfacecommand{version}{verze} \setinterfacecommand{vl}{vl} \setinterfacecommand{weekday}{vsedniden} \setinterfacecommand{whitespace}{bilemisto} +\setinterfacecommand{widthspanningtext}{widthspanningtext} \setinterfacecommand{wordright}{slovovpravo} \setinterfacecommand{writebetweenlist}{zapismeziseznam} \setinterfacecommand{writetolist}{zapisdoseznamu} diff --git a/tex/context/base/mkiv/cont-new.mkiv b/tex/context/base/mkiv/cont-new.mkiv index 54acc158d..a3af1d3aa 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.20 15:33} +\newcontextversion{2020.07.20 19:47} %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 dbde535c9..60743ead8 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.20 15:33} +\edef\contextversion{2020.07.20 19:47} %D Kind of special: diff --git a/tex/context/base/mkiv/context.mkxl b/tex/context/base/mkiv/context.mkxl index 920d7d244..d479ad178 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.20 15:33} +\edef\contextversion{2020.07.20 19:47} %D Kind of special: diff --git a/tex/context/base/mkiv/file-job.lua b/tex/context/base/mkiv/file-job.lua index 407c3c15d..5641d3e15 100644 --- a/tex/context/base/mkiv/file-job.lua +++ b/tex/context/base/mkiv/file-job.lua @@ -27,8 +27,8 @@ local implement = interfaces.implement local trace_jobfiles = false trackers.register("system.jobfiles", function(v) trace_jobfiles = v end) local report = logs.reporter("system") -local report_jobfiles = logs.reporter("system","jobfiles") -local report_functions = logs.reporter("system","functions") +local report_jobfiles = logs.reporter("system", "jobfiles") +local report_functions = logs.reporter("system", "functions") local texsetcount = tex.setcount local elements = interfaces.elements diff --git a/tex/context/base/mkiv/lpdf-lmt.lmt b/tex/context/base/mkiv/lpdf-lmt.lmt index fd0236fc7..ed385b4de 100644 --- a/tex/context/base/mkiv/lpdf-lmt.lmt +++ b/tex/context/base/mkiv/lpdf-lmt.lmt @@ -1706,9 +1706,11 @@ local finalize do if BleedBox then BleedBox = box end end - if TrimBox then pageattributes.TrimBox = pdfsharedobject(TrimBox ) end - if CropBox then pageattributes.CropBox = pdfsharedobject(CropBox ) end - if BleedBox then pageattributes.BleedBox = pdfsharedobject(BleedBox) end + -- Indirect objects don't work in all viewers. + + if TrimBox then pageattributes.TrimBox = TrimBox end -- pdfsharedobject(TrimBox ) + if CropBox then pageattributes.CropBox = CropBox end -- pdfsharedobject(CropBox ) + if BleedBox then pageattributes.BleedBox = BleedBox end -- pdfsharedobject(BleedBox) else diff --git a/tex/context/base/mkiv/luat-cod.lua b/tex/context/base/mkiv/luat-cod.lua index 18126b186..76a4ceb34 100644 --- a/tex/context/base/mkiv/luat-cod.lua +++ b/tex/context/base/mkiv/luat-cod.lua @@ -73,7 +73,7 @@ function lua.registercode(filename,options) local code = environment.luafilechunk(filename,false,opts.optimize) if code then bytedone[basename] = true - if environment.initex then + if environment.initex and not opts.initexonly then local n = lua.lastbytecode + 1 bytedata[n] = { name = barename, options = opts } if strip or opts.strip then diff --git a/tex/context/base/mkiv/mult-def.lua b/tex/context/base/mkiv/mult-def.lua index d55b90f7e..678f17552 100644 --- a/tex/context/base/mkiv/mult-def.lua +++ b/tex/context/base/mkiv/mult-def.lua @@ -9288,6 +9288,9 @@ return { ["pe"]="تورفتگی", ["ro"]="aliniat", }, + ["indentlist"]={ + ["en"]="indentlist", + }, ["indentnext"]={ ["cs"]="odsadpristi", ["de"]="ziehefolgendeein", @@ -10799,6 +10802,9 @@ return { ["pe"]="بگذارسر", ["ro"]="punetitlu", }, + ["placeholder"]={ + ["en"]="placeholder", + }, ["placestopper"]={ ["cs"]="predelmista", ["de"]="setzetrenner", diff --git a/tex/context/base/mkiv/mult-ini.lua b/tex/context/base/mkiv/mult-ini.lua index 3dc425953..d1271815c 100644 --- a/tex/context/base/mkiv/mult-ini.lua +++ b/tex/context/base/mkiv/mult-ini.lua @@ -233,137 +233,91 @@ end logs.setmessenger(context.verbatim.ctxreport) --- todo: use setmacro - -function interfaces.setuserinterface(interface,response) - sharedstorage.currentinterface, currentinterface = interface, interface - sharedstorage.currentresponse, currentresponse = response, response - if environment.initex then - local setmacro = false - -- local setmacro = interfaces.setmacro -- cleaner (but we need to test first) - local nofconstants = 0 - local nofvariables = 0 - local nofelements = 0 - local nofcommands = 0 - local nofformats = 0 - local noftranslations = 0 - local nofsetupstrings = 0 - -- - if setmacro then - for given, constant in next, complete.constants do - constant = constant[interface] or constant.en or given - constants[constant] = given -- breedte -> width - nofconstants = nofconstants + 1 - setmacro("c!"..given,given) - if currentinterface ~= "en" then - setmacro("k!"..constant,given) - end - end - else - local t, f, s = { }, formatters["\\ui_c{%s}{%s}"], formatters["\\ui_s{%s}"] - for given, constant in next, complete.constants do - constant = constant[interface] or constant.en or given - constants[constant] = given -- breedte -> width - nofconstants = nofconstants + 1 - if given == constant then - t[nofconstants] = s(given) - else - t[nofconstants] = f(given,constant) - end - end - contextsprint(prtcatcodes,concat(t)) - end - -- - if setmacro then - for given, variable in next, complete.variables do - variable = variable[interface] or variable.en or given - variables[given] = variable -- ja -> yes - nofvariables = nofvariables + 1 - setmacro("v!"..given,variable) - end - else - local t, f = { }, formatters["\\ui_v{%s}{%s}"] - for given, variable in next, complete.variables do - variable = variable[interface] or variable.en or given - variables[given] = variable -- ja -> yes - nofvariables = nofvariables + 1 - t[nofvariables] = f(given,variable) - end - contextsprint(prtcatcodes,concat(t)) - end - -- - if setmacro then - for given, element in next, complete.elements do - element = element[interface] or element.en or given - elements[element] = given - nofelements = nofelements + 1 - setmacro("e!"..given,element) - end - else - local t, f = { }, formatters["\\ui_e{%s}{%s}"] - for given, element in next, complete.elements do - element = element[interface] or element.en or given - elements[element] = given - nofelements = nofelements + 1 - t[nofelements] = f(given,element) - end - contextsprint(prtcatcodes,concat(t)) - end - -- - if setmacro then - -- this can only work ok when we already have defined the command - luatex.registerdumpactions(function() - for given, command in next, complete.commands do - command = command[interface] or command.en or given - if command ~= given then - setmacro(prtcatcodes,given,"\\"..command) - end - nofcommands = nofcommands + 1 - end - end) - else - local t, n, f = { }, 0, formatters["\\ui_m{%s}{%s}"] - for given, command in next, complete.commands do - command = command[interface] or command.en or given - if command ~= given then - n = n + 1 - t[n] = f(given,command) - end - nofcommands = nofcommands + 1 - end - contextsprint(prtcatcodes,concat(t)) - end - -- - for given, format in next, complete.messages.formats do - formats[given] = format[interface] or format.en or given - nofformats = nofformats + 1 - end - -- - for given, translation in next, complete.messages.translations do - translations[given] = translation[interface] or translation.en or given - noftranslations = noftranslations + 1 - end - -- - for given, setupstring in next, complete.setupstrings do - setupstring = setupstring[interface] or setupstring.en or given - setupstrings[given] = setupstring - nofsetupstrings = nofsetupstrings + 1 - end - -- - report_interface("definitions: %a constants, %a variables, %a elements, %a commands, %a formats, %a translations, %a setupstrings", - nofconstants,nofvariables,nofelements,nofcommands,nofformats,noftranslations,nofsetupstrings) - else - report_interface("the language(s) can only be set when making the format") - end - interfaces.currentinterface = currentinterface - interfaces.currentresponse = currentresponse -end - -interfaces.implement { - name = "setuserinterface", - actions = interfaces.setuserinterface, - arguments = "2 strings", -} +-- function interfaces.setuserinterface(interface,response) +-- sharedstorage.currentinterface, currentinterface = interface, interface +-- sharedstorage.currentresponse, currentresponse = response, response +-- if environment.initex then +-- local nofconstants = 0 +-- local nofvariables = 0 +-- local nofelements = 0 +-- local nofcommands = 0 +-- local nofformats = 0 +-- local noftranslations = 0 +-- local nofsetupstrings = 0 +-- -- +-- local t, f, s = { }, formatters["\\ui_c{%s}{%s}"], formatters["\\ui_s{%s}"] +-- for given, constant in next, complete.constants do +-- constant = constant[interface] or constant.en or given +-- constants[constant] = given -- breedte -> width +-- nofconstants = nofconstants + 1 +-- if given == constant then +-- t[nofconstants] = s(given) +-- else +-- t[nofconstants] = f(given,constant) +-- end +-- end +-- contextsprint(prtcatcodes,concat(t)) +-- -- +-- local t, f = { }, formatters["\\ui_v{%s}{%s}"] +-- for given, variable in next, complete.variables do +-- variable = variable[interface] or variable.en or given +-- variables[given] = variable -- ja -> yes +-- nofvariables = nofvariables + 1 +-- t[nofvariables] = f(given,variable) +-- end +-- contextsprint(prtcatcodes,concat(t)) +-- -- +-- local t, f = { }, formatters["\\ui_e{%s}{%s}"] +-- for given, element in next, complete.elements do +-- element = element[interface] or element.en or given +-- elements[element] = given +-- nofelements = nofelements + 1 +-- t[nofelements] = f(given,element) +-- end +-- contextsprint(prtcatcodes,concat(t)) +-- -- +-- -- local t, n, f = { }, 0, formatters["\\ui_m{%s}{%s}"] +-- local t, n, f = { }, 0, formatters["\\ui_a\\%s\\%s"] +-- for given, command in next, complete.commands do +-- command = command[interface] or command.en or given +-- if command ~= given then +-- n = n + 1 +-- t[n] = f(given,command) +-- end +-- nofcommands = nofcommands + 1 +-- end +-- contextsprint(prtcatcodes,"\\toksapp\\everydump{"..concat(t).."}") +-- -- +-- for given, format in next, complete.messages.formats do +-- formats[given] = format[interface] or format.en or given +-- nofformats = nofformats + 1 +-- end +-- -- +-- for given, translation in next, complete.messages.translations do +-- translations[given] = translation[interface] or translation.en or given +-- noftranslations = noftranslations + 1 +-- end +-- -- +-- for given, setupstring in next, complete.setupstrings do +-- setupstring = setupstring[interface] or setupstring.en or given +-- setupstrings[given] = setupstring +-- nofsetupstrings = nofsetupstrings + 1 +-- end +-- -- +-- report_interface("definitions: %a constants, %a variables, %a elements, %a commands, %a formats, %a translations, %a setupstrings", +-- nofconstants,nofvariables,nofelements,nofcommands,nofformats,noftranslations,nofsetupstrings) +-- else +-- report_interface("the language(s) can only be set when making the format") +-- end +-- interfaces.currentinterface = currentinterface +-- interfaces.currentresponse = currentresponse +-- end + +-- interfaces.implement { +-- name = "setuserinterface", +-- actions = interfaces.setuserinterface, +-- arguments = "2 strings", +-- } interfaces.cachedsetups = interfaces.cachedsetups or { } interfaces.hashedsetups = interfaces.hashedsetups or { } diff --git a/tex/context/base/mkiv/mult-ini.mkiv b/tex/context/base/mkiv/mult-ini.mkiv index 5b22428ff..8f73c4ef8 100644 --- a/tex/context/base/mkiv/mult-ini.mkiv +++ b/tex/context/base/mkiv/mult-ini.mkiv @@ -20,11 +20,7 @@ \unprotect \registerctxluafile{mult-ini}{} - -% Todo: - -\def\c!placeholder{placeholder} -\def\c!indentlist {indentlist} +\registerctxluafile{mult-fmt}{initexonly} %D \macros %D [constanten,variabelen,commands] @@ -723,25 +719,14 @@ %D For at the \LUA\ end (experiment): -% \def\do@sicon#1#2{\expandafter\gdef\csname\c!prefix!#1\endcsname{#1}% -% \expandafter\gdef\csname\k!prefix!#2\endcsname{#1}} % backmapping from non english -% \def\do@sivar#1#2{\expandafter\gdef\csname\v!prefix!#1\endcsname{#2}} -% \def\do@siele#1#2{\expandafter\gdef\csname\e!prefix!#1\endcsname{#2}} -% \def\do@sicom#1#2{\expandafter\gdef\csname#2\expandafter\endcsname\expandafter{\csname#1\endcsname}} -% -% \startinterface english -% -% \def\do@sicon#1#2{\expandafter\gdef\csname\c!prefix!#1\endcsname{#1}} -% -% \stopinterface - \def\ui_c#1#2{\expandafter\gdef\csname\c!prefix!#1\endcsname{#1}% \expandafter\gdef\csname\k!prefix!#2\endcsname{#1}} % backmapping from non english \def\ui_s #1{\expandafter\gdef\csname\c!prefix!#1\endcsname{#1}% \expandafter\gdef\csname\k!prefix!#1\endcsname{#1}} % backmapping from non english \def\ui_v#1#2{\expandafter\gdef\csname\v!prefix!#1\endcsname{#2}} \def\ui_e#1#2{\expandafter\gdef\csname\e!prefix!#1\endcsname{#2}} -\def\ui_m#1#2{\expandafter\gdef\csname#2\expandafter\endcsname\expandafter{\csname#1\endcsname}} +%def\ui_m#1#2{\expandafter\gdef\csname#2\expandafter\endcsname\expandafter{\csname#1\endcsname}} +\def\ui_a#1#2{\aliasmacro#2#1} \startinterface english @@ -797,7 +782,7 @@ \ifx\undefined\everydump \newtoks\everydump - \def\dump{\the\everydump\normaldump} + \def\dump{\the\everydump\global\everydump\emptytoks\glet\dump\relax\normaldump} \fi % \appendtoks \showcontextbanner \to \everydump diff --git a/tex/context/base/mkiv/status-files.pdf b/tex/context/base/mkiv/status-files.pdf index e68929e5b..277fd403a 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 9a918ad18..821e78dbb 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/syst-ini.mkiv b/tex/context/base/mkiv/syst-ini.mkiv index c978eaae5..06ef9dbe3 100644 --- a/tex/context/base/mkiv/syst-ini.mkiv +++ b/tex/context/base/mkiv/syst-ini.mkiv @@ -761,7 +761,7 @@ \newtoks\everydump -\def\dump{\the\everydump\normaldump} +\def\dump{\the\everydump\global\everydump\emptytoks\glet\dump\relax\normaldump} %D The same applies for the startup actions. diff --git a/tex/context/base/mkiv/syst-ini.mkxl b/tex/context/base/mkiv/syst-ini.mkxl index b3fe4374c..232048036 100644 --- a/tex/context/base/mkiv/syst-ini.mkxl +++ b/tex/context/base/mkiv/syst-ini.mkxl @@ -768,7 +768,7 @@ \newtoks\everydump -\def\dump{\the\everydump\normaldump} +\def\dump{\the\everydump\global\everydump\emptytoks\glet\dump\relax\normaldump} %D The same applies for the startup actions. diff --git a/tex/context/interface/mkii/keys-cs.xml b/tex/context/interface/mkii/keys-cs.xml index 78e6d7c00..749e348b1 100644 --- a/tex/context/interface/mkii/keys-cs.xml +++ b/tex/context/interface/mkii/keys-cs.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 74777c13c..5821d1211 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-20 15:33 +-- merge date : 2020-07-20 19:47 do -- begin closure to overcome local limits and interference -- cgit v1.2.3