diff options
Diffstat (limited to 'tex')
| -rw-r--r-- | tex/context/base/cont-new.mkii | 2 | ||||
| -rw-r--r-- | tex/context/base/cont-new.mkiv | 2 | ||||
| -rw-r--r-- | tex/context/base/context-version.pdf | bin | 4074 -> 4074 bytes | |||
| -rw-r--r-- | tex/context/base/context-version.png | bin | 105052 -> 105817 bytes | |||
| -rw-r--r-- | tex/context/base/context.mkii | 2 | ||||
| -rw-r--r-- | tex/context/base/context.mkiv | 2 | ||||
| -rw-r--r-- | tex/context/base/core-sys.mkiv | 47 | ||||
| -rw-r--r-- | tex/context/base/mult-sys.mkiv | 16 | ||||
| -rw-r--r-- | tex/context/base/status-files.pdf | bin | 24305 -> 24314 bytes | |||
| -rw-r--r-- | tex/context/base/status-lua.pdf | bin | 178939 -> 178941 bytes | |||
| -rw-r--r-- | tex/generic/context/luatex/luatex-fonts-merged.lua | 2 |
11 files changed, 41 insertions, 32 deletions
diff --git a/tex/context/base/cont-new.mkii b/tex/context/base/cont-new.mkii index de3c84ebe..055b2f5e5 100644 --- a/tex/context/base/cont-new.mkii +++ b/tex/context/base/cont-new.mkii @@ -11,7 +11,7 @@ %C therefore copyrighted by \PRAGMA. See mreadme.pdf for %C details. -\newcontextversion{2012.05.22 14:04} +\newcontextversion{2012.05.22 16:12} %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/cont-new.mkiv b/tex/context/base/cont-new.mkiv index 03c8e9d30..5b49b0f7e 100644 --- a/tex/context/base/cont-new.mkiv +++ b/tex/context/base/cont-new.mkiv @@ -11,7 +11,7 @@ %C therefore copyrighted by \PRAGMA. See mreadme.pdf for %C details. -\newcontextversion{2012.05.22 14:04} +\newcontextversion{2012.05.22 16:12} %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/context-version.pdf b/tex/context/base/context-version.pdf Binary files differindex c58880a55..07c6ef6c1 100644 --- a/tex/context/base/context-version.pdf +++ b/tex/context/base/context-version.pdf diff --git a/tex/context/base/context-version.png b/tex/context/base/context-version.png Binary files differindex 953d7a812..c2460b132 100644 --- a/tex/context/base/context-version.png +++ b/tex/context/base/context-version.png diff --git a/tex/context/base/context.mkii b/tex/context/base/context.mkii index f6acae843..ea32dc048 100644 --- a/tex/context/base/context.mkii +++ b/tex/context/base/context.mkii @@ -20,7 +20,7 @@ %D your styles an modules. \edef\contextformat {\jobname} -\edef\contextversion{2012.05.22 14:04} +\edef\contextversion{2012.05.22 16:12} %D For those who want to use this: diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv index fcfa08152..95f8ae0c9 100644 --- a/tex/context/base/context.mkiv +++ b/tex/context/base/context.mkiv @@ -23,7 +23,7 @@ %D up and the dependencies are more consistent. \edef\contextformat {\jobname} -\edef\contextversion{2012.05.22 14:04} +\edef\contextversion{2012.05.22 16:12} %D For those who want to use this: diff --git a/tex/context/base/core-sys.mkiv b/tex/context/base/core-sys.mkiv index 88e0ebf23..66f2a4380 100644 --- a/tex/context/base/core-sys.mkiv +++ b/tex/context/base/core-sys.mkiv @@ -212,31 +212,38 @@ \dotaghighlight} {\dostoptagged}} +\unexpanded\def\defineexpandable + {\doifnextoptionalelse + {\syst_basics_define_yes\def}% + {\syst_basics_define_nop\def}} + \unexpanded\def\define - {\doifnextoptionalelse\syst_basics_define_yes\syst_basics_define_nop} + {\doifnextoptionalelse + {\syst_basics_define_yes{\unexpanded\def}}% + {\syst_basics_define_nop{\unexpanded\def}}} -\unexpanded\def\syst_basics_define_yes[#1]#2#3% +\unexpanded\def\syst_basics_define_yes#1[#2]#3#4% + {\ifdefined#3% + \showmessage\m!system4{\string#3}% + \fi + \ifcase0#2\relax + #1#3{#4}\or + #1#3##1{#4}\or + #1#3##1##2{#4}\or + #1#3##1##2##3{#4}\or + #1#3##1##2##3##4{#4}\or + #1#3##1##2##3##4##5{#4}\or + #1#3##1##2##3##4##5##6{#4}\or + #1#3##1##2##3##4##5##6##7{#4}\or + #1#3##1##2##3##4##5##6##7##8{#4}\or + #1#3##1##2##3##4##5##6##7##8##9{#4}\else + #1#3{#4}\fi} + +\unexpanded\def\syst_basics_define_nop#1#2#3% {\ifdefined#2% \showmessage\m!system4{\string#2}% \fi - \ifcase0#1\relax - \def#2{#3}\or - \def#2##1{#3}\or - \def#2##1##2{#3}\or - \def#2##1##2##3{#3}\or - \def#2##1##2##3##4{#3}\or - \def#2##1##2##3##4##5{#3}\or - \def#2##1##2##3##4##5##6{#3}\or - \def#2##1##2##3##4##5##6##7{#3}\or - \def#2##1##2##3##4##5##6##7##8{#3}\or - \def#2##1##2##3##4##5##6##7##8##9{#3}\else - \def#2{#3}\fi} - -\unexpanded\def\syst_basics_define_nop#1#2% - {\ifdefined#1% - \showmessage\m!system4{\string#1}% - \fi - \def#1{#2}} + #1#2{#3}} % \startluacode % local contextsprint, ctxcatcodes = context.sprint, tex.ctxcatcodes diff --git a/tex/context/base/mult-sys.mkiv b/tex/context/base/mult-sys.mkiv index 4ec4c2221..cdf73b612 100644 --- a/tex/context/base/mult-sys.mkiv +++ b/tex/context/base/mult-sys.mkiv @@ -94,10 +94,6 @@ \definesystemconstant {Slanted} \definesystemconstant {Unicode} -\definesystemconstant {Serif} -\definesystemconstant {Sans} -\definesystemconstant {Mono} -\definesystemconstant {Math} \definesystemconstant {Handwriting} \definesystemconstant {Calligraphy} \definesystemconstant {Casual} @@ -106,6 +102,13 @@ \definesystemconstant {Support} \definesystemconstant {Type} +\definesystemconstant {Math} +\definesystemconstant {MathBold} + +\definesystemconstant {MathRoman} +\definesystemconstant {MathRomanBold} + +\definesystemconstant {Serif} \definesystemconstant {SerifBold} \definesystemconstant {SerifItalic} \definesystemconstant {SerifBoldItalic} @@ -114,6 +117,7 @@ \definesystemconstant {SerifCaps} % \definesystemconstant {SerifCapsSlanted} +\definesystemconstant {Sans} \definesystemconstant {SansBold} \definesystemconstant {SansItalic} \definesystemconstant {SansBoldItalic} @@ -122,6 +126,7 @@ \definesystemconstant {SansCaps} % \definesystemconstant {SansCapsSlanted} +\definesystemconstant {Mono} \definesystemconstant {MonoBold} \definesystemconstant {MonoItalic} \definesystemconstant {MonoBoldItalic} @@ -133,9 +138,6 @@ \definesystemconstant {DefaultFont} -\definesystemconstant {MathRoman} -\definesystemconstant {MathRomanBold} - \definesystemconstant {Simple} \definesystemconstant {Normal} \definesystemconstant {Caps} diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf Binary files differindex 23e0f7efc..e3fce3daa 100644 --- a/tex/context/base/status-files.pdf +++ b/tex/context/base/status-files.pdf diff --git a/tex/context/base/status-lua.pdf b/tex/context/base/status-lua.pdf Binary files differindex a367374b3..09a6e0843 100644 --- a/tex/context/base/status-lua.pdf +++ b/tex/context/base/status-lua.pdf diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua index 27b45ba71..47863dd99 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 : luatex-fonts-merged.lua -- parent file : luatex-fonts.lua --- merge date : 05/22/12 14:04:45 +-- merge date : 05/22/12 16:12:31 do -- begin closure to overcome local limits and interference |
