From 0596cad6b554fdd23ed2a9ca7110938fa9137eea Mon Sep 17 00:00:00 2001 From: Hans Hagen Date: Tue, 21 Jul 2020 19:32:53 +0200 Subject: 2020-07-21 18:38:00 --- tex/context/base/mkii/cont-new.mkii | 2 +- tex/context/base/mkii/context.mkii | 2 +- tex/context/base/mkii/mult-it.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 | 23 +-- tex/context/base/mkiv/mlib-pdf.lua | 6 +- tex/context/base/mkiv/mult-fmt.lua | 177 +++++++++++++++++++ tex/context/base/mkiv/mult-low.lua | 2 +- tex/context/base/mkiv/mult-prm.lua | 1 + tex/context/base/mkiv/spac-par.mkiv | 5 + tex/context/base/mkiv/status-files.pdf | Bin 28102 -> 28138 bytes tex/context/base/mkiv/status-lua.pdf | Bin 254946 -> 254736 bytes tex/context/interface/mkii/keys-it.xml | 193 +++++++++++++++++++++ tex/generic/context/luatex/luatex-fonts-merged.lua | 2 +- 16 files changed, 586 insertions(+), 26 deletions(-) create mode 100644 tex/context/base/mkiv/mult-fmt.lua (limited to 'tex') diff --git a/tex/context/base/mkii/cont-new.mkii b/tex/context/base/mkii/cont-new.mkii index aa8687cd7..2ba3d9bc8 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 19:47} +\newcontextversion{2020.07.21 18:36} %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 37073c6a1..1de3a7250 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 19:47} +\edef\contextversion{2020.07.21 18:36} %D For those who want to use this: diff --git a/tex/context/base/mkii/mult-it.mkii b/tex/context/base/mkii/mult-it.mkii index 7f5778aab..784ee18f0 100644 --- a/tex/context/base/mkii/mult-it.mkii +++ b/tex/context/base/mkii/mult-it.mkii @@ -128,6 +128,9 @@ \setinterfacevariable{camel}{camel} \setinterfacevariable{cap}{cap} \setinterfacevariable{capital}{maiuscolo} +\setinterfacevariable{category}{category} +\setinterfacevariable{cd:character}{cd:character} +\setinterfacevariable{cd:font}{cd:font} \setinterfacevariable{center}{center} \setinterfacevariable{centerlast}{centerlast} \setinterfacevariable{chapter}{capitolo} @@ -186,6 +189,7 @@ \setinterfacevariable{external}{esterno} \setinterfacevariable{extremestretch}{extremestretch} \setinterfacevariable{fact}{fatto} +\setinterfacevariable{fallback}{fallback} \setinterfacevariable{february}{febbraio} \setinterfacevariable{field}{field} \setinterfacevariable{figure}{figura} @@ -804,8 +808,10 @@ \setinterfaceconstant{extras}{extras} \setinterfaceconstant{factor}{fattore} \setinterfaceconstant{fallback}{fallback} +\setinterfaceconstant{fallbacks}{fallbacks} \setinterfaceconstant{family}{famiglia} \setinterfaceconstant{features}{features} +\setinterfaceconstant{featureset}{featureset} \setinterfaceconstant{fences}{fences} \setinterfaceconstant{field}{field} \setinterfaceconstant{fieldbackgroundcolor}{coloresfondocampo} @@ -880,6 +886,7 @@ \setinterfaceconstant{increment}{incremento} \setinterfaceconstant{incrementnumber}{incrementanumero} \setinterfaceconstant{indenting}{rientro} +\setinterfaceconstant{indentlist}{indentlist} \setinterfaceconstant{indentnext}{rientrasuccessivo} \setinterfaceconstant{index}{index} \setinterfaceconstant{indicator}{indicatore} @@ -1084,6 +1091,7 @@ \setinterfaceconstant{period}{period} \setinterfaceconstant{place}{metti} \setinterfaceconstant{placehead}{mettitesta} +\setinterfaceconstant{placeholder}{placeholder} \setinterfaceconstant{placestopper}{mettistopper} \setinterfaceconstant{position}{posizione} \setinterfaceconstant{prefix}{prefisso} @@ -1367,8 +1375,18 @@ \setinterfacecommand{Word}{Parola} \setinterfacecommand{Words}{Parole} \setinterfacecommand{about}{intorno} +\setinterfacecommand{adaptfontfeature}{adaptfontfeature} \setinterfacecommand{adaptlayout}{adattalayout} +\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}{al} \setinterfacecommand{atleftmargin}{atleftmargin} @@ -1380,9 +1398,13 @@ \setinterfacecommand{blackrules}{lineenere} \setinterfacecommand{blank}{rigovuoto} \setinterfacecommand{bookmark}{segnalibro} +\setinterfacecommand{bottombox}{bottombox} \setinterfacecommand{bottomdistance}{distanzafondo} \setinterfacecommand{bottomheight}{altezzafondo} +\setinterfacecommand{bottomleftbox}{bottomleftbox} +\setinterfacecommand{bottomrightbox}{bottomrightbox} \setinterfacecommand{bottomspace}{spaziofondo} +\setinterfacecommand{buildtextbottomdot}{buildtextbottomdot} \setinterfacecommand{but}{fondo} \setinterfacecommand{button}{pulsante} \setinterfacecommand{bypassblocks}{saltablocchi} @@ -1421,8 +1443,11 @@ \setinterfacecommand{defineblock}{definisciblocco} \setinterfacecommand{definebodyfont}{definiscifontdeltesto} \setinterfacecommand{definebodyfontenvironment}{definisciambientefontdeltesto} +\setinterfacecommand{definebodyfontswitch}{definebodyfontswitch} \setinterfacecommand{definebuffer}{definiscibuffer} \setinterfacecommand{definecharacter}{definiscicarattere} +\setinterfacecommand{definecharacterkerning}{definecharacterkerning} +\setinterfacecommand{definecharacterspacing}{definecharacterspacing} \setinterfacecommand{definecolor}{definiscicolore} \setinterfacecommand{definecolorgroup}{definiscigruppocolori} \setinterfacecommand{definecolumnbreak}{definecolumnbreak} @@ -1432,37 +1457,57 @@ \setinterfacecommand{definecommand}{definiscicomando} \setinterfacecommand{defineconversion}{definisciconversione} \setinterfacecommand{definedescription}{definiscidescrizione} +\setinterfacecommand{definedfont}{definedfont} \setinterfacecommand{defineenumeration}{definiscienumerazione} +\setinterfacecommand{definefallbackfamily}{definefallbackfamily} \setinterfacecommand{definefield}{definiscicampo} \setinterfacecommand{definefieldstack}{definiscistackcampi} \setinterfacecommand{definefiguresymbol}{definiscifigurasimbolo} +\setinterfacecommand{definefilefallback}{definefilefallback} +\setinterfacecommand{definefirstline}{definefirstline} \setinterfacecommand{definefloat}{definiscioggettomobile} \setinterfacecommand{definefont}{definiscifont} +\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}{definiscistilefont} \setinterfacecommand{definefontsynonym}{definiscisinonimofont} \setinterfacecommand{defineframed}{definisciincorniciato} \setinterfacecommand{defineframedtext}{definiscitestoincorniciato} +\setinterfacecommand{definefrozenfont}{definefrozenfont} \setinterfacecommand{definehbox}{definiscihbox} \setinterfacecommand{definehead}{definiscitesta} +\setinterfacecommand{definehyphenationfeatures}{definehyphenationfeatures} \setinterfacecommand{defineindentedtext}{defineindentedtext} \setinterfacecommand{defineinmargin}{defineinmargin} \setinterfacecommand{defineinteractionmenu}{definiscimenuinterazione} \setinterfacecommand{defineitemgroup}{defineitemgroup} +\setinterfacecommand{defineitems}{defineitems} \setinterfacecommand{definelabel}{definiscietichetta} \setinterfacecommand{definelayer}{definelayer} \setinterfacecommand{definelayout}{definiscilayout} +\setinterfacecommand{definelinenote}{definelinenote} \setinterfacecommand{definelist}{definiscielenco} \setinterfacecommand{definelogo}{definiscilogo} \setinterfacecommand{definemainfield}{definiscicampoprincipale} \setinterfacecommand{definemakeup}{definiscimakeup} \setinterfacecommand{definemarking}{definiscimarcatura} \setinterfacecommand{definemathalignment}{definemathalignment} +\setinterfacecommand{definemode}{definemode} +\setinterfacecommand{definenamedcolor}{definenamedcolor} +\setinterfacecommand{definenote}{definenote} \setinterfacecommand{defineoutput}{definiscioutput} \setinterfacecommand{defineoverlay}{definiscisovrapposizione} \setinterfacecommand{definepagebreak}{definepagebreak} \setinterfacecommand{definepalet}{definiscitavolozza} \setinterfacecommand{definepapersize}{definiscidimensionicarta} \setinterfacecommand{defineparagraphs}{definiscicapoversi} +\setinterfacecommand{defineperiodkerning}{defineperiodkerning} \setinterfacecommand{defineplacement}{defineplacement} \setinterfacecommand{defineprofile}{definisciprofilo} \setinterfacecommand{defineprogram}{definisciprogramma} @@ -1484,33 +1529,45 @@ \setinterfacecommand{definetabulate}{definiscitabulato} \setinterfacecommand{definetext}{definiscitesto} \setinterfacecommand{definetextbackground}{definetextbackground} +\setinterfacecommand{definetextnote}{definetextnote} \setinterfacecommand{definetextposition}{definisciposizionetesto} \setinterfacecommand{definetextvariable}{definiscivariabiletesto} \setinterfacecommand{definetype}{definiscitype} \setinterfacecommand{definetyping}{definiscityping} \setinterfacecommand{defineversion}{definisciversion} +\setinterfacecommand{depthspanningtext}{depthspanningtext} \setinterfacecommand{determineheadnumber}{determinanumerotesta} \setinterfacecommand{determinelistcharacteristics}{determinacarattersticheelenco} \setinterfacecommand{determineregistercharacteristics}{determinacaratteristicheregistro} \setinterfacecommand{dimension}{dimensione} \setinterfacecommand{disableinteractionmenu}{disabilitamenuinterazione} +\setinterfacecommand{disablemode}{disablemode} +\setinterfacecommand{doaddfeature}{doaddfeature} \setinterfacecommand{domicile}{domicilio} +\setinterfacecommand{dontconvertfont}{dontconvertfont} \setinterfacecommand{donttest}{notest} \setinterfacecommand{edgedistance}{distanzabordo} \setinterfacecommand{edgewidth}{ampiezzabordo} +\setinterfacecommand{emphasisboldface}{emphasisboldface} \setinterfacecommand{emptylines}{emptylines} +\setinterfacecommand{enablemode}{enablemode} \setinterfacecommand{environment}{ambiente} \setinterfacecommand{externalfigure}{figuraesterna} \setinterfacecommand{fact}{fatto} +\setinterfacecommand{fastswitchtobodyfont}{fastswitchtobodyfont} +\setinterfacecommand{feature}{feature} \setinterfacecommand{field}{campi} \setinterfacecommand{fieldstack}{stackcampi} \setinterfacecommand{fillinfield}{camporiempimento} \setinterfacecommand{fillinline}{rigariempimento} \setinterfacecommand{fillinrules}{lineeriempimento} \setinterfacecommand{fillintext}{testoriempimento} +\setinterfacecommand{firstcharacter}{firstcharacter} \setinterfacecommand{fitfield}{adattacampo} +\setinterfacecommand{fittopbaselinegrid}{fittopbaselinegrid} \setinterfacecommand{fixedspace}{spaziofisso} \setinterfacecommand{fixedspaces}{spazifissi} +\setinterfacecommand{flushnotes}{flushnotes} \setinterfacecommand{followprofile}{seguiprofilo} \setinterfacecommand{followprofileversion}{seguiversioneprofilo} \setinterfacecommand{followversion}{seguiversione} @@ -1519,13 +1576,19 @@ \setinterfacecommand{footnote}{notapdp} \setinterfacecommand{footnotetext}{testonotapdp} \setinterfacecommand{forceblocks}{forzablocchi} +\setinterfacecommand{forcecharacterstripping}{forcecharacterstripping} \setinterfacecommand{formulanumber}{numeroformula} \setinterfacecommand{fraction}{frazione} \setinterfacecommand{framed}{incorniciato} \setinterfacecommand{from}{da} +\setinterfacecommand{fromlinenote}{fromlinenote} \setinterfacecommand{getbuffer}{prendibuffer} +\setinterfacecommand{getfirstcharacter}{getfirstcharacter} \setinterfacecommand{getmarking}{prendimarcatura} \setinterfacecommand{getnumber}{getnumber} +\setinterfacecommand{globaldisablemode}{globaldisablemode} +\setinterfacecommand{globalenablemode}{globalenablemode} +\setinterfacecommand{globalpreventmode}{globalpreventmode} \setinterfacecommand{godown}{vaigiu} \setinterfacecommand{goto}{vaia} \setinterfacecommand{gotobox}{vaiabox} @@ -1541,6 +1604,7 @@ \setinterfacecommand{headnumber}{numerotesta} \setinterfacecommand{headsym}{headsym} \setinterfacecommand{headtext}{testoinstestazioni} +\setinterfacecommand{heightspanningtext}{heightspanningtext} \setinterfacecommand{hideblocks}{nascondiblocchi} \setinterfacecommand{high}{ap} \setinterfacecommand{hl}{hl} @@ -1572,26 +1636,37 @@ \setinterfacecommand{interactionbuttons}{pulsantinterazione} \setinterfacecommand{interactionmenu}{menuinterattivo} \setinterfacecommand{item}{elemento} +\setinterfacecommand{itemgroup}{itemgroup} \setinterfacecommand{items}{elementi} +\setinterfacecommand{itemtag}{itemtag} \setinterfacecommand{its}{el} \setinterfacecommand{keepblocks}{tieniblocchi} +\setinterfacecommand{kerncharacters}{kerncharacters} \setinterfacecommand{label}{etichetta} \setinterfacecommand{labels}{etichette} \setinterfacecommand{labeltext}{testoetichetta} \setinterfacecommand{language}{lingua} +\setinterfacecommand{languageCharacters}{languageCharacters} +\setinterfacecommand{languagecharacters}{languagecharacters} \setinterfacecommand{leftaligned}{allineasinistra} +\setinterfacecommand{leftbottombox}{leftbottombox} \setinterfacecommand{leftedgedistance}{distanzabordosinistro} \setinterfacecommand{leftedgewidth}{ampiezzabordosinistro} +\setinterfacecommand{leftline}{leftline} \setinterfacecommand{leftmargindistance}{distanzamarginesinistro} \setinterfacecommand{leftmarginwidth}{ampiezzamarginesinistro} \setinterfacecommand{leg}{leg} \setinterfacecommand{linecorrection}{linecorrection} +\setinterfacecommand{linenote}{linenote} +\setinterfacecommand{linespanningtext}{linespanningtext} \setinterfacecommand{linewidth}{spessoreriga} \setinterfacecommand{listheight}{altezzaelenco} \setinterfacecommand{listlength}{lunghezzaelenco} \setinterfacecommand{listsymbol}{listsymbol} \setinterfacecommand{listwidth}{ampiezzaelenco} +\setinterfacecommand{loadfontgoodies}{loadfontgoodies} \setinterfacecommand{localfootnotes}{localfootnotes} +\setinterfacecommand{localnotes}{localnotes} \setinterfacecommand{logfields}{logcampi} \setinterfacecommand{lohi}{pedap} \setinterfacecommand{low}{ped} @@ -1622,6 +1697,7 @@ \setinterfacecommand{nodimension}{nientedimensioni} \setinterfacecommand{noheaderandfooterlines}{nientelineintestazionepdp} \setinterfacecommand{noindenting}{nienterientro} +\setinterfacecommand{noitem}{noitem} \setinterfacecommand{nolist}{nienteelenco} \setinterfacecommand{nomarking}{nientemarcatura} \setinterfacecommand{nomoreblocks}{bastablocchi} @@ -1629,6 +1705,7 @@ \setinterfacecommand{nop}{nop} \setinterfacecommand{nospace}{nientespazio} \setinterfacecommand{note}{nota} +\setinterfacecommand{notesymbol}{notesymbol} \setinterfacecommand{notopandbottomlines}{nientelineecimafondo} \setinterfacecommand{notsmallcapped}{nocap} \setinterfacecommand{nowhitespace}{nientespaziobianco} @@ -1640,6 +1717,7 @@ \setinterfacecommand{outermarginwidth}{outermarginwidth} \setinterfacecommand{packed}{impaccato} \setinterfacecommand{page}{pagina} +\setinterfacecommand{pagebreak}{pagebreak} \setinterfacecommand{pagedepth}{pagedepth} \setinterfacecommand{pagenumber}{numeropagina} \setinterfacecommand{pageoffset}{pageoffset} @@ -1658,7 +1736,10 @@ \setinterfacecommand{placelist}{mettielenco} \setinterfacecommand{placelistofsynonyms}{placelistofsynonyms} \setinterfacecommand{placelocalfootnotes}{mettinotepdplocali} +\setinterfacecommand{placelocalnotes}{placelocalnotes} \setinterfacecommand{placelogos}{mettiloghi} +\setinterfacecommand{placenamedfloat}{placenamedfloat} +\setinterfacecommand{placenotes}{placenotes} \setinterfacecommand{placeongrid}{mettiingriglia} \setinterfacecommand{placeontopofeachother}{mettiunosullaltro} \setinterfacecommand{placepagenumber}{mettinumeropagina} @@ -1671,9 +1752,17 @@ \setinterfacecommand{placetextvariable}{mettivariabiletesto} \setinterfacecommand{position}{posizione} \setinterfacecommand{positiontext}{posizionatesto} +\setinterfacecommand{postponenotes}{postponenotes} +\setinterfacecommand{postponingnotes}{postponingnotes} +\setinterfacecommand{predefinedfont}{predefinedfont} +\setinterfacecommand{predefinefont}{predefinefont} +\setinterfacecommand{presetdocument}{presetdocument} +\setinterfacecommand{prettyprintbuffer}{prettyprintbuffer} +\setinterfacecommand{preventmode}{preventmode} \setinterfacecommand{printpaperheight}{altezzacartastampa} \setinterfacecommand{printpaperwidth}{ampiezzacartastampa} \setinterfacecommand{processblocks}{elaborablocchi} +\setinterfacecommand{processbodyfontenvironmentlist}{processbodyfontenvironmentlist} \setinterfacecommand{processpage}{elaborapagina} \setinterfacecommand{product}{prodotto} \setinterfacecommand{program}{programma} @@ -1683,19 +1772,45 @@ \setinterfacecommand{quote}{menzione} \setinterfacecommand{ran}{ran} \setinterfacecommand{redo}{rifai} +\setinterfacecommand{redoconvertfont}{redoconvertfont} \setinterfacecommand{ref}{rif} \setinterfacecommand{reference}{riferimento} \setinterfacecommand{referral}{referral} \setinterfacecommand{referraldate}{datareferral} \setinterfacecommand{referring}{referring} +\setinterfacecommand{registerfontclass}{registerfontclass} +\setinterfacecommand{registerhyphenationexception}{registerhyphenationexception} +\setinterfacecommand{registerhyphenationpattern}{registerhyphenationpattern} \setinterfacecommand{remark}{commento} +\setinterfacecommand{replacefeature}{replacefeature} \setinterfacecommand{reset}{reimposta} +\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}{reimpostamarcatura} +\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}{allineadestra} +\setinterfacecommand{rightbottombox}{rightbottombox} \setinterfacecommand{rightedgedistance}{distanzabordodestro} \setinterfacecommand{rightedgewidth}{ampiezzabordodestro} +\setinterfacecommand{rightline}{rightline} \setinterfacecommand{rightmargindistance}{distanzamarginedestro} \setinterfacecommand{rightmarginwidth}{ampiezzamarginedestro} \setinterfacecommand{romannumerals}{numeriromani} @@ -1706,12 +1821,38 @@ \setinterfacecommand{selectblocks}{selezionablocchi} \setinterfacecommand{selectpaper}{selezionacarta} \setinterfacecommand{selectversion}{selezionaversione} +\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}{settext} \setinterfacecommand{settextvariable}{setvariabiletesto} \setinterfacecommand{setupalign}{impostaallineamento} \setinterfacecommand{setupanswerarea}{setupanswerarea} \setinterfacecommand{setuparranging}{impostaparranging} +\setinterfacecommand{setupattachment}{setupattachment} \setinterfacecommand{setupbackground}{impostasfondo} \setinterfacecommand{setupbackgrounds}{impostasfondi} \setinterfacecommand{setupblackrules}{impostalineenere} @@ -1726,6 +1867,9 @@ \setinterfacecommand{setupcapitals}{impostamaiuscole} \setinterfacecommand{setupcaption}{impostacaption} \setinterfacecommand{setupcaptions}{impostacaptions} +\setinterfacecommand{setupcharacteralign}{setupcharacteralign} +\setinterfacecommand{setupcharacterkerning}{setupcharacterkerning} +\setinterfacecommand{setupcharacterspacing}{setupcharacterspacing} \setinterfacecommand{setupclipping}{impostaclippling} \setinterfacecommand{setupcolor}{impostacolore} \setinterfacecommand{setupcolors}{impostacolori} @@ -1736,6 +1880,7 @@ \setinterfacecommand{setupcombinations}{impostacombinazioni} \setinterfacecommand{setupcombinedlist}{impostaelencocombinato} \setinterfacecommand{setupcomment}{impostacommento} +\setinterfacecommand{setupcounter}{setupcounter} \setinterfacecommand{setupdescription}{setupdescription} \setinterfacecommand{setupdescriptions}{impostadescrizioni} \setinterfacecommand{setupenumeration}{setupenumeration} @@ -1745,9 +1890,14 @@ \setinterfacecommand{setupfields}{impostacampi} \setinterfacecommand{setupfillinlines}{impostarigheriempimento} \setinterfacecommand{setupfillinrules}{impostalineeriempimento} +\setinterfacecommand{setupfirstline}{setupfirstline} \setinterfacecommand{setupfloat}{impostaoggettomobile} \setinterfacecommand{setupfloats}{impostaoggettimobili} \setinterfacecommand{setupfloatsplitting}{impostaspezzamentooggettomobile} +\setinterfacecommand{setupfontexpansion}{setupfontexpansion} +\setinterfacecommand{setupfontprotrusion}{setupfontprotrusion} +\setinterfacecommand{setupfonts}{setupfonts} +\setinterfacecommand{setupfontsolution}{setupfontsolution} \setinterfacecommand{setupfooter}{impostapdp} \setinterfacecommand{setupfootertexts}{impostatestipdp} \setinterfacecommand{setupfootnotedefinition}{impostadefinizionenotepdp} @@ -1764,6 +1914,7 @@ \setinterfacecommand{setupheadnumber}{impostanumerotesta} \setinterfacecommand{setupheads}{impostateste} \setinterfacecommand{setupheadtext}{impostatestointestazioni} +\setinterfacecommand{setuphyphenation}{setuphyphenation} \setinterfacecommand{setuphyphenmark}{impostasegnosillabazione} \setinterfacecommand{setupindentedtext}{setupindentedtext} \setinterfacecommand{setupindenting}{impostarientro} @@ -1780,6 +1931,7 @@ \setinterfacecommand{setuplanguage}{impostalingua} \setinterfacecommand{setuplayout}{impostalayout} \setinterfacecommand{setuplegend}{impostalegenda} +\setinterfacecommand{setuplinenote}{setuplinenote} \setinterfacecommand{setuplinenumbering}{impostanumerazionerighe} \setinterfacecommand{setuplines}{impostarighe} \setinterfacecommand{setuplinewidth}{impostaampiezzariga} @@ -1792,6 +1944,10 @@ \setinterfacecommand{setupmarking}{impostamarcatura} \setinterfacecommand{setupmathalignment}{setupmathalignment} \setinterfacecommand{setupnarrower}{impostapiustretto} +\setinterfacecommand{setupnotation}{setupnotation} +\setinterfacecommand{setupnotations}{setupnotations} +\setinterfacecommand{setupnote}{setupnote} +\setinterfacecommand{setupnotes}{setupnotes} \setinterfacecommand{setupnumber}{impostanumerazione} \setinterfacecommand{setupnumbering}{impostanumerazione} \setinterfacecommand{setupoppositeplacing}{impostaposizionamentoopposti} @@ -1805,6 +1961,7 @@ \setinterfacecommand{setuppapersize}{impostadimensionicarta} \setinterfacecommand{setupparagraphnumbering}{impostanumerazionecapoversi} \setinterfacecommand{setupparagraphs}{impostacapoversi} +\setinterfacecommand{setupperiodkerning}{setupperiodkerning} \setinterfacecommand{setupplacement}{setupplacement} \setinterfacecommand{setuppositioning}{impostaposizionamento} \setinterfacecommand{setupprofiles}{impostaprofili} @@ -1834,6 +1991,7 @@ \setinterfacecommand{setuptabulate}{impostatabulato} \setinterfacecommand{setuptext}{impostatesto} \setinterfacecommand{setuptextbackground}{setuptextbackground} +\setinterfacecommand{setuptextnote}{setuptextnote} \setinterfacecommand{setuptextposition}{impostaposizionetesto} \setinterfacecommand{setuptextrules}{impostalineetesto} \setinterfacecommand{setuptexttexts}{impostatestotesti} @@ -1848,16 +2006,29 @@ \setinterfacecommand{setupurl}{impostaurl} \setinterfacecommand{setupversions}{impostaversioni} \setinterfacecommand{setupwhitespace}{impostaspaziobianco} +\setinterfacecommand{setvisualizerfont}{setvisualizerfont} \setinterfacecommand{showbodyfont}{mostrafontdeltesto} \setinterfacecommand{showbodyfontenvironment}{mostraambientefontdeltesto} \setinterfacecommand{showcolor}{mostracolore} \setinterfacecommand{showcolorgroup}{mostragruppocolori} +\setinterfacecommand{showcounter}{showcounter} \setinterfacecommand{showexternalfigures}{mostrafiguresterne} \setinterfacecommand{showfields}{mostracampi} +\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}{mostracornice} \setinterfacecommand{showgrid}{mostragriglia} +\setinterfacecommand{showhyphenationtrace}{showhyphenationtrace} +\setinterfacecommand{showkerning}{showkerning} \setinterfacecommand{showlayout}{mostralyout} \setinterfacecommand{showmakeup}{mostramakeup} +\setinterfacecommand{showminimalbaseline}{showminimalbaseline} \setinterfacecommand{showpalet}{mostratavolozza} \setinterfacecommand{showprint}{mostrastampa} \setinterfacecommand{showsetups}{mostraimpostazioni} @@ -1867,6 +2038,7 @@ \setinterfacecommand{someline}{qualcheriga} \setinterfacecommand{somewhere}{daqualcheparte} \setinterfacecommand{space}{spazio} +\setinterfacecommand{specialitem}{specialitem} \setinterfacecommand{splitfloat}{spezzaoggettomobile} \setinterfacecommand{startalignment}{iniziaallineamento} \setinterfacecommand{startbackground}{iniziasfondo} @@ -1884,6 +2056,7 @@ \setinterfacecommand{startglobal}{iniziaglobale} \setinterfacecommand{startline}{iniziariga} \setinterfacecommand{startlinecorrection}{iniziacorrezioneriga} +\setinterfacecommand{startlinenote}{startlinenote} \setinterfacecommand{startlinenumbering}{inizianumerazionerighe} \setinterfacecommand{startlines}{iniziarighe} \setinterfacecommand{startlocal}{inizialocale} @@ -1926,6 +2099,7 @@ \setinterfacecommand{stopglobal}{terminaglobale} \setinterfacecommand{stopline}{terminariga} \setinterfacecommand{stoplinecorrection}{terminacorrezioneriga} +\setinterfacecommand{stoplinenote}{stoplinenote} \setinterfacecommand{stoplinenumbering}{terminanumerazionerighe} \setinterfacecommand{stoplines}{terminarighe} \setinterfacecommand{stoplocal}{terminalocale} @@ -1953,8 +2127,11 @@ \setinterfacecommand{stopunpacked}{terminaunpacked} \setinterfacecommand{stopversion}{terminaversioni} \setinterfacecommand{stretched}{stirato} +\setinterfacecommand{strictinspectnextcharacter}{strictinspectnextcharacter} +\setinterfacecommand{stripcharacter}{stripcharacter} \setinterfacecommand{subformulanumber}{numerosottoformula} \setinterfacecommand{subpagenumber}{subpagenumber} +\setinterfacecommand{subtractfeature}{subtractfeature} \setinterfacecommand{switchtobodyfont}{cambiaafontdeltesto} \setinterfacecommand{switchtorawfont}{passaafontgrezzo} \setinterfacecommand{sym}{sim} @@ -1964,16 +2141,24 @@ \setinterfacecommand{synchronize}{sincronizza} \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}{altezzatesto} +\setinterfacecommand{textnote}{textnote} \setinterfacecommand{textreference}{riferimentotesto} \setinterfacecommand{textrule}{lineatesto} \setinterfacecommand{textvariable}{variabiletesto} \setinterfacecommand{textwidth}{ampiezzatesto} +\setinterfacecommand{thefirstcharacter}{thefirstcharacter} +\setinterfacecommand{thenormalizedbodyfontsize}{thenormalizedbodyfontsize} +\setinterfacecommand{theremainingcharacters}{theremainingcharacters} \setinterfacecommand{thinrule}{lineasottile} \setinterfacecommand{thinrules}{lineesottili} +\setinterfacecommand{tolinenote}{tolinenote} \setinterfacecommand{tooltip}{tooltip} \setinterfacecommand{topdistance}{distanzacima} \setinterfacecommand{topheight}{altezzacima} @@ -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}{nomeunita} \setinterfacecommand{unknown}{ignoto} +\setinterfacecommand{unregisterhyphenationpattern}{unregisterhyphenationpattern} \setinterfacecommand{useJSscripts}{usaJSscripts} \setinterfacecommand{useURL}{usaURL} \setinterfacecommand{useXMLfilter}{useXMLfilter} \setinterfacecommand{useblocks}{usablocco} +\setinterfacecommand{usebodyfont}{usebodyfont} +\setinterfacecommand{usebodyfontparameter}{usebodyfontparameter} \setinterfacecommand{usecommands}{usacomandi} \setinterfacecommand{useencoding}{usacodifica} \setinterfacecommand{useexternaldocument}{usadocumentoesterno} @@ -2007,10 +2198,12 @@ \setinterfacecommand{usetypescript}{usetypescript} \setinterfacecommand{usetypescriptfile}{usetypescriptfile} \setinterfacecommand{useurl}{usaurl} +\setinterfacecommand{verbatim}{verbatim} \setinterfacecommand{version}{versione} \setinterfacecommand{vl}{vl} \setinterfacecommand{weekday}{giornosettimana} \setinterfacecommand{whitespace}{spaziobianco} +\setinterfacecommand{widthspanningtext}{widthspanningtext} \setinterfacecommand{wordright}{paroladestra} \setinterfacecommand{writebetweenlist}{scrividentroelenco} \setinterfacecommand{writetolist}{scriviinelenco} diff --git a/tex/context/base/mkiv/cont-new.mkiv b/tex/context/base/mkiv/cont-new.mkiv index a3af1d3aa..a54645989 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 19:47} +\newcontextversion{2020.07.21 18:36} %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 60743ead8..9ef82e072 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 19:47} +\edef\contextversion{2020.07.21 18:36} %D Kind of special: diff --git a/tex/context/base/mkiv/context.mkxl b/tex/context/base/mkiv/context.mkxl index d479ad178..26825b102 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 19:47} +\edef\contextversion{2020.07.21 18:36} %D Kind of special: diff --git a/tex/context/base/mkiv/lpdf-lmt.lmt b/tex/context/base/mkiv/lpdf-lmt.lmt index ed385b4de..7e992f79e 100644 --- a/tex/context/base/mkiv/lpdf-lmt.lmt +++ b/tex/context/base/mkiv/lpdf-lmt.lmt @@ -148,10 +148,6 @@ local function reset_buffer() b = 0 end -local function flush_buffer() - b = 0 -end - -- fonts local fontcharacters @@ -723,6 +719,8 @@ local flushliteral do updaters.register("backend.update.pdf",function() function pdf.print(mode,str) + -- This only works inside objects, don't change this to flush + -- in between. It's different from luatex but okay. if str then mode = literalvalues[mode] else @@ -748,7 +746,6 @@ local flushliteral do -- pdf_set_pos(pdf_h,pdf_v) end b = b + 1 ; buffer[b] = str - flush_buffer() end end end) @@ -1708,9 +1705,9 @@ local finalize do -- 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) + if TrimBox then pageattributes.TrimBox = pdfsharedobject(TrimBox ) end + if CropBox then pageattributes.CropBox = pdfsharedobject(CropBox ) end + if BleedBox then pageattributes.BleedBox = pdfsharedobject(BleedBox) end else @@ -2228,6 +2225,7 @@ local openfile, closefile do f = { } flush = function(f,s) n = n + 1 f[n] = s +offset = offset + #s end close = function(f) f = concat(f) @@ -2257,19 +2255,12 @@ local openfile, closefile do close = m.close or m.__index.close end -- - flush_buffer = function() - if b > 0 then - flush(f,concat(buffer,"",1,b)) - b = 0 - end - end - local v = f_pdf(majorversion,minorversion) -- local b = "%\xCC\xD5\xC1\xD4\xC5\xD8\xD0\xC4\xC6\010" -- LUATEXPDF (+128) local b = "%\xC3\xCF\xCE\xD4\xC5\xD8\xD4\xD0\xC4\xC6\010" -- CONTEXTPDF (+128) flush(f,v) flush(f,b) - offset = #v + #b + offset = offset + #v + #b end closefile = function(abort) diff --git a/tex/context/base/mkiv/mlib-pdf.lua b/tex/context/base/mkiv/mlib-pdf.lua index 372a77f41..44e78ba91 100644 --- a/tex/context/base/mkiv/mlib-pdf.lua +++ b/tex/context/base/mkiv/mlib-pdf.lua @@ -460,7 +460,7 @@ function metapost.flush(specification,result) result[#result+1] = evenodd and "W* n" or "W n" elseif objecttype == "stop_clip" then result[#result+1] = "Q" - miterlimit, linecap, linejoin, dashed = -1, -1, -1, "" -- was false + miterlimit, linecap, linejoin, dashed, linewidth = -1, -1, -1, "", false elseif objecttype == "start_bounds" or objecttype == "stop_bounds" then -- skip elseif objecttype == "start_group" then @@ -475,7 +475,7 @@ function metapost.flush(specification,result) bbox = toboundingbox(object.path), }) result = { } -miterlimit, linecap, linejoin, dashed, linewidth = -1, -1, -1, "", false + miterlimit, linecap, linejoin, dashed, linewidth = -1, -1, -1, "", false else insert(groupstack,false) end @@ -490,7 +490,7 @@ miterlimit, linecap, linejoin, dashed, linewidth = -1, -1, -1, "", false result[#result+1] = reference result = pluginactions(data.after,result,flushfigure) result[#result+1] = "Q" -miterlimit, linecap, linejoin, dashed, linewidth = -1, -1, -1, "", false + miterlimit, linecap, linejoin, dashed, linewidth = -1, -1, -1, "", false end else -- we use an indirect table as we want to overload diff --git a/tex/context/base/mkiv/mult-fmt.lua b/tex/context/base/mkiv/mult-fmt.lua new file mode 100644 index 000000000..a91999afd --- /dev/null +++ b/tex/context/base/mkiv/mult-fmt.lua @@ -0,0 +1,177 @@ +if not modules then modules = { } end modules ['mult-fmt'] = { + version = 1.001, + comment = "companion to mult-ini.mkiv", + author = "Hans Hagen, PRAGMA-ADE, Hasselt NL", + copyright = "PRAGMA ADE / ConTeXt Development Team", + license = "see context related readme files" +} + +local next = next +local concat, sortedhash = table.concat, table.sortedhash +local sub, formatters = string.sub, string.formatters +local utfsplit = utf.split + +local prtcatcodes = catcodes.numbers.prtcatcodes +local contextsprint = context.sprint +local implement = interfaces.implement + +local report = logs.reporter("interface") +local report_interface = logs.reporter("interface","initialization") +local report_variable = logs.reporter("variable") +local report_constant = logs.reporter("constant") +local report_command = logs.reporter("command") +local report_element = logs.reporter("element") +local report_format = logs.reporter("format") +local report_messagetag = logs.reporter("messagetag") +local report_setupstring = logs.reporter("setupstring") + +local function limit(str,n) + if n > 6 and #str > n then + n = n - 4 + local t = utfsplit(str) + local m = #t + if m > n then + t[n] = " ..." + str = concat(t,"",1,n) + end + end + return str +end + +function interfaces.setuserinterface(interface,response) + local variables = interfaces.variables + local constants = interfaces.constants + local elements = interfaces.elements + local formats = interfaces.formats + local translations = interfaces.translations + local setupstrings = interfaces.setupstrings + local complete = interfaces.complete + local sharedstorage = storage.shared + -- + 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 + -- + do + local list = complete.constants -- forces the load + local t = { } + local f = formatters["\\ui_c{%s}{%s}"], formatters["\\ui_s{%s}"] + local s = formatters["\\ui_s{%s}"] + logs.startfilelogging(report,"translated constants") + for given, constant in sortedhash(list) 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 + report_constant("%-40s: %s",given,constant) + end + logs.stopfilelogging() + contextsprint(prtcatcodes,concat(t)) + end + do + local list = complete.variables -- forces the load + local t = { } + local f = formatters["\\ui_v{%s}{%s}"] + logs.startfilelogging(report,"translated variables") + for given, variable in sortedhash(list) do + variable = variable[interface] or variable.en or given + variables[given] = variable -- ja -> yes + nofvariables = nofvariables + 1 + t[nofvariables] = f(given,variable) + report_variable("%-40s: %s",given,variable) + end + logs.stopfilelogging() + contextsprint(prtcatcodes,concat(t)) + end + do + local list = complete.elements -- forces the load + local t = { } + local f = formatters["\\ui_e{%s}{%s}"] + logs.startfilelogging(report,"translated elements") + for given, element in sortedhash(list) do + element = element[interface] or element.en or given + elements[element] = given + nofelements = nofelements + 1 + t[nofelements] = f(given,element) + report_element("%-40s: %s",given,element) + end + logs.stopfilelogging() + contextsprint(prtcatcodes,concat(t)) + end + do + local list = complete.commands -- forces the load + local t = { } + local n = 0 + local f = formatters["\\ui_a\\%s\\%s"] -- formatters["\\ui_m{%s}{%s}"] + logs.startfilelogging(report,"translated commands") + for given, command in sortedhash(list) do + command = command[interface] or command.en or given + if command ~= given then + n = n + 1 + t[n] = f(given,command) + report_command("%-40s: %s",given,command) + end + nofcommands = nofcommands + 1 + end + logs.stopfilelogging() + contextsprint(prtcatcodes,"\\toksapp\\everydump{"..concat(t).."}") + end + do + local list = complete.messages.formats + logs.startfilelogging(report,"translated message formats") + for given, format in sortedhash(list) do + local found = format[interface] or format.en or given + formats[given] = found + nofformats = nofformats + 1 + report_messagetag("%-40s: %s",limit(given,38),limit(found,38)) + end + logs.stopfilelogging() + end + do + local list = complete.messages.translations + logs.startfilelogging(report,"translated message tags") + for given, translation in sortedhash(list) do + local found = translation[interface] or translation.en or given + translations[given] = found + noftranslations = noftranslations + 1 + report_messagetag("%-40s: %s",given,found) + end + logs.stopfilelogging() + end + do + local list = complete.setupstrings + logs.startfilelogging(report,"translated setupstrings") + for given, setupstring in sortedhash(list) do + local found = setupstring[interface] or setupstring.en or given + setupstrings[given] = found + nofsetupstrings = nofsetupstrings + 1 + report_setupstring("%-40s: %s",given,found) + end + logs.stopfilelogging() + 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", +} diff --git a/tex/context/base/mkiv/mult-low.lua b/tex/context/base/mkiv/mult-low.lua index 6d21e46e9..5a5fac8b5 100644 --- a/tex/context/base/mkiv/mult-low.lua +++ b/tex/context/base/mkiv/mult-low.lua @@ -450,7 +450,7 @@ return { "installctxfunction", "installprotectedctxfunction", "installprotectedctxscanner", "installctxscanner", "resetctxscanner", "cldprocessfile", "cldloadfile", "cldloadviafile", "cldcontext", "cldcommand", -- - "carryoverpar", + "carryoverpar", "freezeparagraphproperties", "lastlinewidth", -- "assumelongusagecs", diff --git a/tex/context/base/mkiv/mult-prm.lua b/tex/context/base/mkiv/mult-prm.lua index ddb97aca3..e842c485a 100644 --- a/tex/context/base/mkiv/mult-prm.lua +++ b/tex/context/base/mkiv/mult-prm.lua @@ -400,6 +400,7 @@ return { "scantextokens", "setfontid", "shapemode", + "snapshotpar", "supmarkmode", "textdirection", "thewithoutunit", diff --git a/tex/context/base/mkiv/spac-par.mkiv b/tex/context/base/mkiv/spac-par.mkiv index 1fd1cbd8a..e36fb5483 100644 --- a/tex/context/base/mkiv/spac-par.mkiv +++ b/tex/context/base/mkiv/spac-par.mkiv @@ -49,6 +49,11 @@ \unexpanded\def\flushparagraphproperties {\popmacro\currentparagraphproperties} +%D New experimental stuff: + +\unexpanded\def\freezeparagraphproperties{\snapshotpar\maxdimen} + + %D Beware, changing this will break some code (like pos/backgrounds) but it has been %D changed anyway so let's see where things go wrong. diff --git a/tex/context/base/mkiv/status-files.pdf b/tex/context/base/mkiv/status-files.pdf index 277fd403a..85cfd67cc 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 821e78dbb..8b5617c52 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/interface/mkii/keys-it.xml b/tex/context/interface/mkii/keys-it.xml index 881705608..51484ed05 100644 --- a/tex/context/interface/mkii/keys-it.xml +++ b/tex/context/interface/mkii/keys-it.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 5821d1211..88174f35a 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 19:47 +-- merge date : 2020-07-21 18:36 do -- begin closure to overcome local limits and interference -- cgit v1.2.3