diff options
| author | Context Git Mirror Bot <phg42.2a@gmail.com> | 2016-03-26 13:38:18 +0100 |
|---|---|---|
| committer | Context Git Mirror Bot <phg42.2a@gmail.com> | 2016-03-26 13:38:18 +0100 |
| commit | 788487819ccf38a8478cc2afd88e0c0b088d0ec1 (patch) | |
| tree | 215addbe3b9e293c2958227e7fc8923880b2e71f /tex/context/base/mkiv/core-con.mkiv | |
| parent | adfe72d5a0c9d7bdc1bd7bc8faabb4d05e21d70a (diff) | |
| download | context-788487819ccf38a8478cc2afd88e0c0b088d0ec1.tar.gz | |
2016-03-26 13:07:00
Diffstat (limited to 'tex/context/base/mkiv/core-con.mkiv')
| -rw-r--r-- | tex/context/base/mkiv/core-con.mkiv | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tex/context/base/mkiv/core-con.mkiv b/tex/context/base/mkiv/core-con.mkiv index b440672bb..1f6dc54d5 100644 --- a/tex/context/base/mkiv/core-con.mkiv +++ b/tex/context/base/mkiv/core-con.mkiv @@ -296,7 +296,7 @@ %D %D The number of days is available in the macro \type {\numberofdays}. -\def\doifelseleapyear#1% +\def\doifelseleapyear#1% expandable check {\clf_doifelseleapyear\numexpr#1\relax} \let\doifleapyearelse\doifelseleapyear @@ -571,7 +571,7 @@ % if we have definitions that are not matched at the lua end .. eventually we might do % that when more shows up -\def\doifelseconversiondefined#1% +\def\doifelseconversiondefined#1% expandable {\ifcsname\??conversion\currentlanguage#1\endcsname \expandafter\firstoftwoarguments \else\ifcsname\??conversion#1\endcsname @@ -580,11 +580,11 @@ \doubleexpandafter\secondoftwoarguments \fi\fi} -\def\doifelseconversionnumber#1#2% - {\ifcsname\??conversion#1#2\endcsname - \expandafter\firstoftwoarguments - \else +\def\doifelseconversionnumber#1#2% expandable + {\ifnum#2>\numexpr\clf_nofconversions{#1}\relax \expandafter\secondoftwoarguments + \else + \expandafter\firstoftwoarguments \fi} \let\doifconversiondefinedelse\doifelseconversiondefined |