diff options
| -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 | 4145 -> 4145 bytes | |||
| -rw-r--r-- | tex/context/base/context-version.png | bin | 106432 -> 105409 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/page-lin.mkiv | 4 | ||||
| -rw-r--r-- | tex/context/base/status-files.pdf | bin | 24591 -> 24601 bytes | |||
| -rw-r--r-- | tex/context/base/status-lua.pdf | bin | 196231 -> 196231 bytes | |||
| -rw-r--r-- | tex/context/base/strc-doc.lua | 12 | ||||
| -rw-r--r-- | tex/generic/context/luatex/luatex-fonts-merged.lua | 2 |
11 files changed, 12 insertions, 14 deletions
diff --git a/tex/context/base/cont-new.mkii b/tex/context/base/cont-new.mkii index 484cf93c1..a1ee3872a 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.10.30 11:35} +\newcontextversion{2012.10.30 18:06} %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 fa996ed90..dc8c7ed54 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.10.30 11:35} +\newcontextversion{2012.10.30 18:06} %D This file is loaded at runtime, thereby providing an excellent place for %D hacks, patches, extensions and new features. diff --git a/tex/context/base/context-version.pdf b/tex/context/base/context-version.pdf Binary files differindex 705151609..ef095f4ba 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 9588daaeb..47f59bfe8 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 ab7d00604..a53292787 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.10.30 11:35} +\edef\contextversion{2012.10.30 18:06} %D For those who want to use this: diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv index 136d7a8c6..bf5fb6d59 100644 --- a/tex/context/base/context.mkiv +++ b/tex/context/base/context.mkiv @@ -25,7 +25,7 @@ %D up and the dependencies are more consistent. \edef\contextformat {\jobname} -\edef\contextversion{2012.10.30 11:35} +\edef\contextversion{2012.10.30 18:06} %D For those who want to use this: diff --git a/tex/context/base/page-lin.mkiv b/tex/context/base/page-lin.mkiv index f20e08c98..0f8b78398 100644 --- a/tex/context/base/page-lin.mkiv +++ b/tex/context/base/page-lin.mkiv @@ -223,7 +223,7 @@ {\let\currentlinenumbering\m_argument}}% \fi \edef\p_continue{\linenumberingparameter\c!continue}% - \ifx\p_continue\v!continue + \ifx\p_continue\v!yes \c_page_lines_mode\zerocount \fi \fi @@ -243,7 +243,7 @@ {\letlinenumberingparameter\c!start\m_argument}}% \fi \edef\p_continue{\linenumberingparameter\c!continue}% - \ifx\p_continue\v!continue + \ifx\p_continue\v!yes \c_page_lines_mode\zerocount \fi \fi diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf Binary files differindex 477acff92..cdb9b4f43 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 f6fbe46b8..da43a6540 100644 --- a/tex/context/base/status-lua.pdf +++ b/tex/context/base/status-lua.pdf diff --git a/tex/context/base/strc-doc.lua b/tex/context/base/strc-doc.lua index 49a79826f..7275534b7 100644 --- a/tex/context/base/strc-doc.lua +++ b/tex/context/base/strc-doc.lua @@ -148,7 +148,7 @@ function sections.save(sectiondata) end function sections.load() - setmetatable(collected,nil) + setmetatableindex(collected,nil) local lists = lists.collected for i=1,#lists do local list = lists[i] @@ -163,12 +163,10 @@ function sections.load() sections.load = functions.dummy end -table.setmetatableindex(collected, { - __index = function(t,i) - sections.load() - return collected[i] or { } - end -}) +table.setmetatableindex(collected, function(t,i) + sections.load() + return collected[i] or { } +end) -- diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua index 6fd66863c..71e094e76 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 : 10/30/12 11:35:26 +-- merge date : 10/30/12 18:06:37 do -- begin closure to overcome local limits and interference |
