diff options
Diffstat (limited to 'tex')
| -rw-r--r-- | tex/context/base/mkii/cont-new.mkii | 2 | ||||
| -rw-r--r-- | tex/context/base/mkii/context.mkii | 2 | ||||
| -rw-r--r-- | tex/context/base/mkiv/cldf-ini.lua | 1 | ||||
| -rw-r--r-- | tex/context/base/mkiv/cont-new.mkiv | 2 | ||||
| -rw-r--r-- | tex/context/base/mkiv/context.mkiv | 2 | ||||
| -rw-r--r-- | tex/context/base/mkiv/context.mkxl | 2 | ||||
| -rw-r--r-- | tex/context/base/mkiv/spac-ver.mkxl | 4 | ||||
| -rw-r--r-- | tex/context/base/mkiv/status-files.pdf | bin | 28182 -> 28170 bytes | |||
| -rw-r--r-- | tex/context/base/mkiv/status-lua.pdf | bin | 256181 -> 256175 bytes | |||
| -rw-r--r-- | tex/generic/context/luatex/luatex-fonts-merged.lua | 2 |
10 files changed, 9 insertions, 8 deletions
diff --git a/tex/context/base/mkii/cont-new.mkii b/tex/context/base/mkii/cont-new.mkii index ebd445b4f..c4acaf6fa 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.09.03 12:04} +\newcontextversion{2020.09.03 20:00} %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 283533acd..bcb2cbb96 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.09.03 12:04} +\edef\contextversion{2020.09.03 20:00} %D For those who want to use this: diff --git a/tex/context/base/mkiv/cldf-ini.lua b/tex/context/base/mkiv/cldf-ini.lua index aa713485f..65851ce20 100644 --- a/tex/context/base/mkiv/cldf-ini.lua +++ b/tex/context/base/mkiv/cldf-ini.lua @@ -137,6 +137,7 @@ local trialtypesettingstate = createtoken("trialtypesettingstate").index function context.trialtypesetting() return texgetcount(trialtypesettingstate) ~= 0 +-- return texgetcount("trialtypesettingstate") ~= 0 end local knownfunctions = (lua.getfunctionstable or lua.get_functions_table)(true) diff --git a/tex/context/base/mkiv/cont-new.mkiv b/tex/context/base/mkiv/cont-new.mkiv index f07665668..4b13a7ae1 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.09.03 12:04} +\newcontextversion{2020.09.03 20:00} %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 138ec86ff..044c57579 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.09.03 12:04} +\edef\contextversion{2020.09.03 20:00} %D Kind of special: diff --git a/tex/context/base/mkiv/context.mkxl b/tex/context/base/mkiv/context.mkxl index 385a9ce01..9b4873115 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.09.03 12:04} +\edef\contextversion{2020.09.03 20:00} %D Kind of special: diff --git a/tex/context/base/mkiv/spac-ver.mkxl b/tex/context/base/mkiv/spac-ver.mkxl index 4db32563f..c76c011e1 100644 --- a/tex/context/base/mkiv/spac-ver.mkxl +++ b/tex/context/base/mkiv/spac-ver.mkxl @@ -98,8 +98,8 @@ \edef\normallineheight {\interlinespaceparameter\c!line }% \edef\topskipfactor {\interlinespaceparameter\c!top }% \edef\maxdepthfactor {\interlinespaceparameter\c!bottom }% - \edef\m_spac_vertical_baseline_stretch_factor{\interlinespaceparameter\c!stretch }% - \edef\m_spac_vertical_baseline_shrink_factor {\interlinespaceparameter\c!shrink }% + \edef\m_spac_vertical_baseline_stretch_factor{\interlinespaceparameter\c!stretch}% + \edef\m_spac_vertical_baseline_shrink_factor {\interlinespaceparameter\c!shrink }% % often topskip does more bad than good, so: \ifx\topskipfactor\v!height \let\topskipfactor\strutheightfactor diff --git a/tex/context/base/mkiv/status-files.pdf b/tex/context/base/mkiv/status-files.pdf Binary files differindex 84e97a225..42ba0d960 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 279032b4d..7a83e8183 100644 --- a/tex/context/base/mkiv/status-lua.pdf +++ b/tex/context/base/mkiv/status-lua.pdf diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua index 3541301cb..c5346406e 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-09-03 12:04 +-- merge date : 2020-09-03 20:00 do -- begin closure to overcome local limits and interference |