diff options
| author | Hans Hagen <pragma@wxs.nl> | 2020-11-26 16:22:35 +0100 |
|---|---|---|
| committer | Context Git Mirror Bot <phg@phi-gamma.net> | 2020-11-26 16:22:35 +0100 |
| commit | b27d13bebb952ac46eb5ee1305f4ad8a7183132c (patch) | |
| tree | 8b4db8d3d46f6117ab12bb09eb038364cc6cf912 | |
| parent | a9cb00276fab1f821b3e237270769b74ee44b2bd (diff) | |
| download | context-b27d13bebb952ac46eb5ee1305f4ad8a7183132c.tar.gz | |
2020-11-26 15:41:00
79 files changed, 182 insertions, 277 deletions
diff --git a/doc/context/documents/general/manuals/luametatex.pdf b/doc/context/documents/general/manuals/luametatex.pdf Binary files differindex 577dc5213..8bf43b633 100644 --- a/doc/context/documents/general/manuals/luametatex.pdf +++ b/doc/context/documents/general/manuals/luametatex.pdf diff --git a/tex/context/base/mkii/cont-new.mkii b/tex/context/base/mkii/cont-new.mkii index 3be6c8c18..64a98aa95 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.11.25 21:39} +\newcontextversion{2020.11.26 15:38} %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 870deb804..25607f8b0 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.11.25 21:39} +\edef\contextversion{2020.11.26 15:38} %D For those who want to use this: diff --git a/tex/context/base/mkii/mult-fr.mkii b/tex/context/base/mkii/mult-fr.mkii index d39d3619c..9f9892874 100644 --- a/tex/context/base/mkii/mult-fr.mkii +++ b/tex/context/base/mkii/mult-fr.mkii @@ -774,6 +774,7 @@ \setinterfaceconstant{deepnumbercommand}{commandeprofondenumero} \setinterfaceconstant{deeptextcommand}{commandeprofondetexte} \setinterfaceconstant{default}{defaut} +\setinterfaceconstant{define}{define} \setinterfaceconstant{delay}{retard} \setinterfaceconstant{depth}{profondeur} \setinterfaceconstant{depthcorrection}{correctionprofondeur} @@ -2073,7 +2074,7 @@ \setinterfacecommand{startnarrower}{débutplusetroit} \setinterfacecommand{startopposite}{débutopposition} \setinterfacecommand{startoverlay}{débutsuperposition} -\setinterfacecommand{startoverzicht}{débutvuedensemble} +\setinterfacecommand{startoverview}{débutvuedensemble} \setinterfacecommand{startpacked}{débutemballage} \setinterfacecommand{startpositioning}{débutpositionnement} \setinterfacecommand{startproduct}{débutproduit} @@ -2116,7 +2117,7 @@ \setinterfacecommand{stopnarrower}{finplusetroit} \setinterfacecommand{stopopposite}{finopposition} \setinterfacecommand{stopoverlay}{finsuperposition} -\setinterfacecommand{stopoverzicht}{finvuedensemble} +\setinterfacecommand{stopoverview}{finvuedensemble} \setinterfacecommand{stoppacked}{finemballage} \setinterfacecommand{stoppositioning}{finpositionnement} \setinterfacecommand{stopproduct}{finproduit} diff --git a/tex/context/base/mkiv/buff-ver.mkiv b/tex/context/base/mkiv/buff-ver.mkiv index c9a5c4525..3cd2c91bc 100644 --- a/tex/context/base/mkiv/buff-ver.mkiv +++ b/tex/context/base/mkiv/buff-ver.mkiv @@ -387,7 +387,7 @@ \unexpanded\def\explicitcontrolspace {\optionalcontrolspace\allowbreak} % uses asciispace \appendtoks - \unexpanded\def\obeyedspace{\hskip\zeropoint\asciispacechar\hskip\zeropoint}% + \unexpanded\def\obeyedspace{\hskip\zeropoint\relax\asciispacechar\hskip\zeropoint\relax}% \to \everyenableelements \unexpanded\def\obeyhyphens diff --git a/tex/context/base/mkiv/cont-new.mkiv b/tex/context/base/mkiv/cont-new.mkiv index 71f3cfd7b..319b6dfa1 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.11.25 21:39} +\newcontextversion{2020.11.26 15:38} %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 f1f119f8b..aa1a49022 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.11.25 21:39} +\edef\contextversion{2020.11.26 15:38} %D Kind of special: diff --git a/tex/context/base/mkiv/status-files.pdf b/tex/context/base/mkiv/status-files.pdf Binary files differindex f35a6a3c2..8e4f09585 100644 --- a/tex/context/base/mkiv/status-files.pdf +++ b/tex/context/base/mkiv/status-files.pdf diff --git a/tex/context/base/mkiv/status-lua.pdf b/tex/context/base/mkiv/status-lua.pdf Binary files differindex a1c0cf575..3c6728c0d 100644 --- a/tex/context/base/mkiv/status-lua.pdf +++ b/tex/context/base/mkiv/status-lua.pdf diff --git a/tex/context/base/mkiv/strc-not.lua b/tex/context/base/mkiv/strc-not.lua index b2c8106e1..a18b3bd5e 100644 --- a/tex/context/base/mkiv/strc-not.lua +++ b/tex/context/base/mkiv/strc-not.lua @@ -32,7 +32,8 @@ notes.states = notes.states or { } lists.enhancers = lists.enhancers or { } notes.numbers = notes.numbers or { } -storage.register("structures/notes/states", notes.states, "structures.notes.states") +storage.register("structures/notes/states", notes.states, "structures.notes.states") +storage.register("structures/notes/numbers", notes.numbers, "structures.notes.numbers") local notestates = notes.states local notedata = table.setmetatableindex("table") @@ -492,6 +493,7 @@ local texgetglue = tex.getglue local texsetglue = tex.setglue local function check_spacing(n,i) + -- we can also check for tex.insertheights > 0 (instead of i > 1) local gn, pn, mn = texgetglue(n) local gi, pi, mi = texgetglue(i > 1 and "s_strc_notes_inbetween" or "s_strc_notes_before") local gt, pt, mt = gn + gi, pn + pi, mn + mi @@ -508,7 +510,7 @@ notes.check_spacing = check_spacing callback.register("build_page_insert", function(n,i) local state = notes.numbers[n] if state then - -- only notes, kind of hardcoded .. bah + -- only notes, kind of hardcoded .. bah local gt, pt, mt = check_spacing(n,i) texsetglue(0,gt,pt,mt) -- for the moment we use skip register 0 return 0 diff --git a/tex/context/base/mkxl/anch-bck.mklx b/tex/context/base/mkxl/anch-bck.mklx index 3f0504c4b..03e9c5195 100644 --- a/tex/context/base/mkxl/anch-bck.mklx +++ b/tex/context/base/mkxl/anch-bck.mklx @@ -429,11 +429,11 @@ \d_free_offset_top \d_free_offset_bottom} -\ifx\strc_floats_mark_pag_as_free\relax \else +\ifrelax\strc_floats_mark_pag_as_free \else \writestatus{error}{wrong place for pag_as_free}\wait \fi -\ifx\strc_floats_mark_par_as_free\relax \else +\ifrelax\strc_floats_mark_par_as_free \else \writestatus{error}{wrong place for par_as_free}\wait \fi @@ -650,7 +650,7 @@ \c!background=, \c!alternative=1] -\ifx\basegrid\undefined \else +\ifdefined\basegrid \aliased\letcsname\v!grid\endcsname\basegrid \fi diff --git a/tex/context/base/mkxl/anch-snc.mkxl b/tex/context/base/mkxl/anch-snc.mkxl index 51fb02d7c..e186e024f 100644 --- a/tex/context/base/mkxl/anch-snc.mkxl +++ b/tex/context/base/mkxl/anch-snc.mkxl @@ -23,8 +23,8 @@ \unprotect -\ifx\??syncposcounter\undefined \installcorenamespace{syncposcounter} \fi -\ifx\s!syncpos \undefined \def\s!syncpos {syncpos} \fi +\ifdefined\??syncposcounter \else \installcorenamespace{syncposcounter} \fi +\ifdefined\s!syncpos \else \def\s!syncpos {syncpos} \fi \let\c_sync_n\relax diff --git a/tex/context/base/mkxl/attr-lay.mkxl b/tex/context/base/mkxl/attr-lay.mkxl index 6cb1387ca..f9ff18be7 100644 --- a/tex/context/base/mkxl/attr-lay.mkxl +++ b/tex/context/base/mkxl/attr-lay.mkxl @@ -80,7 +80,7 @@ \permanent\def\attr_layoutcomponent_set#1% make this faster {\expandafter\let\expandafter\layoutcomponentboxattribute\csname\??layoutcomponentattribute#1\endcsname - \ifx\layoutcomponentboxattribute\relax + \ifrelax\layoutcomponentboxattribute \attr_layoutcomponent_initialize{#1}% get rid of { } \fi} diff --git a/tex/context/base/mkxl/back-exp.mkxl b/tex/context/base/mkxl/back-exp.mkxl index f248ca214..121f4bf9f 100644 --- a/tex/context/base/mkxl/back-exp.mkxl +++ b/tex/context/base/mkxl/back-exp.mkxl @@ -293,7 +293,7 @@ \permanent\protected\def\doinitializeexport {\edef\p_export{\backendparameter\c!export}% - \ifx\p_export\empty \else + \ifempty\p_export \else % yes | xml \setuptagging[\c!state=\v!start]% \clf_initializeexport diff --git a/tex/context/base/mkxl/bibl-bib.mkxl b/tex/context/base/mkxl/bibl-bib.mkxl index 6d35d8de0..20aea7bb6 100644 --- a/tex/context/base/mkxl/bibl-bib.mkxl +++ b/tex/context/base/mkxl/bibl-bib.mkxl @@ -12,7 +12,8 @@ %C details. %D This is really obsolete in \LMTX. For now I keep it but it will either go -%D away. The code is not upgraded, we only deal with macro protection. +%D away. The code is not upgraded, we only deal with macro protection. I will +%D only update the bits that annoy me in grepping for possible optimizations. \writestatus{loading}{ConTeXt Bibliography Support / Experimental BibTeX} @@ -447,7 +448,7 @@ \def\doloadbibtexpublicationalternative {\ifproductionrun \edef\bibtexpublicationsalternative{\@@pbalternative}% parent - \ifx\bibtexpublicationsalternative\empty \else + \ifempty\bibtexpublicationsalternative \else \processcommacommand[\bibtexpublicationsalternative]\dodoloadbibtexpublicationalternative \let\@@pbalternative\empty \fi @@ -528,7 +529,7 @@ \let\currentlist\currentbibtexsession \setuplist[\currentbibtexsession][\c!criterium=\v!previous,#2] \edef\currentbibtexsessiontitle{\namedlistparameter\currentbibtexsession\c!title}% - \ifx\currentbibtexsessiontitle\empty + \ifempty\currentbibtexsessiontitle \normalexpanded{\startnamedsection[\v!chapter][\c!reference=\currentbibtexsession,\c!title={\headtext{\currentbibtexsession}}]}% \else \normalexpanded{\startnamedsection[\v!chapter][\c!reference=\currentbibtexsession,\c!title={\currentbibtexsessiontitle}]}% @@ -638,7 +639,7 @@ \protected\def\typesetbibtexpublication#1% {\edef\currentbibtexsessiontag{#1}% - \ifx\currentbibtexsessiontag\empty + \ifempty\currentbibtexsessiontag % can't really happen \orelse\ifx\currentbibtexcriterium\v!all \dotypesetbibtexpublication % was \doplacepublicationindeed @@ -706,10 +707,10 @@ \doifelseassignment{#1} {\getparameters[\??pb\??pb][\c!alternative=,\c!extras=,#1]% \edef\currentbibtexvariant{\@@pb@@pbalternative}% - \ifx\currentbibtexvariant\empty + \ifempty\currentbibtexvariant \edef\currentbibtexvariant{\bibtexpublicationparameter\c!refcommand}% \fi - \ifx\@@pb@@pbextras\empty + \ifempty\@@pb@@pbextras \setupcite[\currentbibtexvariant][#1]% \else \edef\@@pb@@pbextras{{\@@pb@@pbextras\ifdefined\@@pb@@pbright\@@pb@@pbright\else\bibtexpublicationparameter\c!right\fi}}% diff --git a/tex/context/base/mkxl/bibl-tra.mkxl b/tex/context/base/mkxl/bibl-tra.mkxl index 2fecf9cd8..8c24024fd 100644 --- a/tex/context/base/mkxl/bibl-tra.mkxl +++ b/tex/context/base/mkxl/bibl-tra.mkxl @@ -10,7 +10,8 @@ %C Donated to the public domain. %D This is really obsolete in \LMTX. For now I keep it but it will either go -%D away. The code is not upgraded, we only deal with macro protection. +%D away. The code is not upgraded, we only deal with macro protection. I will +%D only update the bits that annoy me in grepping for possible optimizations. % % % % watch out ... bibl-tra-new.mkiv is work in progress % % % % @@ -211,7 +212,7 @@ \protected\def\bibdoifelse#1% {\expandafter\def\expandafter\!!stringa\expandafter{#1}% - \ifx\!!stringa\empty + \ifempty\!!stringa \expandafter\secondoftwoarguments \else \expandafter\firstoftwoarguments @@ -219,7 +220,7 @@ \protected\def\bibdoifnot#1% {\expandafter\def\expandafter\!!stringa\expandafter{#1}% - \ifx\!!stringa\empty + \ifempty\!!stringa \expandafter\firstofoneargument \else \expandafter\gobbleoneargument @@ -227,7 +228,7 @@ \protected\def\bibdoif#1% {\expandafter\def\expandafter\!!stringa\expandafter{#1}% - \ifx\!!stringa\empty + \ifempty\!!stringa \expandafter\gobbleoneargument \else \expandafter\firstofoneargument @@ -274,7 +275,7 @@ \def\thebibtexsorter{\executeifdefined{\??pb:\c!sort:\@@pbsort}\@@pbsort} \appendtoks - \ifx\@@pbdatabase\empty\else + \ifempty\@@pbdatabase\else \doifmode{*\v!first}{\ctxlua{bibtex.hacks.process { style="\thebibtexsorter", database="\@@pbdatabase" }}}% \fi \to \everysetupbibtex @@ -536,7 +537,7 @@ \let\templist\empty \dorecurse{#2} {\scratchtoks\doubleexpandafter{\csname\??pb @#1\recurselevel\endcsname}% - \edef\templist{\ifx\templist\empty\else\templist,\fi\the\scratchtoks}}% + \edef\templist{\ifempty\templist\else\templist,\fi\the\scratchtoks}}% #3\publicationlistparameter\c!command{#1}{\todocounter}{\templist}#4\relax \else #5% @@ -820,7 +821,7 @@ {\begingroup \setuplist[pubs][#1]% \edef\currentbibtexsessiontitle{\publicationlistparameter\c!title}% - \ifx\currentbibtexsessiontitle\empty + \ifempty\currentbibtexsessiontitle \normalexpanded{\startnamedsection[\v!chapter][\c!reference=pubs,\c!title={\headtext{pubs}}]}% \else \normalexpanded{\startnamedsection[\v!chapter][\c!reference=pubs,\c!title={\currentbibtexsessiontitle}]}% @@ -952,17 +953,17 @@ {#1}% {\getparameters[LO][\c!alternative=,\c!extras=,#1]% \edef\@@currentalternative{\LOalternative}% - \ifx\@@currentalternative\empty + \ifempty\@@currentalternative \edef\@@currentalternative{\@@citedefault}% \fi - \ifx\LOextras\empty + \ifempty\LOextras \setupcite[\@@currentalternative][#1]% \else - \expandafter\ifx\csname \??pv \@@currentalternative\c!right\endcsname\relax + \expandafter\ifrelax\csname \??pv \@@currentalternative\c!right\endcsname % avoids tail recursion \expandafter\let\csname \??pv \@@currentalternative\c!right\endcsname\empty \fi - \expandafter\ifx\csname LOright\endcsname \relax + \expandafter\ifrelax\csname LOright\endcsname \edef\LOextras{{\LOextras\bibalternative\c!right}}% \else \edef\LOextras{{\LOextras\LOright}}% @@ -1135,7 +1136,7 @@ \protected\def\docurrentbibauthor#1,#2% {\doifelseempty{#2} {\def\currentbibauthor{#1\bibalternative{otherstext}}} - {\expandafter\ifx\csname\??pv\@@currentalternative authoretallimit\endcsname\relax + {\expandafter\ifrelax\csname\??pv\@@currentalternative authoretallimit\endcsname \edef\currentbibauthor{#1\bibalternative{andtext}#2}% \else \edef\currentbibauthor{#1% @@ -1151,7 +1152,7 @@ \protected\def\robustaddtocommalist#1#2% {item} \cs {\robustdoifelseinset{#1}#2\resetglobal - {\dodoglobal\xdef#2{\ifx#2\empty\else#2,\fi#1}}} + {\dodoglobal\xdef#2{\ifempty#2\else#2,\fi#1}}} \popoverloadmode @@ -1183,7 +1184,7 @@ {\xdef\myauthor{\bibgetvara{#1}}% \xdef\myyear {\bibgetvary{#1}}} {}% - \ifx\myauthor\empty\else + \ifempty\myauthor\else \checkifmyauthoralreadyexists \findmatchingyear \fi} @@ -1233,7 +1234,7 @@ \protected\def\findmatchingyear {\edef\wantednumber{\the\bibitemwanted}% \getfromcommacommand[\thebibyears][\wantednumber]% - \ifx\commalistelement\empty + \ifempty\commalistelement \edef\myyear{{\myyear}}% \else \edef\myyear{{\commalistelement,\myyear}}% diff --git a/tex/context/base/mkxl/buff-ver.mkxl b/tex/context/base/mkxl/buff-ver.mkxl index 3df572702..b497c694a 100644 --- a/tex/context/base/mkxl/buff-ver.mkxl +++ b/tex/context/base/mkxl/buff-ver.mkxl @@ -115,7 +115,7 @@ \ifzeropt\scratchskip \else \let\buff_verbatim_set_line_margin\buff_verbatim_set_line_margin_indeed \fi - \ifx\buff_verbatim_set_line_margin\relax + \ifrelax\buff_verbatim_set_line_margin \doadaptleftskip{\typingparameter\c!margin}% \fi \edef\p_buff_option{\typingparameter\c!option}% @@ -377,7 +377,7 @@ \permanent\protected\def\explicitcontrolspace {\optionalcontrolspace\allowbreak} % uses asciispace \appendtoks - \enforced\protected\def\obeyedspace{\hskip\zeropoint\asciispacechar\hskip\zeropoint}% + \enforced\protected\def\obeyedspace{\hskip\zeropoint\relax\asciispacechar\hskip\zeropoint\relax}% \to \everyenableelements \permanent\protected\def\obeyhyphens diff --git a/tex/context/base/mkxl/cont-new.mkxl b/tex/context/base/mkxl/cont-new.mkxl index 027e63333..97b96b8cc 100644 --- a/tex/context/base/mkxl/cont-new.mkxl +++ b/tex/context/base/mkxl/cont-new.mkxl @@ -13,7 +13,7 @@ % \normalend % uncomment this to get the real base runtime -\newcontextversion{2020.11.25 21:39} +\newcontextversion{2020.11.26 15:38} %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/mkxl/context.mkxl b/tex/context/base/mkxl/context.mkxl index 9d40abfde..c324d3917 100644 --- a/tex/context/base/mkxl/context.mkxl +++ b/tex/context/base/mkxl/context.mkxl @@ -29,7 +29,7 @@ %D {YYYY.MM.DD HH:MM} format. \edef\contextformat {\jobname} -\edef\contextversion{2020.11.25 21:39} +\edef\contextversion{2020.11.26 15:38} %overloadmode 1 % check frozen / warning %overloadmode 2 % check frozen / error @@ -50,7 +50,7 @@ \edef\mksuffix {mkiv} \edef\contextmark{LMTX} -\ifx\normalinput\undefined \let\normalinput\input \fi +\ifdefined\normalinput \else \let\normalinput\input \fi \def\loadmarkfile#1{\normalinput{#1.\mksuffix}} \def\loadmkivfile#1{\normalinput{#1.mkiv}} diff --git a/tex/context/base/mkxl/core-two.mkxl b/tex/context/base/mkxl/core-two.mkxl index 0299e76f5..af48dc7c3 100644 --- a/tex/context/base/mkxl/core-two.mkxl +++ b/tex/context/base/mkxl/core-two.mkxl @@ -85,7 +85,7 @@ \let \twopassdatalist \empty \def\syst_twopass_check % can be delegated to lua once obsolete is gone - {\ifx\twopassdata\empty + {\ifempty\twopassdata \setfalse\twopassdatafound \else \settrue\twopassdatafound diff --git a/tex/context/base/mkxl/file-job.mklx b/tex/context/base/mkxl/file-job.mklx index b455b1770..cb6ea13cc 100644 --- a/tex/context/base/mkxl/file-job.mklx +++ b/tex/context/base/mkxl/file-job.mklx @@ -276,8 +276,8 @@ \appendtoks \normalexpanded {% - \startsetups[\currentdocument:\v!start]\noexpand\directsetup{\ifx\empty\currentdocumentparent\s!document\else\currentdocumentparent\fi:\v!start}\stopsetups - \startsetups[\currentdocument:\v!stop ]\noexpand\directsetup{\ifx\empty\currentdocumentparent\s!document\else\currentdocumentparent\fi:\v!stop }\stopsetups + \startsetups[\currentdocument:\v!start]\noexpand\directsetup{\ifempty\currentdocumentparent\s!document\else\currentdocumentparent\fi:\v!start}\stopsetups + \startsetups[\currentdocument:\v!stop ]\noexpand\directsetup{\ifempty\currentdocumentparent\s!document\else\currentdocumentparent\fi:\v!stop }\stopsetups \permanent\setvalue{\e!start\currentdocument}{\startdocument[\currentdocument]}% \permanent\setvalue{\e!stop \currentdocument}{\stopdocument} }% @@ -308,7 +308,7 @@ {\documentvariable\c!after \the\everystopdocument \stoptext - \ifx\empty\currentdocument\else\resetmode\currentdocument\fi + \ifempty\currentdocument\else\resetmode\currentdocument\fi \popmacro\currentdocument} \aliased \let\documentvariable \documentparameter diff --git a/tex/context/base/mkxl/file-mod.mklx b/tex/context/base/mkxl/file-mod.mklx index 5e9cd0159..a95ac3483 100644 --- a/tex/context/base/mkxl/file-mod.mklx +++ b/tex/context/base/mkxl/file-mod.mklx @@ -202,7 +202,7 @@ \stopreadingfile \letgvalue{\??runtimeloaded#2}\empty \fi - \ifx#1\undefined + \ifdefined#1\else \writestatus\m!system{command \string#1 not found in file #2}% \protected\gdef#1{{\infofont[unknown command \string#1]}}% \fi diff --git a/tex/context/base/mkxl/font-ini.mklx b/tex/context/base/mkxl/font-ini.mklx index 9278183a8..b186b8a02 100644 --- a/tex/context/base/mkxl/font-ini.mklx +++ b/tex/context/base/mkxl/font-ini.mklx @@ -399,9 +399,9 @@ %D local (sometimes in the textflow) size. We store these dimensions in two %D \DIMENSION\ registers. These registers are not to be misused in calculations. -\ifdefined\globalbodyfontsize\else \newdimen\globalbodyfontsize \fi \globalbodyfontsize=12pt -\ifdefined\localbodyfontsize \else \newdimen\localbodyfontsize \fi \localbodyfontsize =\globalbodyfontsize -\ifdefined\bodyfontsize \else \newdimen\bodyfontsize \fi \bodyfontsize =\globalbodyfontsize +\ifdefined\globalbodyfontsize \else \newdimen\globalbodyfontsize \fi \globalbodyfontsize=12pt +\ifdefined\localbodyfontsize \else \newdimen\localbodyfontsize \fi \localbodyfontsize =\globalbodyfontsize +\ifdefined\bodyfontsize \else \newdimen\bodyfontsize \fi \bodyfontsize =\globalbodyfontsize %D When we assign for instance 12pt to a \DIMENSION\ register the \type {\the}'d %D value comes out as 12.0pt, which is often not the way users specify the bodyfont @@ -412,7 +412,7 @@ \permanent\protected\def\normalizebodyfontsize#macro#body% {\expandafter\let\expandafter#macro\csname\??fontnormalizedbody\number\dimexpr#body\endcsname - \ifx#macro\relax + \ifrelax#macro% \normalizebodyfontsize_indeed#macro{#body}% \fi} @@ -2099,7 +2099,7 @@ {\bodyfontsize#size\relax \normalizebodyfontsize\normalizedbodyfontsize\bodyfontsize \expandafter\let\expandafter\font_basics_set_faces\csname\??fontbodyfaces\fontbody\endcsname - \ifx\font_basics_set_faces\relax + \ifrelax\font_basics_set_faces \font_basics_set_faces_preset \fi \font_basics_set_faces} @@ -2155,8 +2155,8 @@ %D Both macros look alike. The second one also has to take all kind of keywords into %D account. -\ifx\saveinterlinespace \undefined \let\saveinterlinespace \relax \fi -\ifx\restoreinterlinespace\undefined \let\restoreinterlinespace\relax \fi +\ifdefined\saveinterlinespace \else \let\saveinterlinespace \relax \fi +\ifdefined\restoreinterlinespace \else \let\restoreinterlinespace\relax \fi % \newtoks \everysetupbodyfont % \newtoks \everyswitchtobodyfont diff --git a/tex/context/base/mkxl/font-mat.mklx b/tex/context/base/mkxl/font-mat.mklx index 510d64d05..c81b7c5c7 100644 --- a/tex/context/base/mkxl/font-mat.mklx +++ b/tex/context/base/mkxl/font-mat.mklx @@ -198,7 +198,7 @@ \def\font_helpers_preset_math_family_indeed#fam#familytag% {\expandafter\let\expandafter\v_font_math_one\csname\??fontinstanceclass\fontclass-\fontbody-\s!mm-#familytag-\fontsize-1\endcsname - \ifx\v_font_math_one\relax + \ifrelax\v_font_math_one \font_helpers_preset_math_family_warning \orelse\ifnum\fontid\textfont#fam=\fontid\v_font_math_one\else \font_helpers_preset_math_family_indeed_changed#fam#familytag% diff --git a/tex/context/base/mkxl/font-sel.mklx b/tex/context/base/mkxl/font-sel.mklx index be9215704..a1fc8cd7f 100644 --- a/tex/context/base/mkxl/font-sel.mklx +++ b/tex/context/base/mkxl/font-sel.mklx @@ -23,7 +23,7 @@ \checkselectfontparent \setupcurrentselectfont[#settings]% \edef\p_selectfont_preset{\selectfontparameter\c!preset}% - \ifx\p_selectfont_preset\empty \else + \ifempty\p_selectfont_preset \else \processcommacommand[\p_selectfont_preset]\selectfont_preset_process \setupcurrentselectfont[#settings]% \fi diff --git a/tex/context/base/mkxl/font-set.mklx b/tex/context/base/mkxl/font-set.mklx index 03dc8bb32..44d4cff15 100644 --- a/tex/context/base/mkxl/font-set.mklx +++ b/tex/context/base/mkxl/font-set.mklx @@ -111,7 +111,7 @@ \font_preload_default_fonts} \protected\def\font_preloads_third_stage % always - {\ifx\fontclass\empty + {\ifempty\fontclass \writestatus\m!fonts{preloading latin modern fonts (third stage)}% \font_preload_default_fonts \font_preloads_reset diff --git a/tex/context/base/mkxl/grph-fig.mkxl b/tex/context/base/mkxl/grph-fig.mkxl index 723a627a5..71e9569d5 100644 --- a/tex/context/base/mkxl/grph-fig.mkxl +++ b/tex/context/base/mkxl/grph-fig.mkxl @@ -94,7 +94,7 @@ \def\grph_typesetting_process_indeed#1#2#3#4% options settings-a filename settings-b {\begingroup \edef\m_typesetting_name{\clf_runcontextjob{#3}{#1}}% - \ifx\m_typesetting_name\empty \else + \ifempty\m_typesetting_name \else \normalexpanded{\externalfigure[\m_typesetting_name][typesetting]}[#2,#4]% \fi \endgroup} diff --git a/tex/context/base/mkxl/grph-trf.mkxl b/tex/context/base/mkxl/grph-trf.mkxl index 9e00da7a4..3f5b3a4b0 100644 --- a/tex/context/base/mkxl/grph-trf.mkxl +++ b/tex/context/base/mkxl/grph-trf.mkxl @@ -465,9 +465,9 @@ \setvalue{\??scalenorm\v!fit }#1#2#3#4#5{\global#1#5} \setvalue{\??scalenorm\v!broad }#1#2#3#4#5{\global#1\dimexpr#5-4\externalfigureparameter\c!bodyfont\relax} \setvalue{\??scalenorm\s!unknown}#1#2#3#4#5{\global#1\dimexpr#2\dimexpr\externalfigureparameter\c!bodyfont/10\relax\relax} % brr ex -\setvalue{\??scalenorm\v!auto }#1#2#3#4#5{\ifx#3\empty\else\global#1#3\fi} -\setvalue{\??scalenorm\empty }#1#2#3#4#5{\ifx#3\empty\else\global#1#3\fi} -\setvalue{\??scalenorm\s!default}#1#2#3#4#5{\ifx#3\empty\else\global#1#3\fi} +\setvalue{\??scalenorm\v!auto }#1#2#3#4#5{\ifempty#3\else\global#1#3\fi} +\setvalue{\??scalenorm\empty }#1#2#3#4#5{\ifempty#3\else\global#1#3\fi} +\setvalue{\??scalenorm\s!default}#1#2#3#4#5{\ifempty#3\else\global#1#3\fi} \setvalue{\??scalefact\v!min }{\global\settrue \c_grph_scale_swap_factor} \setvalue{\??scalefact\s!unknown}{\global\setfalse\c_grph_scale_swap_factor} @@ -494,7 +494,7 @@ {% no overflow \edef#1{\luaexpr {\number - \ifx#2\empty + \ifempty#2% \ifempty\p_scale \plusthousand \else \ifnum \p_scale=\zerocount \plusthousand \else \p_scale \fi\fi diff --git a/tex/context/base/mkxl/lang-ini.mkxl b/tex/context/base/mkxl/lang-ini.mkxl index b32ae4c30..e55075d84 100644 --- a/tex/context/base/mkxl/lang-ini.mkxl +++ b/tex/context/base/mkxl/lang-ini.mkxl @@ -397,7 +397,7 @@ % to keep the language set: % % \protected\def\nohyphens % nicer for url's -% {\ifx\dohyphens\relax +% {\ifrelax\dohyphens % \protected\edef\dohyphens % {\hyphenminoffset\the\hyphenminoffset\relax % \lang_basics_synchronize_min_max}% diff --git a/tex/context/base/mkxl/lang-mis.mkxl b/tex/context/base/mkxl/lang-mis.mkxl index 5f883041a..46cbddf97 100644 --- a/tex/context/base/mkxl/lang-mis.mkxl +++ b/tex/context/base/mkxl/lang-mis.mkxl @@ -150,7 +150,7 @@ % hm why ex -\ifx\compoundhyphen\undefined +\ifdefined\compoundhyphen \else \permanent\protected\def\compoundhyphen{\hbox{-\kern-.10775\emwidth-}} % .25\exheight \fi @@ -159,9 +159,9 @@ %D compound characters like |-| or || to be separated from the words. \TEX\ hackers %D will recognise the next two macro's: -\ifx\prewordbreak \undefined \permanent\protected\def\prewordbreak {\penalty\plustenthousand\hskip\zeropoint\relax} \fi -\ifx\postwordbreak\undefined \permanent\protected\def\postwordbreak {\penalty\zerocount \hskip\zeropoint\relax} \fi -\ifx\hspaceamount \undefined \def\hspaceamount#1#2{.16667\emwidth} \fi % will be overloaded +\ifdefined\prewordbreak \else \permanent\protected\def\prewordbreak {\penalty\plustenthousand\hskip\zeropoint\relax} \fi +\ifdefined\postwordbreak\else \permanent\protected\def\postwordbreak {\penalty\zerocount \hskip\zeropoint\relax} \fi +\ifdefined\hspaceamount \else \def\hspaceamount#1#2{.16667\emwidth} \fi % will be overloaded %frozen\protected\def\permithyphenation{\ifhmode\prewordbreak\fi} % doesn't remove spaces \permanent\protected\def\permithyphenation{\ifhmode\wordboundary\fi} % doesn't remove spaces diff --git a/tex/context/base/mkxl/lang-url.mkxl b/tex/context/base/mkxl/lang-url.mkxl index bb51f838a..5e046fcf6 100644 --- a/tex/context/base/mkxl/lang-url.mkxl +++ b/tex/context/base/mkxl/lang-url.mkxl @@ -122,7 +122,7 @@ %D \hyphenatedfilename{here/there/filename.suffix} %D \stoptyping -\ifx\hyphenatedfilename\undefined \aliased\let\hyphenatedfilename\hyphenatedurl \fi +\ifdefined\hyphenatedfilename \else \aliased\let\hyphenatedfilename\hyphenatedurl \fi % \def\test#1% % {\dontleavehmode diff --git a/tex/context/base/mkxl/lxml-css.mkxl b/tex/context/base/mkxl/lxml-css.mkxl index c7c8d8afd..325516e16 100644 --- a/tex/context/base/mkxl/lxml-css.mkxl +++ b/tex/context/base/mkxl/lxml-css.mkxl @@ -20,7 +20,7 @@ % No stable interface yet. % \edef\CellPadding{\xmlatt{#1}{cellpadding}} -% \ifx\CellPadding\empty +% \ifempty\CellPadding % \edef\CellPadding{.25ex} % \else % \edef\CellPadding{\cssgetsinglepadding{\xmlatt{#1}{cellpadding}}} diff --git a/tex/context/base/mkxl/math-ali.mkxl b/tex/context/base/mkxl/math-ali.mkxl index dadf3ebfa..70566d5b6 100644 --- a/tex/context/base/mkxl/math-ali.mkxl +++ b/tex/context/base/mkxl/math-ali.mkxl @@ -1292,7 +1292,7 @@ % %D the \DIMENSION\ \type{\mathparentwd}. This value is derived from % %D the width of \type{\tenrm B}, so let's take care of it now: % -% \ifx\mathparentwd\undefined \newdimen\mathparentwd \fi +% \ifdefined\mathparentwd \else \newdimen\mathparentwd \fi % % \let\normalbordermatrix\bordermatrix % move that code to here instead % diff --git a/tex/context/base/mkxl/math-del.mkxl b/tex/context/base/mkxl/math-del.mkxl index 3995c08b2..07e6d7948 100644 --- a/tex/context/base/mkxl/math-del.mkxl +++ b/tex/context/base/mkxl/math-del.mkxl @@ -104,7 +104,7 @@ \edef\p_axis {\mathdelimiterparameter\c!axis}% \edef\p_leftoffset{\mathdelimiterparameter\c!leftoffset}% \edef\p_rightoffset{\mathdelimiterparameter\c!rightoffset}% - \ifx\p_leftoffset\empty\else + \ifempty\p_leftoffset\else \mskip\p_leftoffset \fi \Uvextensible @@ -114,7 +114,7 @@ depth \p_factor\dimexpr\mathdelimiterparameter\c!depth \relax \Udelimiter\zerocount\zerocount\mathdelimiterparameter\c!symbol \relax - \ifx\p_rightoffset\empty\else + \ifempty\p_rightoffset\else \mskip\p_rightoffset \fi}} diff --git a/tex/context/base/mkxl/math-frc.mkxl b/tex/context/base/mkxl/math-frc.mkxl index b232868cd..c1a0935a7 100644 --- a/tex/context/base/mkxl/math-frc.mkxl +++ b/tex/context/base/mkxl/math-frc.mkxl @@ -357,7 +357,7 @@ \def\math_frac_command_u {\clf_umathfraction {\mathfractionparameter\c!rule}% - \ifx\p_math_fraction_fences\empty + \ifempty\p_math_fraction_fences \mathfractionparameter\c!left \space \mathfractionparameter\c!right\space \else diff --git a/tex/context/base/mkxl/meta-nod.mkxl b/tex/context/base/mkxl/meta-nod.mkxl index a89901edb..4ecdce63c 100644 --- a/tex/context/base/mkxl/meta-nod.mkxl +++ b/tex/context/base/mkxl/meta-nod.mkxl @@ -142,12 +142,12 @@ \setupcurrentmetanodes[#3]% \edef\p_label{#4}% \edef\p_reference{\metanodesparameter\c!reference}% - \ifx\p_reference\empty\else + \ifempty\p_reference\else \clf_grph_nodes_register{\p_reference}\c_meta_nodes_n\relax \fi \normalexpanded{\endgroup\noexpand\etoksapp\t_meta_nodes{% mfun_node_make(\number#1,\number#2% - \ifx\p_label\empty + \ifempty\p_label ,""% \else ,"\metanodesparameter\c!command{\p_label}"% @@ -211,7 +211,7 @@ \csname\??metanodesoption\endcsname \fi \space - \ifx\p_rulethickness\empty \else + \ifempty\p_rulethickness \else withpen pencircle scaled \the\dimexpr\p_rulethickness\relax \fi ;% diff --git a/tex/context/base/mkxl/meta-pdh.mkxl b/tex/context/base/mkxl/meta-pdh.mkxl index fa731868d..e2d0e15b6 100644 --- a/tex/context/base/mkxl/meta-pdh.mkxl +++ b/tex/context/base/mkxl/meta-pdh.mkxl @@ -81,15 +81,14 @@ %D The last object number used is avaliable in the macro %D \type {\lastPDFMPobject}. -\ifx\makeMPintoPDFobject \undefined \newconstant\makeMPintoPDFobject \fi -\ifx\everyMPtoPDFconversion\undefined \newtoks \everyMPtoPDFconversion \fi +\ifdefined\makeMPintoPDFobject \else \newconstant\makeMPintoPDFobject \fi +\ifdefined\everyMPtoPDFconversion \else \newtoks \everyMPtoPDFconversion \fi \let\lastPDFMPobject \!!zerocount \let\currentPDFresources\empty \let\setMPextensions \relax -\def\PDFMPformoffset - {\ifx\objectoffset\undefined\zeropoint\else\objectoffset\fi} +\def\PDFMPformoffset{\ifdefined\objectoffset\objectoffset\else\zeropoint\fi} \def\resetMPvariables#1#2#3% {\glet\MPwidth \!!zeropoint @@ -98,8 +97,8 @@ \glet\MPlly \!!zerocount \glet\MPurx \!!zerocount \glet\MPury \!!zerocount - \xdef\MPxscale {#2}\ifx\MPxscale\empty\let\MPxscale\!!plusone\fi - \xdef\MPyscale {#3}\ifx\MPyscale\empty\let\MPyscale\!!plusone\fi + \xdef\MPxscale {#2}\ifempty\MPxscale\let\MPxscale\!!plusone\fi + \xdef\MPyscale {#3}\ifempty\MPyscale\let\MPyscale\!!plusone\fi \xdef\MPfilename {#1}} %D The main macro: @@ -145,7 +144,7 @@ %D Objects. \def\dopackageMPgraphic#1% #1 = boxregister - {\ifcase\makeMPintoPDFobject\or\or\ifx\currentPDFresources\empty\else + {\ifcase\makeMPintoPDFobject\or\or\ifempty\currentPDFresources\else % an existing value of 2 signals object support (set elsewhere) \makeMPintoPDFobject\plusone \fi\fi @@ -170,7 +169,7 @@ \fi} \def\setMPPDFobject#1#2% resources boxnumber - {\ifx\everyPDFxform\undefined\else\the\everyPDFxform\fi + {\ifdefined\everyPDFxform\the\everyPDFxform\fi \immediate\saveboxresource resources{#1}#2% \edef\getMPPDFobject{\noexpand\useboxresource\the\lastsavedboxresourceindex}} @@ -181,11 +180,11 @@ %D startMPresources, %D stopMPresources} -\ifx\deleteMPgraphic\undefined +\ifdefined\deleteMPgraphic \else \def\deleteMPgraphic#1{} \fi -\ifx\startMPresources\undefined +\ifdefined\startMPresources \else \let\startMPresources\relax \let\stopMPresources\relax \fi diff --git a/tex/context/base/mkxl/meta-tex.mkxl b/tex/context/base/mkxl/meta-tex.mkxl index 9afbbe066..fc8456c73 100644 --- a/tex/context/base/mkxl/meta-tex.mkxl +++ b/tex/context/base/mkxl/meta-tex.mkxl @@ -189,7 +189,7 @@ \permanent\protected\def\svgnormal#1#2#3#4% family weight style text {\bgroup \edef\p_family{#1}% - \ifx\p_family\empty\else + \ifempty\p_family\else \edef\p_font{\ifcsname\??svgfamily#1\endcsname\lastnamedcs\else#1\fi-#2-#3}% \predefinedfont[\s!spec:\p_font*\s!default\space @ 10bp]% \fi diff --git a/tex/context/base/mkxl/mult-aux.mkxl b/tex/context/base/mkxl/mult-aux.mkxl index 4bf682a78..9614f6cea 100644 --- a/tex/context/base/mkxl/mult-aux.mkxl +++ b/tex/context/base/mkxl/mult-aux.mkxl @@ -162,7 +162,7 @@ % % % End of experimental code. -%D We keep the above as reference, btu from now on experiment with the following +%D We keep the above as reference, but from now on experiment with the following %D implementation. In principle this one is faster, but because normally we don't %D have that many assignments it doesn't get noticed. For instance, the \LUAMETATEX\ %D manual does less than 6000 assignments and the payoff starts around a tenfold of @@ -273,7 +273,6 @@ \protected\def\mult_interfaces_install_parameter_handler#1#2#3#4#5#6#7#8#9% {\frozen\def#3##1{\csname\ifcsname#1#2:##1\endcsname#1#2:##1\else\expandafter#5\csname#1#2:\s!parent\endcsname{##1}\fi\endcsname}% \frozen\def#4##1##2{\ifcsname##1:##2\endcsname##1:##2\else\expandafter#5\csname##1:\s!parent\endcsname{##2}\fi}% -% \frozen\edef#5##1##2{\noexpand\ifx##1\relax\??empty\noexpand\else\noexpand#4##1{##2}\noexpand\fi}% is {} needed around ##1 ? \frozen\edef#5##1##2{\noexpand\ifrelax##1\??empty\noexpand\else\noexpand#4##1{##2}\noexpand\fi}% is {} needed around ##1 ? \frozen\def#6##1##2{\csname\ifcsname#1##1:##2\endcsname#1##1:##2\else\expandafter#5\csname#1##1:\s!parent\endcsname{##2}\fi\endcsname}% \frozen\def#7##1{\detokenize\expandafter\expandafter\expandafter{\csname#1#2:##1\endcsname}}% always root, no backtrack @@ -309,7 +308,6 @@ \protected\def\mult_interfaces_install_parameter_hash_handler#1#2#3#4#5#6#7#8#9% {\frozen\def#3##1{#1#4{#1#2}{##1}:}% leading #1 was missing .. is this one used? \frozen\def#4##1##2{\ifcsname##1:##2\endcsname##1\else\expandafter#5\csname##1:\s!parent\endcsname{##2}\fi}% -% \frozen\def#5##1##2{\ifx##1\relax\else#4##1{##2}\fi}% \frozen\def#5##1##2{\ifrelax##1\else#4##1{##2}\fi}% \frozen\def#6{#1#2:}% \frozen\def#7##1{#1##1:}% @@ -1005,7 +1003,6 @@ \let#6\empty \protected\def#2% {\expandafter\let\expandafter\c_mult_set\csname #1_t_#6\endcsname -% \ifx\c_mult_set\relax \ifrelax\c_mult_set \expandafter\newtoks\c_mult_set \letcsname#1_t_#6\endcsname\c_mult_set @@ -1094,16 +1091,16 @@ % \protected\def\TestMeA[#1]% % {\edef\currenttest{#1} % \edef\p_before{\testparameter\c!before}% -% \ifx\p_before\empty \relax \else \relax \fi} +% \ifempty\p_before \relax \else \relax \fi} % \protected\def\TestMeB[#1]% % {\edef\currenttest{#1} % \doifelsenothing{\testparameter\c!before}\relax\relax} % \protected\def\TestMeC[#1]% % {\edef\currenttest{#1} -% \expandafter\expandafter\expandafter\ifx\testparameter\c!before\empty \relax \else \relax \fi} +% \expandafter\expandafter\expandafter\ifempty\testparameter\c!before \relax \else \relax \fi} % \protected\def\TestMeD[#1]% % {\edef\currenttest{#1} -% \doubleexpandafter\ifx\testparameter\c!before\empty \relax \else \relax \fi} +% \doubleexpandafter\ifempty\testparameter\c!before \relax \else \relax \fi} % % \protect % diff --git a/tex/context/base/mkxl/mult-ini.mkxl b/tex/context/base/mkxl/mult-ini.mkxl index 70db84b2d..1dad4858a 100644 --- a/tex/context/base/mkxl/mult-ini.mkxl +++ b/tex/context/base/mkxl/mult-ini.mkxl @@ -780,7 +780,7 @@ \newcount\contextversionno -\ifx\contextversion\undefined +\ifdefined\contextversion \else \immutable\edef\contextversion{\the\normalyear.\the\normalmonth.\the\normalday\space 00:00} \fi @@ -795,7 +795,7 @@ %D %D This one is only used when we generate the format. -% \ifx\undefined\everydump +% \ifdefined\everydump \else % \newtoks\everydump % \def\dump{\the\everydump\global\everydump\emptytoks\glet\dump\relax\normaldump} % \fi diff --git a/tex/context/base/mkxl/node-rul.mkxl b/tex/context/base/mkxl/node-rul.mkxl index 2ded50c77..569f0d284 100644 --- a/tex/context/base/mkxl/node-rul.mkxl +++ b/tex/context/base/mkxl/node-rul.mkxl @@ -113,7 +113,7 @@ \protected\def\node_rules_define {\edef\p_node_rules_color{\barparameter\c!color}% \edef\p_node_text{\barparameter\c!text}% - \ifx\p_node_text\empty\else + \ifempty\p_node_text\else \setbox\b_node_rules\hbox{\p_node_text}% \fi \expandafter\integerdef\csname\??barattribute\currentbar\endcsname @@ -131,7 +131,7 @@ offset \barparameter\c!offset\space % number dy \barparameter\c!dy\space % number empty {\barparameter\c!empty}% - \ifx\p_node_text\empty\else + \ifempty\p_node_text\else % not that useful and efficient, more for testing something text \b_node_rules repeat {\barparameter\c!repeat}% diff --git a/tex/context/base/mkxl/pack-cut.mkxl b/tex/context/base/mkxl/pack-cut.mkxl index 08a5eab11..0cd06ed43 100644 --- a/tex/context/base/mkxl/pack-cut.mkxl +++ b/tex/context/base/mkxl/pack-cut.mkxl @@ -90,7 +90,7 @@ \hss \vpack to \cutmarklength {\scratchdimen\dimexpr\cutmarklength/2\relax - \scratchskip \ifx\cutmarkhoffset\empty\cutmarkoffset\scratchdimen\else\cutmarkhoffset\fi + \scratchskip \ifempty\cutmarkhoffset\cutmarkoffset\scratchdimen\else\cutmarkhoffset\fi \vss \hbox to \d_pack_cutmarks_width {\llap{\copy\scratchbox\hskip\scratchskip}% @@ -115,10 +115,10 @@ \hsize\d_pack_cutmarks_width \setbox\scratchbox\vpack {\setbox\scratchbox\hpack{\horizontalcuts}% - \scratchskip\ifx\cutmarkvoffset\empty\cutmarkoffset\scratchdimen\else\cutmarkvoffset\fi + \scratchskip\ifempty\cutmarkvoffset\cutmarkoffset\scratchdimen\else\cutmarkvoffset\fi \tlap{\copy\scratchbox\vskip\scratchskip}% \hpack to \d_pack_cutmarks_width - {\scratchskip\ifx\cutmarkhoffset\empty\cutmarkoffset\scratchdimen\else\cutmarkhoffset\fi + {\scratchskip\ifempty\cutmarkhoffset\cutmarkoffset\scratchdimen\else\cutmarkhoffset\fi \setbox\scratchbox\hpack{\verticalcuts}% \llap{\copy\scratchbox\hskip\scratchskip}% \ifdim\d_pack_cutmarks_depth=\zeropoint @@ -138,9 +138,9 @@ \wd\scratchbox\zeropoint \startcolor[\defaulttextcolor]% \box\scratchbox - \ifx\cutmarksymbol\relax \else + \ifrelax\cutmarksymbol \else \setbox\scratchbox\vpack - {\scratchskip\ifx\cutmarkvoffset\empty\cutmarkoffset\scratchdimen\else\cutmarkvoffset\fi + {\scratchskip\ifempty\cutmarkvoffset\cutmarkoffset\scratchdimen\else\cutmarkvoffset\fi \vskip-\dimexpr\scratchskip+\cutmarklength\relax \hpack{\cutmarksymbols\cutmarktoptext}% \vskip\dimexpr\scratchskip+\d_pack_cutmarks_height+\d_pack_cutmarks_depth+\scratchskip\relax diff --git a/tex/context/base/mkxl/pack-rul.mkxl b/tex/context/base/mkxl/pack-rul.mkxl index 21ba03040..23de8d5cb 100644 --- a/tex/context/base/mkxl/pack-rul.mkxl +++ b/tex/context/base/mkxl/pack-rul.mkxl @@ -82,7 +82,6 @@ \expandafter\noexpand\csname inherited#1framedbox\endcsname}} % new \protected\def\mult_interfaces_install_inherited_framed#1#2#3#4#5#6#7#8#9% -% {\enforced\frozen\def#5##1##2{\ifx##1\relax#6{##2}\else#4{##1}{##2}\fi}% {\enforced\frozen\def#5##1##2{\ifrelax##1#6{##2}\else#4{##1}{##2}\fi}% \enforced\frozen\def#6##1{\ifcsname\??framed:##1\endcsname\??framed:##1\else\??empty\fi}% root \frozen\instance\protected\def#8% @@ -1517,7 +1516,6 @@ \fi \fi % -% \ifx\postprocessframebox\relax \else \ifrelax\postprocessframebox \else % better: \pushmacro\\postprocessframebox etc \let\next\postprocessframebox diff --git a/tex/context/base/mkxl/page-brk.mkxl b/tex/context/base/mkxl/page-brk.mkxl index a8fe10d87..dace10eed 100644 --- a/tex/context/base/mkxl/page-brk.mkxl +++ b/tex/context/base/mkxl/page-brk.mkxl @@ -107,13 +107,13 @@ \permanent\protected\def\usepageparameter#1% {\edef\m_page_breaks_asked{#1\c!page}% - \ifx\m_page_breaks_asked\empty\else + \ifempty\m_page_breaks_asked\else \pagebreak[\m_page_breaks_asked]% \fi} \permanent\protected\def\dousepageparameter#1% {\edef\m_page_breaks_asked{#1}% - \ifx\m_spac_align_asked\empty\else + \ifempty\m_spac_align_asked\else \pagebreak[\m_page_breaks_asked]% \fi} diff --git a/tex/context/base/mkxl/page-ffl.mkxl b/tex/context/base/mkxl/page-ffl.mkxl index 1ba4bf01d..4bf685265 100644 --- a/tex/context/base/mkxl/page-ffl.mkxl +++ b/tex/context/base/mkxl/page-ffl.mkxl @@ -77,7 +77,7 @@ \c!page=\v!left] \appendtoks - \ifx\currentfacingfloatparent\empty + \ifempty\currentfacingfloatparent \normalexpanded{\definefacingfloat[\currentfacingfloat:\v!left ][\currentfacingfloat]}% \normalexpanded{\definefacingfloat[\currentfacingfloat:\v!right][\currentfacingfloat]}% \fi @@ -180,7 +180,7 @@ {\begingroup % todo: \usepageparameter % \edef\p_page{\facingfloatparameter\c!page}% -% \ifx\p_page\empty\else +% \ifempty\p_page\else % \page[\p_page]% % \fi % @@ -205,7 +205,7 @@ \protected\def\strc_floats_facing_wrap_up {\edef\p_spaceinbetween{\facingfloatparameter\c!spaceinbetween}% - \ifx\p_spaceinbetween\empty + \ifempty\p_spaceinbetween \scratchdimen\zeropoint \else \setbox\scratchbox\vbox{\directvspacing\p_spaceinbetween}% diff --git a/tex/context/base/mkxl/page-flt.mkxl b/tex/context/base/mkxl/page-flt.mkxl index bc287da7d..55c6b177f 100644 --- a/tex/context/base/mkxl/page-flt.mkxl +++ b/tex/context/base/mkxl/page-flt.mkxl @@ -36,8 +36,8 @@ \def\page_floats_report_total {\showmessage\m!floatblocks4% {\the\totalnoffloats - \ifx\floatlocationmethod\empty - \ifx\floatlocation\empty\else,\floatlocation\fi + \ifempty\floatlocationmethod + \ifempty\floatlocation\else,\floatlocation\fi \else ,\floatlocationmethod \fi}} @@ -275,7 +275,7 @@ \protected\def\page_floats_flush_page_floats % used in postpone {\edef\m_page_otr_checked_page_float{\clf_checkedpagefloat}% - \ifx\m_page_otr_checked_page_float\empty + \ifempty\m_page_otr_checked_page_float % nothing \orelse\ifx\m_page_otr_checked_page_float\v!empty \emptyhbox \page_otr_fill_and_eject_page % why not dummy_page diff --git a/tex/context/base/mkxl/page-imp.mkxl b/tex/context/base/mkxl/page-imp.mkxl index 6ccab3e4e..1d2ef5072 100644 --- a/tex/context/base/mkxl/page-imp.mkxl +++ b/tex/context/base/mkxl/page-imp.mkxl @@ -176,7 +176,7 @@ \def\page_shipouts_normal#1% {\global\advance\shippedoutpages\plusone % this is not resource safe! - \ifx\pagestoshipout\empty + \ifempty\pagestoshipout \ifcase\whichpagetoshipout\relax \donetrue \or % 1 @@ -1357,14 +1357,14 @@ \def\page_boxes_filter_shift#1#2#3% #1=\dimenx #2=\xpageshifts #3=\nofxpageshifts {#1\zeropoint - \ifx#2\empty \else + \ifempty#2\else \global\advance#3\plusone \getfromcommacommand[#2][#3]% - \ifx\commalistelement\empty + \ifempty\commalistelement \global#3\plusone % we cycle \getfromcommacommand[#2][#3]% \fi - \ifx\commalistelement\empty \else + \ifempty\commalistelement \else #1\commalistelement\relax % the relax is really needed as there is an \if later on \fi \fi} diff --git a/tex/context/base/mkxl/page-inf.mkxl b/tex/context/base/mkxl/page-inf.mkxl index 1e4f6e1d7..7e65d6e9a 100644 --- a/tex/context/base/mkxl/page-inf.mkxl +++ b/tex/context/base/mkxl/page-inf.mkxl @@ -78,11 +78,11 @@ \ifdone \donefalse \else - \ifx\currentproject \empty \else \space\v!project :\space\currentproject \space \donetrue \fi - \ifx\currentproduct \empty \else \space\v!product :\space\currentproduct \space \donetrue \fi - \ifx\currentcomponent\empty \else \space\v!component:\space\currentcomponent\space \donetrue \fi + \ifempty\currentproject \else \space\v!project :\space\currentproject \space \donetrue \fi + \ifempty\currentproduct \else \space\v!product :\space\currentproduct \space \donetrue \fi + \ifempty\currentcomponent \else \space\v!component:\space\currentcomponent\space \donetrue \fi \fi - \ifdone \else \space\v!file :\space\jobname \space \fi + \ifdone \else \space\v!file :\space\jobname \space \fi \hss \currentversiontext \quad diff --git a/tex/context/base/mkxl/page-inj.mklx b/tex/context/base/mkxl/page-inj.mklx index 19f01e6d3..fda757dbe 100644 --- a/tex/context/base/mkxl/page-inj.mklx +++ b/tex/context/base/mkxl/page-inj.mklx @@ -127,7 +127,7 @@ {\edef\p_page_injections_pagestate{\pageinjectionparameter\c!pagestate}% \ifx\p_page_injections_pagestate\v!stop \else \edef\p_page_injections_n{\pageinjectionparameter\c!n}% - \ifx\p_page_injections_n\empty + \ifempty\p_page_injections_n \let\p_page_injections_n\plusone \fi \dorecurse\p_page_injections_n diff --git a/tex/context/base/mkxl/page-ins.mkxl b/tex/context/base/mkxl/page-ins.mkxl index cb6e3e3f4..5c275516c 100644 --- a/tex/context/base/mkxl/page-ins.mkxl +++ b/tex/context/base/mkxl/page-ins.mkxl @@ -44,7 +44,7 @@ \clf_setinsertmigration{\p_anchoring}} \appendtoks - \ifx\currentinsertionparent\empty + \ifempty\currentinsertionparent \page_inserts_check_anchoring \fi \to \everysetupinsertion @@ -81,7 +81,7 @@ % \floatingpenalty\zerocount \appendtoks - \ifx\currentinsertionparent\empty \else + \ifempty\currentinsertionparent \else \page_inserts_synchronize_registers \fi \to \everysetupinsertion @@ -125,7 +125,7 @@ % we already know the number. \appendtoks - \ifx\currentinsertionparent\empty + \ifempty\currentinsertionparent \ifcsname\??insertionnumber\currentinsertion\endcsname % bad news \else @@ -151,7 +151,7 @@ \to \everydefineinsertion \appendtoks - \ifx\currentinsertionparent\empty \else + \ifempty\currentinsertionparent \else \clf_setupinsertion {\currentinsertion} {% diff --git a/tex/context/base/mkxl/page-lay.mkxl b/tex/context/base/mkxl/page-lay.mkxl index c9997583a..9c84844bf 100644 --- a/tex/context/base/mkxl/page-lay.mkxl +++ b/tex/context/base/mkxl/page-lay.mkxl @@ -828,7 +828,7 @@ \page_layouts_check_default_indeed\v_real_page_current \orelse\ifcsname\namedlayouthash\v_real_page_odd_or_even\c!state\endcsname \page_layouts_check_default_indeed\v_real_page_odd_or_even - \orelse\ifx\v_page_layouts_pre_check\relax + \orelse\ifrelax\v_page_layouts_pre_check % okay \else \page_layouts_check_revert @@ -1068,7 +1068,7 @@ \page_adapts_check} \def\page_adapts_status_info % used elsewhere - {\ifx\page_adepts_pop\relax \else + {\ifrelax\page_adepts_pop \else \space(adept: \the\d_page_adepts_height)\space \fi \the\realpageno} @@ -1088,7 +1088,7 @@ % NOG EENS NAGAAN WANNEER NU GLOBAL EN WANNEER NIET -\ifx\doifelselayoutsomeline\undefined % eventually defined in page-txt +\ifdefined\doifelselayoutsomeline \else % eventually defined in page-txt \let\doifelselayoutsomeline\secondofthreearguments \fi diff --git a/tex/context/base/mkxl/page-mcl.mkxl b/tex/context/base/mkxl/page-mcl.mkxl index cff4a6a63..d36e76d94 100644 --- a/tex/context/base/mkxl/page-mcl.mkxl +++ b/tex/context/base/mkxl/page-mcl.mkxl @@ -428,7 +428,7 @@ \usealignparameter\multicolumnsparameter % \edef\p_blank{\multicolumnsparameter\c!blank}% - \ifx\p_blank\empty \else + \ifempty\p_blank \else \setupblank[\p_blank]% \fi % diff --git a/tex/context/base/mkxl/page-pcl.mkxl b/tex/context/base/mkxl/page-pcl.mkxl index 173fad91a..db4ebdfd4 100644 --- a/tex/context/base/mkxl/page-pcl.mkxl +++ b/tex/context/base/mkxl/page-pcl.mkxl @@ -766,7 +766,7 @@ \setuppagecolumns[#1]}% {\edef\currentpagecolumns{#1}}% \edef\p_page{\pagecolumnsparameter\c!page}% - \ifx\p_page\empty + \ifempty\p_page \setfalse\c_page_col_page \orelse\ifx\p_page\v!no \setfalse\c_page_col_page diff --git a/tex/context/base/mkxl/page-sel.mklx b/tex/context/base/mkxl/page-sel.mklx index dfd4c27f3..03be048f4 100644 --- a/tex/context/base/mkxl/page-sel.mklx +++ b/tex/context/base/mkxl/page-sel.mklx @@ -118,7 +118,7 @@ \setbox\scratchbox\hpack {\hskip-\scratchwidth \edef\p_category{\directwithpagesparameter\c!category}% \useexternalfigure[foo][width=\textwidth] - \ifx\p_category\empty + \ifempty\p_category \externalfigure[#filename][\c!page=#page,\c!height=\textheight]% \else \externalfigure[#filename][\p_category][\c!page=#page]% diff --git a/tex/context/base/mkxl/page-sid.mkxl b/tex/context/base/mkxl/page-sid.mkxl index d5032ddd0..230ce147e 100644 --- a/tex/context/base/mkxl/page-sid.mkxl +++ b/tex/context/base/mkxl/page-sid.mkxl @@ -641,7 +641,7 @@ \def\page_sides_place_snap_to_grid#1% {\edef\p_grid{\floatparameter\c!grid}% - \ifx\p_grid\empty\else + \ifempty\p_grid\else \snaptogrid[\p_grid]% \fi \hpack{#1}} @@ -861,7 +861,7 @@ \let\page_sides_check_floats\relax \def\page_sides_initialize_checker - {\ifx\page_sides_check_floats\relax + {\ifrelax\page_sides_check_floats \glet\page_sides_check_floats\page_sides_check_floats_indeed \clf_enablesidefloatchecker \glet\page_sides_initialize_checker\relax @@ -914,7 +914,7 @@ \divide\c_page_sides_n_of_hang \baselineskip\relax \else \d_page_sides_progression - \ifx\p_sidethreshold\empty + \ifempty\p_sidethreshold \d_page_sides_progress \else \dimexpr\d_page_sides_progress-\p_sidethreshold\relax diff --git a/tex/context/base/mkxl/page-txt.mklx b/tex/context/base/mkxl/page-txt.mklx index 5980277c3..b20650341 100644 --- a/tex/context/base/mkxl/page-txt.mklx +++ b/tex/context/base/mkxl/page-txt.mklx @@ -754,7 +754,7 @@ {\strc_pagenumbers_place_location} % test below fails \def\page_layouts_reset_page_number_location - {\ifx\m_page_layouts_page_number_location_v\relax\else + {\ifrelax\m_page_layouts_page_number_location_v\else \edef\currentlayoutelement{\m_page_layouts_page_number_location_v:\m_page_layouts_page_number_location_h}% \edef\page_layouts_previous_page_number_locator{\detokenizedlayoutelementparameter\m_page_layouts_page_number_location_x}% \doif{\meaning\page_layouts_previous_page_number_locator}{\meaning\page_layouts_place_page_number} diff --git a/tex/context/base/mkxl/scrn-ini.mklx b/tex/context/base/mkxl/scrn-ini.mklx index aef9bb33e..2bf52edf1 100644 --- a/tex/context/base/mkxl/scrn-ini.mklx +++ b/tex/context/base/mkxl/scrn-ini.mklx @@ -32,7 +32,7 @@ \installswitchcommandhandler \??interaction {interaction} \??interaction \appendtoks - \ifx\previousinteraction\empty + \ifempty\previousinteraction \checkinteractionstate \orelse\ifx\currentinteraction\previousinteraction \checkinteractionstate @@ -130,7 +130,7 @@ \permanent\protected\def\setlocationcolorspecified#1% not grouped ! {\ifnum#1=\plusone \edef\askedcontrastcolor{\interactionparameter\c!contrastcolor}% - \ifx\askedcontrastcolor\empty + \ifempty\askedcontrastcolor \useinteractioncolorparameter\c!color \else \useinteractioncolorparameter\c!contrastcolor @@ -142,7 +142,7 @@ \permanent\protected\def\setlocationattributesspecified#1% not grouped ! {\ifnum#1=\plusone \edef\askedcontrastcolor{\interactionparameter\c!contrastcolor}% - \ifx\askedcontrastcolor\empty + \ifempty\askedcontrastcolor \useinteractionstyleandcolor\c!style\c!color \else \useinteractionstyleandcolor\c!style\c!contrastcolor @@ -154,7 +154,7 @@ \permanent\protected\def\setlocationcolorspecspecified#1#2% \resolver {\ifnum#1=\plusone \edef\askedcontrastcolor{#2\c!contrastcolor}% - \ifx\askedcontrastcolor\empty + \ifempty\askedcontrastcolor \colo_helpers_activate{#2\c!color}% \else \colo_helpers_activate\askedcontrastcolor @@ -197,7 +197,7 @@ \def\scrn_identity_prerolled#1% {\begingroup \edef\tempstring{\interactionparameter#1}% - \ifx\tempstring\empty + \ifempty\tempstring \endgroup \else \the\everypreroll diff --git a/tex/context/base/mkxl/scrn-pag.mklx b/tex/context/base/mkxl/scrn-pag.mklx index ef3923f56..a500b6695 100644 --- a/tex/context/base/mkxl/scrn-pag.mklx +++ b/tex/context/base/mkxl/scrn-pag.mklx @@ -284,7 +284,7 @@ \fi} \def\scrn_transitions_set - {\iflocation \ifx\scrn_transitions_list\empty \else + {\iflocation \ifempty\scrn_transitions_list \else \scrn_transitions_set_indeed \fi \fi} diff --git a/tex/context/base/mkxl/scrn-ref.mklx b/tex/context/base/mkxl/scrn-ref.mklx index df395e550..806f2f48a 100644 --- a/tex/context/base/mkxl/scrn-ref.mklx +++ b/tex/context/base/mkxl/scrn-ref.mklx @@ -57,10 +57,10 @@ {\iflocation \edef\currentinteractionopenaction {\interactionparameter\c!openaction }% \edef\currentinteractioncloseaction{\interactionparameter\c!closeaction}% - \ifx\currentinteractionopenaction\empty \else + \ifempty\currentinteractionopenaction \else \clf_setopendocumentaction{\currentinteractionopenaction}% \fi - \ifx\currentinteractioncloseaction\empty \else + \ifempty\currentinteractioncloseaction \else \clf_setclosedocumentaction{\currentinteractioncloseaction}% \fi \glet\scrn_reference_set_text_actions\relax @@ -70,10 +70,10 @@ {\iflocation \edef\currentinteractionopenpageaction {\interactionparameter\c!openpageaction }% \edef\currentinteractionclosepageaction{\interactionparameter\c!closepageaction}% - \ifx\currentinteractionopenpageaction\empty \else + \ifempty\currentinteractionopenpageaction \else \clf_setopenpageaction{\currentinteractionopenpageaction}% \fi - \ifx\currentinteractionclosepageaction\empty \else + \ifempty\currentinteractionclosepageaction \else \clf_setclosepageaction{\currentinteractionclosepageaction}% \fi \fi} diff --git a/tex/context/base/mkxl/scrn-wid.mklx b/tex/context/base/mkxl/scrn-wid.mklx index b35391d19..384a60a60 100644 --- a/tex/context/base/mkxl/scrn-wid.mklx +++ b/tex/context/base/mkxl/scrn-wid.mklx @@ -170,7 +170,7 @@ \edef\currentattachmentwidth {\attachmentparameter\c!width }% \edef\currentattachmentheight{\attachmentparameter\c!height}% \edef\currentattachmentdepth {\attachmentparameter\c!depth }% - \ifx\currentattachmentsymbol\empty + \ifempty\currentattachmentsymbol \ifx\currentattachmentwidth \v!fit\edef\currentattachmentwidth {.5\emwidth}\fi \ifx\currentattachmentheight\v!fit\edef\currentattachmentheight{.5\emwidth}\fi \ifx\currentattachmentdepth \v!fit\let \currentattachmentdepth \zeropoint\fi diff --git a/tex/context/base/mkxl/spac-ali.mkxl b/tex/context/base/mkxl/spac-ali.mkxl index 5d4d46497..b19c9c8db 100644 --- a/tex/context/base/mkxl/spac-ali.mkxl +++ b/tex/context/base/mkxl/spac-ali.mkxl @@ -203,7 +203,6 @@ \else % todo: take set value or none .. better done elsewhere (200 is normal) \fi -% \ifx\dohyphens\relax % was 2.5 in old implementation using scratch registers \ifrelax\dohyphens % was 2.5 in old implementation using scratch registers \hyphenpenalty\dimexpr2.8\hsize/\dimexpr#1\relax\relax % 50 in raggedright/raggedleft %\else @@ -580,7 +579,6 @@ \permanent\protected\def\spac_align_prepare#1% deferred {\edef\m_spac_align_asked{#1}% \expandafter\let\expandafter\raggedcommand\csname\??alignmentnormalcache\m_spac_align_asked\endcsname -% \ifx\raggedcommand\relax \ifrelax\raggedcommand \spac_align_add_to_cache \else @@ -594,7 +592,6 @@ \permanent\tolerant\protected\def\setupalign[#1]% immediate {\edef\m_spac_align_asked{#1}% \expandafter\let\expandafter\raggedcommand\csname\??alignmentnormalcache\m_spac_align_asked\endcsname -% \ifx\raggedcommand\relax \ifrelax\raggedcommand \spac_align_add_to_cache \else @@ -604,19 +601,18 @@ \permanent\protected\def\usealignparameter#1% faster local variant {\edef\m_spac_align_asked{#1\c!align}% - \ifx\m_spac_align_asked\empty\else + \ifempty\m_spac_align_asked\else \spac_align_use_indeed \fi} \permanent\protected\def\dousealignparameter#1% faster local variant {\edef\m_spac_align_asked{#1}% - \ifx\m_spac_align_asked\empty\else + \ifempty\m_spac_align_asked\else \spac_align_use_indeed \fi} \def\spac_align_use_indeed {\expandafter\let\expandafter\raggedcommand\csname\??alignmentnormalcache\m_spac_align_asked\endcsname -% \ifx\raggedcommand\relax \ifrelax\raggedcommand \spac_align_add_to_cache \else @@ -630,7 +626,6 @@ {\begingroup \edef\m_spac_align_asked{#1}% \expandafter\let\expandafter\raggedcommand\csname\??alignmentnormalcache\m_spac_align_asked\endcsname -% \ifx\raggedcommand\relax \ifrelax\raggedcommand \spac_align_add_to_cache \fi @@ -897,7 +892,6 @@ % tracing: \def\spac_show_par_data#1% -% {\ifx#1\relax\else {\ifrelax#1\else \hbox{\string#1: \the#1}\endgraf \expandafter\spac_show_par_data diff --git a/tex/context/base/mkxl/strc-flt.mklx b/tex/context/base/mkxl/strc-flt.mklx index 33794d137..500219f56 100644 --- a/tex/context/base/mkxl/strc-flt.mklx +++ b/tex/context/base/mkxl/strc-flt.mklx @@ -292,7 +292,7 @@ \floatcaptionparameter\c!suffixstopper}} \permanent\protected\def\thecurrentfloatnumber - {\ifnofloatcaption \orelse \ifnofloatnumber \orelse \ifx\currentfloatnumber\relax \else + {\ifnofloatcaption \orelse \ifnofloatnumber \orelse \ifrelax\currentfloatnumber \else \namedtaggedlabeltexts \t!floatlabel \currentfloat \t!floatnumber\currentfloat @@ -304,7 +304,7 @@ \fi} \permanent\protected\def\thecurrentfloatcaption - {\ifnofloatcaption \orelse \ifemptyfloatcaption \orelse \ifx\currentfloatnumber\relax \else + {\ifnofloatcaption \orelse \ifemptyfloatcaption \orelse \ifrelax\currentfloatnumber \else \dostarttagged\t!floattext\empty \begstrut \floatcaptionparameter\c!textcommand @@ -522,7 +522,7 @@ %D \def\strc_float_load_data % precedes save ! %D {\global\advance\c_strc_floats_n\plusone %D \xdef\strc_float_realpage{\datasetvariable\s!float{\number\c_strc_floats_n}\s!page}% -%D \ifx\strc_float_realpage\empty +%D \ifempty\strc_float_realpage %D \glet\strc_float_realpage\realpageno % \realfolio %D \fi} %D \stoptyping @@ -572,7 +572,7 @@ \def\strc_floats_set_current_tag#tag% {\edef\currentfloat{#tag}% - \ifx\currentfloat\empty + \ifempty\currentfloat \let\currentfloat\v!figure % a bit of a hack \fi \doifelsecommandhandler\??float\currentfloat @@ -690,7 +690,7 @@ \fi % check \edef\floatlocation{\floatcaptionparameter\c!location}% - \ifx\floatlocation\empty + \ifempty\floatlocation \edef\floatlocation{\floatparameter\c!default}% \fi % inherit diff --git a/tex/context/base/mkxl/strc-num.mkxl b/tex/context/base/mkxl/strc-num.mkxl index 49fd1d3c4..f5adcf09a 100644 --- a/tex/context/base/mkxl/strc-num.mkxl +++ b/tex/context/base/mkxl/strc-num.mkxl @@ -617,7 +617,7 @@ \protected\def\mult_interfaces_counter_association#1#2#3#4#5#6#7% tag current setup parameter list sync register {\strc_counter_preset_using_parameter#3\rootcounterparameter \newtoks#5% - \permanent\protected\def #6{\ifx#2\empty\the#5\else\strc_counter_setup_using_parameter#2#4\fi}% sync + \permanent\protected\def #6{\ifempty#2\the#5\else\strc_counter_setup_using_parameter#2#4\fi}% sync \permanent\protected\def#7##1{\normalexpanded{#5{\the#5\strc_counter_setup_using_parameter{##1}\noexpand#4}}}} % register \permanent\protected\def\installcounterassociation#1% => synchronize#1counters register#1counter @@ -652,7 +652,7 @@ % \newtoks#5% % \protected\def#6% sync % {\strc_counter_setup_push -% \ifx#2\empty +% \ifempty#2% % \the#5% % \else % \let\currentcounter\empty diff --git a/tex/context/base/mkxl/strc-ref.mklx b/tex/context/base/mkxl/strc-ref.mklx index e25cb49f1..45f0ff713 100644 --- a/tex/context/base/mkxl/strc-ref.mklx +++ b/tex/context/base/mkxl/strc-ref.mklx @@ -364,10 +364,6 @@ \permanent\protected\def\hboxreference[#1]{\boxreference[#1]\hbox} \permanent\protected\def\vboxreference[#1]{\boxreference[#1]\vbox} -% \ifx\currentdestinationattribute\empty -% \begingroup\c_attr_destination\currentdestinationattribute\emptyhbox\endgroup % todo -% \fi - \def\defaultreferencepage#text{[[[#text]]]} \def\defaultreferencetext#text{[[[#text]]]} diff --git a/tex/context/base/mkxl/strc-sec.mkxl b/tex/context/base/mkxl/strc-sec.mkxl index e5371d1e9..58f942b5f 100644 --- a/tex/context/base/mkxl/strc-sec.mkxl +++ b/tex/context/base/mkxl/strc-sec.mkxl @@ -798,7 +798,7 @@ \dostarttagged\t!sectionnumber\empty \labeltexts {\headparameter\currentheadlabeltag} - {\ifx\deepstructurenumbercommand\relax + {\ifrelax\deepstructurenumbercommand \structurenumber \else \normalexpanded{\noexpand\deepstructurenumbercommand{\structurenumber}}% @@ -807,7 +807,7 @@ \permanent\protected\def\fullheadtitle {\dostarttagged\t!sectiontitle\empty - \ifx\deepstructuretitlecommand\relax + \ifrelax\deepstructuretitlecommand \structuretitle \else \normalexpanded{\noexpand\deepstructuretitlecommand{\structuretitle}}% diff --git a/tex/context/base/mkxl/supp-box.mkxl b/tex/context/base/mkxl/supp-box.mkxl index f571e504d..721667822 100644 --- a/tex/context/base/mkxl/supp-box.mkxl +++ b/tex/context/base/mkxl/supp-box.mkxl @@ -378,7 +378,7 @@ %D met 0~regels. The raw alternative does not round. See the \MKII\ and \MKIV\ files %D for historic variants. -\ifx\roundingeps\undefined \newdimen\roundingeps \roundingeps=10sp \fi +\ifdefined\roundingeps \else \newdimen\roundingeps \roundingeps=10sp \fi \newcount\noflines \newdimen\noflinesheight @@ -836,7 +836,7 @@ \setbox\newshapebox\box\tmpshapebox \fi} -\ifx\originalshapebox\undefined \let\originalshapebox\oldshapebox \fi +\ifdefined\originalshapebox \else \let\originalshapebox\oldshapebox \fi % We will turn this into a \MKIV\ variant (we can use \type {\vpack} too). @@ -1165,7 +1165,7 @@ \global\setbox\plusone\lastbox \global\setbox\plusone\hbox{\strut\unhbox\plusone}% \hbox % to #2 % \hpack - {\ifx\clip\undefined + {\unless\ifdefined\clip \box\plusone \orelse\ifdim\wd\plusone>\hsize \lower\strutdepth\hpack{\clip[\c!width=\hsize,\c!height=\lineheight]{\hpack{\raise\strutdepth\box\plusone}}}% @@ -2384,7 +2384,7 @@ \protected\def\syst_boxes_push#1#2% {\global\advance\c_syst_boxes_stack\plusone \expandafter\let\expandafter\b_syst_boxes_stack\csname\??boxstack\number\c_syst_boxes_stack\endcsname - \ifx\b_syst_boxes_stack\relax % cheaper then csname check as in most cases it's defined + \ifrelax\b_syst_boxes_stack % cheaper then csname check as in most cases it's defined \syst_boxes_stack_allocate \fi #1\setbox\b_syst_boxes_stack\box#2\relax} @@ -2710,7 +2710,7 @@ \permanent\protected\def\newlocalbox#1% {\expandafter\let\expandafter#1\csname\??localbox\string#1\endcsname - \ifx#1\relax + \ifrelax#1% \syst_aux_new_localbox#1% \fi} diff --git a/tex/context/base/mkxl/syst-aux.mkxl b/tex/context/base/mkxl/syst-aux.mkxl index bb6793ce1..064416275 100644 --- a/tex/context/base/mkxl/syst-aux.mkxl +++ b/tex/context/base/mkxl/syst-aux.mkxl @@ -421,7 +421,7 @@ %D \type {\endcsname} and testing the \type {\name} directly. %D %D \starttyping -%D \expandafter\ifx\csname NameA\endcsname\relax ... \else ... \fi +%D \expandafter\ifrelax\csname NameA\endcsname ... \else ... \fi %D %D \ifundefined\NameB ... \else ... \fi %D \stoptyping @@ -1405,7 +1405,6 @@ \let\m_syst_helpers_process_action\relax \let\m_syst_helpers_process_action_unknown\relax \syst_helpers_raw_process_action#3\ignorearguments\ignorearguments\ignorearguments -% \ifx\m_syst_helpers_process_action\relax \ifrelax\m_syst_helpers_process_action \m_syst_helpers_process_action_unknown \else @@ -2868,7 +2867,6 @@ \resetglobal \permanent\protected\def\doglobal -% {\ifx\redoglobal\relax {\ifrelax\redoglobal \enforced\let\redoglobal\global \enforced\let\dodoglobal\syst_helpers_dodo_global @@ -3012,12 +3010,6 @@ %D Nowadays we don't mind a few more tokens if we can gain a bit of speed. -% \def\syst_helpers_do_increment#1{\dodoglobal\edef#1{\the\numexpr\ifdefined#1\ifx#1\relax\else#1\fi\fi+\plusone \relax}} -% \def\syst_helpers_do_decrement#1{\dodoglobal\edef#1{\the\numexpr\ifdefined#1\ifx#1\relax\else#1\fi\fi+\minusone\relax}} - -% \def\syst_helpers_do_do_do_increment#1,#2){\dodoglobal\edef#1{\the\numexpr\ifdefined#1\ifx#1\relax\else#1\fi\fi+#2\relax}} -% \def\syst_helpers_do_do_do_decrement#1,#2){\dodoglobal\edef#1{\the\numexpr\ifdefined#1\ifx#1\relax\else#1\fi\fi-#2\relax}} - \def\syst_helpers_do_increment#1{\dodoglobal\edef#1{\the\numexpr\ifdefined#1\ifrelax#1\else#1\fi\fi+\plusone \relax}} \def\syst_helpers_do_decrement#1{\dodoglobal\edef#1{\the\numexpr\ifdefined#1\ifrelax#1\else#1\fi\fi+\minusone\relax}} @@ -3529,7 +3521,6 @@ \permanent\protected\def\newevery#1#2% {\ifx#1\everypar\else\newtoks#1\fi% we test for redefinition elsewhere -% \ifx#2\relax\orelse\ifdefined#2\else \ifrelax#2\orelse\ifdefined#2\else \expandafter\newtoks\csname\??extraevery\csstring#1\endcsname \frozen\protected\edef#2{\syst_helpers_every#1\csname\??extraevery\csstring#1\endcsname}% @@ -4356,7 +4347,6 @@ \let \m_syst_helpers_scratch\empty \permanent\protected\def\appendtoks#1\to#2% -% {\ifx\dodoglobal\relax {\ifrelax\dodoglobal \expandafter\toksapp \else @@ -4365,7 +4355,6 @@ \fi#2{#1}} \permanent\protected\def\prependtoks#1\to#2% -% {\ifx\dodoglobal\relax {\ifrelax\dodoglobal \expandafter\tokspre \else @@ -4373,36 +4362,6 @@ \expandafter\gtokspre \fi#2{#1}} -% \def\syst_helpers_append_toks_indeed -% {\ifx\dodoglobal\relax -% \expandafter\toksapp -% \else -% \resetglobal -% \expandafter\gtoksapp -% \fi\m_syst_helpers_scratch\t_syst_helpers_scratch} -% -% \def\syst_helpers_prepend_toks_indeed -% {\ifx\dodoglobal\relax -% \expandafter\tokspre -% \else -% \resetglobal -% \expandafter\gtokspre -% \fi\m_syst_helpers_scratch\t_syst_helpers_scratch} -% -% \protected\def\appendtoksonce#1\to#2% -% {\let\m_syst_helpers_scratch#2% -% \t_syst_helpers_scratch{#1}% -% \ifhasxtoks\t_syst_helpers_scratch\m_syst_helpers_scratch\else -% \syst_helpers_append_toks_indeed -% \fi} -% -% \protected\def\prependtoksonce#1\to#2% -% {\let\m_syst_helpers_scratch#2% -% \t_syst_helpers_scratch{#1}% -% \ifhasxtoks\t_syst_helpers_scratch\m_syst_helpers_scratch\else -% \syst_helpers_prepend_toks_indeed -% \fi} - \permanent\protected\def\appendtoksonce#1\to#2% {\ifhasxtoks{#1}#2\else \appendtoks#1\to#2% @@ -4474,7 +4433,6 @@ %D Also: \permanent\protected\def\appendetoks#1\to#2% -% {\ifx\dodoglobal\relax {\ifrelax\dodoglobal \expandafter\etoksapp \else @@ -4483,7 +4441,6 @@ \fi#2{#1}} \permanent\protected\def\prependetoks#1\to#2% -% {\ifx\dodoglobal\relax {\ifrelax\dodoglobal \expandafter\etokspre \else @@ -5920,18 +5877,12 @@ \permanent\def\lastdigit#1% {\expandafter\thelastdigit\number#1\relax} -% \permanent\def\thelastdigit#1#2% -% {\ifx#2\relax#1\else\expandafter\thelastdigit\expandafter#2\fi} - \permanent\def\thelastdigit#1#2% {\ifrelax#2#1\else\expandafter\thelastdigit\expandafter#2\fi} \permanent\def\lasttwodigits#1% {\expandafter\thelasttwodigits\expandafter0\number#1\relax} -% \permanent\def\thelasttwodigits#1#2#3% 0 dig ... \relax -% {\ifx#3\relax#1#2\else\expandafter\thelasttwodigits\expandafter#2\expandafter#3\fi} - \permanent\def\thelasttwodigits#1#2#3% 0 dig ... \relax {\ifrelax#3#1#2\else\expandafter\thelasttwodigits\expandafter#2\expandafter#3\fi} @@ -6021,7 +5972,6 @@ \permanent\def\filterfromvalue#1#2#3% value max n {\expandafter\doubleexpandafter\csname % we use the fact that an -% \expandafter\ifx\csname#1\endcsname\relax % undefined cs has become \relax \expandafter\ifrelax\csname#1\endcsname % undefined cs has become \relax \csstring\gobbleoneargument % which we then gobble here \else @@ -6221,7 +6171,6 @@ \permanent\def\flag#1{\csname\??flag#1\endcsname} \permanent\def\doifelseflagged#1% -% {\expandafter\ifx\csname\??flag#1\endcsname\relax {\expandafter\ifrelax\csname\??flag#1\endcsname \expandafter\secondoftwoarguments \orelse\ifcase\csname\??flag#1\endcsname @@ -6233,7 +6182,6 @@ \aliased\let\doifflaggedelse\doifelseflagged \permanent\def\doifnotflagged#1% -% {\expandafter\ifx\csname\??flag#1\endcsname\relax {\expandafter\ifrelax\csname\??flag#1\endcsname \expandafter\firstofoneargument \orelse\ifcase\csname\??flag#1\endcsname @@ -6246,7 +6194,6 @@ {\defcsname#1#3\expandafter\endcsname\expandafter{\csname#1#5\endcsname}} \def\syst_helpers_if_non_zero_positive_else#1#2\end % #3#4% -% {\ifx#1\relax {\ifrelax#1% \ifcase\privatescratchcounter \endgroup diff --git a/tex/context/base/mkxl/syst-ini.mkxl b/tex/context/base/mkxl/syst-ini.mkxl index f80b8ac55..0f507d978 100644 --- a/tex/context/base/mkxl/syst-ini.mkxl +++ b/tex/context/base/mkxl/syst-ini.mkxl @@ -148,10 +148,6 @@ function tex.enableprimitives() end % so we kind of protect what's there } -\ifdefined\gletcsname \else \protected\def\gletcsname{\global\letcsname } \fi -\ifdefined\gdefcsname \else \protected\def\gdefcsname{\global\defcsname } \fi -\ifdefined\xdefcsname \else \protected\def\xdefcsname{\global\edefcsname} \fi - \immutable\def\space{ } \immutable\def\empty{} @@ -296,7 +292,6 @@ \protected\def\setconstantvalue#1#2{\csname#1\endcsname\numexpr#2\relax} \protected\def\newconstant#1% -% {\ifx#1\relax {\ifrelax#1% %\writestatus{!!!!!!!!!!}{\string #1 => RELAX}% \unletfrozen#1% @@ -335,16 +330,6 @@ \def\syst_basics_allocate_nop#1#2#3#4#5% last class method max name {\writestatus{warning}{\string#2 \string#5 is already defined (\string\relax\space it first)}} -% \def\syst_basics_allocate#1#2#3#4#5% last class method max name -% {\ifx#5\undefined -% \expandafter\syst_basics_allocate_yes -% \orelse\ifx#5\relax -% \expandafter\syst_basics_allocate_yes -% \else -% \expandafter\syst_basics_allocate_nop -% \fi -% #1#2#3#4#5} - \def\syst_basics_allocate#1#2#3#4#5% last class method max name {\ifrelax#5% \expandafter\syst_basics_allocate_yes @@ -1046,8 +1031,8 @@ %D For those who expect this \unknown -\ifx\fmtname \undefined \immutable\def\fmtname {ConTeXt Initial TeX} \fi -\ifx\fmtversion\undefined \immutable\def\fmtversion{3.1415926} \fi +\ifdefined\fmtname \else \immutable\def\fmtname {ConTeXt Initial TeX} \fi +\ifdefined\fmtversion \else \immutable\def\fmtversion{3.1415926} \fi %D A few bonus macros: diff --git a/tex/context/base/mkxl/tabl-ltb.mkxl b/tex/context/base/mkxl/tabl-ltb.mkxl index f4558d797..7be5c42f4 100644 --- a/tex/context/base/mkxl/tabl-ltb.mkxl +++ b/tex/context/base/mkxl/tabl-ltb.mkxl @@ -563,7 +563,7 @@ \permanent\def\checklinecolumndimension#1#2#3% {\global\edef#1\number#3\endcsname - {\expandafter\ifx\csname#1\number#3\endcsname\relax + {\expandafter\ifrelax\csname#1\number#3\endcsname \the#2\b_tabl_lines_cell \orelse\ifdim\csname#1\number#3\endcsname<#2\b_tabl_lines_cell \the#2\b_tabl_lines_cell @@ -701,7 +701,7 @@ \fi} \permanent\protected\def\tabl_lines_BH - {\ifx\EC\relax + {\ifrelax\EC % signal, grabbing lines \else \t_tabl_lines_head\emptytoks diff --git a/tex/context/base/mkxl/tabl-tbl.mkxl b/tex/context/base/mkxl/tabl-tbl.mkxl index 9b3ec4750..75c47df50 100644 --- a/tex/context/base/mkxl/tabl-tbl.mkxl +++ b/tex/context/base/mkxl/tabl-tbl.mkxl @@ -575,26 +575,11 @@ %D Also, as there is always a key, we no longer do some after assigment or future %D let but just pick up the key. -% \installtabulatepreambleoption \s!unknown % -% {\writestatus{tabulate}{unknown preamble key [\normalmeaning\next]}% -% \tabl_tabulate_set_preamble} -% -% \def\tabl_tabulate_set_preamble -% {\afterassignment\dosettabulatepreamble\let\next=} -% -% \def\dosettabulatepreamble -% {\ifx\next\relax \else -% \csname\??tabulatepreamble -% \ifcsname\??tabulatepreamble\next\endcsname\next\else\s!unknown\fi -% \expandafter\endcsname -% \fi} - \installtabulatepreambleoption\relax {} % finished \def\tabl_tabulate_set_preamble#1% {\ifcsname\??tabulatepreamble\string#1\endcsname - %\expandafter\tabl_tabulate_set_preamble_yes \expandafter\expandafter\expandafter\lastnamedcs\expandafter\gobbleoneargument \else \expandafter\tabl_tabulate_set_preamble_nop diff --git a/tex/context/base/mkxl/tabl-xtb.mklx b/tex/context/base/mkxl/tabl-xtb.mklx index 840d0af04..ae763dd52 100644 --- a/tex/context/base/mkxl/tabl-xtb.mklx +++ b/tex/context/base/mkxl/tabl-xtb.mklx @@ -891,7 +891,7 @@ \global\c_tabl_x_swapped_max\c_tabl_x_swapped \fi \mutable\expandafter\let\expandafter\t_tabl_x_swapped\csname\??xtableswap\number\c_tabl_x_swapped\endcsname - \ifx\t_tabl_x_swapped\relax + \ifrelax\t_tabl_x_swapped \tabl_x_collect_allocate \fi} diff --git a/tex/context/base/mkxl/type-ini.mklx b/tex/context/base/mkxl/type-ini.mklx index 1eae5a747..95587c493 100644 --- a/tex/context/base/mkxl/type-ini.mklx +++ b/tex/context/base/mkxl/type-ini.mklx @@ -225,8 +225,7 @@ \def\font_typescript_process_typescript_file_and_store {\expandafter\let\expandafter\t_font_typescripts\csname\??typescriptfiles\currenttypefile\endcsname -% {\aliased\expandafter\let\expandafter\t_font_typescripts\csname\??typescriptfiles\currenttypefile\endcsname - \ifx\t_font_typescripts\relax + \ifrelax\t_font_typescripts \font_typescript_process_typescript_store_indeed \fi \the\t_font_typescripts} @@ -258,7 +257,6 @@ \permanent\def\truetypescript#name% recursive so no \lastnamedcs {\ifcsname\??typescriptsynonyms#name\endcsname - %\expandafter\truetypescript\csname\??typescriptsynonyms#name\endcsname \expandafter\truetypescript\lastnamedcs \else #name% @@ -312,7 +310,7 @@ \fi} \def\font_typescripts_show_match - {\writestatus\m!fonts{match:\ifx\currenttypefile\relax\space *\fi \m_font_typescripts_match}} + {\writestatus\m!fonts{match:\ifrelax\currenttypefile\space *\fi \m_font_typescripts_match}} \def\font_typescripts_start_process_yes {\ifdone diff --git a/tex/context/base/mkxl/typo-cap.mkxl b/tex/context/base/mkxl/typo-cap.mkxl index 587ab62ef..5a6b73e5e 100644 --- a/tex/context/base/mkxl/typo-cap.mkxl +++ b/tex/context/base/mkxl/typo-cap.mkxl @@ -226,7 +226,7 @@ \aliased\let\font_style_normalword \word \appendtoks - \ifx\currentcapitals\empty + \ifempty\currentcapitals \doifelse{\directcapitalsparameter\c!title}\v!yes {\definealternativestyle[\v!capital ][\font_style_normalsmallcapped][\font_style_normalsmallcapped]% \definealternativestyle[\v!smallcaps][\setsmallcaps][\setsmallcaps]} diff --git a/tex/context/base/mkxl/typo-dir.mkxl b/tex/context/base/mkxl/typo-dir.mkxl index dd87a7299..d875ac88f 100644 --- a/tex/context/base/mkxl/typo-dir.mkxl +++ b/tex/context/base/mkxl/typo-dir.mkxl @@ -66,7 +66,7 @@ :\directionsparameter\c!method :\directionsparameter\c!fences}% \expandafter\let\expandafter\currentbidimode\csname\??directionsbidimode\currentbidistamp\endcsname - \ifx\currentbidimode\relax + \ifrelax\currentbidimode \typo_dir_get_mode \fi \directionsbidimode\currentbidimode\relax diff --git a/tex/context/base/mkxl/typo-krn.mkxl b/tex/context/base/mkxl/typo-krn.mkxl index 5573fc529..b16bdacc4 100644 --- a/tex/context/base/mkxl/typo-krn.mkxl +++ b/tex/context/base/mkxl/typo-krn.mkxl @@ -127,7 +127,7 @@ \setupcurrentcharacterkerning[#1]% \fi \edef\p_width{\characterkerningparameter\c!width}% - \ifx\p_width\empty \else + \ifempty\p_width \else \hbox to \p_width \fi \bgroup diff --git a/tex/context/base/mkxl/typo-rub.mkxl b/tex/context/base/mkxl/typo-rub.mkxl index b7265a9c8..ecae30334 100644 --- a/tex/context/base/mkxl/typo-rub.mkxl +++ b/tex/context/base/mkxl/typo-rub.mkxl @@ -82,7 +82,7 @@ \setvalue{\??rubyplacement\v!right}#1#2% {#1% \edef\p_distance{\rubyparameter\c!distance}% - \ifx\p_distance\empty\orelse\ifx\p_distance\v!none\else\hskip\p_distance\fi + \ifempty\p_distance\orelse\ifx\p_distance\v!none\else\hskip\p_distance\fi \begingroup \userubystyleandcolor\c!style\c!color \rubyparameter\c!left#2\rubyparameter\c!right @@ -94,7 +94,7 @@ \rubyparameter\c!left#2\rubyparameter\c!right \endgroup \edef\p_distance{\rubyparameter\c!distance}% - \ifx\p_distance\empty\orelse\ifx\p_distance\v!none\else\hskip\p_distance\fi + \ifempty\p_distance\orelse\ifx\p_distance\v!none\else\hskip\p_distance\fi #1} \permanent\protected\def\setruby#1#2% diff --git a/tex/context/base/mkxl/typo-scr.mkxl b/tex/context/base/mkxl/typo-scr.mkxl index 36e2997e2..f1e56cbaa 100644 --- a/tex/context/base/mkxl/typo-scr.mkxl +++ b/tex/context/base/mkxl/typo-scr.mkxl @@ -55,7 +55,7 @@ \kern\lowparameter\c!distance\relax \setbox\scratchbox\runninghbox\bgroup \lower\lowparameter\c!down\hbox\bgroup - \ifx\fontsize\empty + \ifempty\fontsize \ifmmode \mr % no color yet \else @@ -81,7 +81,7 @@ \kern\highparameter\c!distance\relax \setbox\scratchbox\runninghbox\bgroup \raise\highparameter\c!up\hbox\bgroup - \ifx\fontsize\empty + \ifempty\fontsize \ifmmode \mr % no color yet \else @@ -166,7 +166,7 @@ {\kern\scratchdimen \setbox\scratchbox\hpack\bgroup #1\lowhighparameter#2\hbox\bgroup - \ifx\fontsize\empty + \ifempty\fontsize \ifmmode \mr % no color yet \else diff --git a/tex/context/interface/mkii/keys-fr.xml b/tex/context/interface/mkii/keys-fr.xml index 4be991a8a..eeca9f5a7 100644 --- a/tex/context/interface/mkii/keys-fr.xml +++ b/tex/context/interface/mkii/keys-fr.xml @@ -780,6 +780,7 @@ <cd:constant name='deepnumbercommand' value='commandeprofondenumero'/> <cd:constant name='deeptextcommand' value='commandeprofondetexte'/> <cd:constant name='default' value='defaut'/> + <cd:constant name='define' value='define'/> <cd:constant name='delay' value='retard'/> <cd:constant name='depth' value='profondeur'/> <cd:constant name='depthcorrection' value='correctionprofondeur'/> @@ -2085,7 +2086,7 @@ <cd:command name='startnarrower' value='débutplusetroit'/> <cd:command name='startopposite' value='débutopposition'/> <cd:command name='startoverlay' value='débutsuperposition'/> - <cd:command name='startoverzicht' value='débutvuedensemble'/> + <cd:command name='startoverview' value='débutvuedensemble'/> <cd:command name='startpacked' value='débutemballage'/> <cd:command name='startpositioning' value='débutpositionnement'/> <cd:command name='startproduct' value='débutproduit'/> @@ -2128,7 +2129,7 @@ <cd:command name='stopnarrower' value='finplusetroit'/> <cd:command name='stopopposite' value='finopposition'/> <cd:command name='stopoverlay' value='finsuperposition'/> - <cd:command name='stopoverzicht' value='finvuedensemble'/> + <cd:command name='stopoverview' value='finvuedensemble'/> <cd:command name='stoppacked' value='finemballage'/> <cd:command name='stoppositioning' value='finpositionnement'/> <cd:command name='stopproduct' value='finproduit'/> diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua index ddedfd3f7..c60bc0ca6 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-11-25 21:39 +-- merge date : 2020-11-26 15:38 do -- begin closure to overcome local limits and interference |