diff options
| -rw-r--r-- | tex/context/base/cont-new.tex | 2 | ||||
| -rw-r--r-- | tex/context/base/context.tex | 2 | ||||
| -rw-r--r-- | tex/context/base/core-def.mkiv | 2 | ||||
| -rw-r--r-- | tex/context/base/font-ini.mkiv | 13 | ||||
| -rw-r--r-- | tex/generic/context/luatex-fonts-merged.lua | 2 |
5 files changed, 18 insertions, 3 deletions
diff --git a/tex/context/base/cont-new.tex b/tex/context/base/cont-new.tex index 85610a1f8..612ecf693 100644 --- a/tex/context/base/cont-new.tex +++ b/tex/context/base/cont-new.tex @@ -11,7 +11,7 @@ %C therefore copyrighted by \PRAGMA. See mreadme.pdf for %C details. -\newcontextversion{2010.11.18 19:20} +\newcontextversion{2010.11.18 19:47} %D This file is loaded at runtime, thereby providing an %D excellent place for hacks, patches, extensions and new diff --git a/tex/context/base/context.tex b/tex/context/base/context.tex index 7a6b122bb..9af572909 100644 --- a/tex/context/base/context.tex +++ b/tex/context/base/context.tex @@ -20,7 +20,7 @@ %D your styles an modules. \edef\contextformat {\jobname} -\edef\contextversion{2010.11.18 19:20} +\edef\contextversion{2010.11.18 19:47} %D For those who want to use this: diff --git a/tex/context/base/core-def.mkiv b/tex/context/base/core-def.mkiv index ca672d8a5..02fb19c49 100644 --- a/tex/context/base/core-def.mkiv +++ b/tex/context/base/core-def.mkiv @@ -28,6 +28,7 @@ \ifdefined\firststagepreloadfonts \else \let\firststagepreloadfonts \relax \fi \ifdefined\secondstagepreloadfonts \else \let\secondstagepreloadfonts\relax \fi +\ifdefined\thirdstagepreloadfonts \else \let\thirdstagepreloadfonts \relax \fi \appendtoks \showcontextbanner \to \everyjob \appendtoks \initializenewlinechar \to \everyjob @@ -60,6 +61,7 @@ \prependtoks \lefttoright \to \everybeforeoutput \appendtoks \secondstagepreloadfonts \to \everystarttext +\appendtoks \thirdstagepreloadfonts \to \everystoptext % temporary here: diff --git a/tex/context/base/font-ini.mkiv b/tex/context/base/font-ini.mkiv index 16769ce63..75f59217c 100644 --- a/tex/context/base/font-ini.mkiv +++ b/tex/context/base/font-ini.mkiv @@ -2043,6 +2043,7 @@ \def\resetpreloadfonts {\global\let\firststagepreloadfonts \relax \global\let\secondstagepreloadfonts\relax + \global\let\thirdstagepreloadfonts \relax \resetnullfont} \def\firststagepreloadfonts % see core-def.mkiv @@ -2067,6 +2068,18 @@ \fi \resetpreloadfonts} +\def\thirdstagepreloadfonts % see core-def.mkiv + {\begingroup + %ifzeropt\fontcharwd\font\number`!\relax + \setbox\scratchbox\hbox{context}% + \ifzeropt\wd\scratchbox + \writeline + \writestatus\m!fonts{!! No bodyfont has been defined and no defaults have been}% + \writestatus\m!fonts{!! loaded (maybe due to a missing \string\starttext).}% + \writeline + \fi + \endgroup} + % maybe add this to \everystarttext % % \ifconditional\fontsareloaded\else diff --git a/tex/generic/context/luatex-fonts-merged.lua b/tex/generic/context/luatex-fonts-merged.lua index dc682dc78..a7056a39d 100644 --- a/tex/generic/context/luatex-fonts-merged.lua +++ b/tex/generic/context/luatex-fonts-merged.lua @@ -1,6 +1,6 @@ -- merged file : luatex-fonts-merged.lua -- parent file : luatex-fonts.lua --- merge date : 11/18/10 19:20:30 +-- merge date : 11/18/10 19:47:18 do -- begin closure to overcome local limits and interference |