diff options
| -rw-r--r-- | scripts/context/lua/mtx-fonts.lua | 2 | ||||
| -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 | 4142 -> 4146 bytes | |||
| -rw-r--r-- | tex/context/base/context-version.png | bin | 105594 -> 106426 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/status-files.pdf | bin | 24491 -> 24500 bytes | |||
| -rw-r--r-- | tex/context/base/status-lua.pdf | bin | 182312 -> 182310 bytes | |||
| -rw-r--r-- | tex/context/base/status-mkiv.tex | 15 | ||||
| -rw-r--r-- | tex/context/base/typo-mar.lua | 9 | ||||
| -rw-r--r-- | tex/generic/context/luatex/luatex-fonts-merged.lua | 2 |
12 files changed, 26 insertions, 10 deletions
diff --git a/scripts/context/lua/mtx-fonts.lua b/scripts/context/lua/mtx-fonts.lua index c5b458c14..8d4280fa0 100644 --- a/scripts/context/lua/mtx-fonts.lua +++ b/scripts/context/lua/mtx-fonts.lua @@ -126,7 +126,7 @@ function fonts.names.simple() end report("saving names in '%s'",name) io.savedata(name,table.serialize(simplified,true)) - local data = io.loaddata(resolvers.findfile("font-dum.lua","tex")) + local data = io.loaddata(resolvers.findfile("luatex-fonts-syn.lua","tex")) or "" local dummy = string.match(data,"fonts%.names%.version%s*=%s*([%d%.]+)") if tonumber(dummy) ~= simpleversion then report("warning: version number %s in 'font-dum' does not match database version number %s",dummy or "?",simpleversion) diff --git a/tex/context/base/cont-new.mkii b/tex/context/base/cont-new.mkii index e46c0fb4c..5586ba640 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.06.22 10:09} +\newcontextversion{2012.06.22 10:43} %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 48f7a3b54..b58eef9da 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.06.22 10:09} +\newcontextversion{2012.06.22 10:43} %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 8358f6e2b..efa0e326b 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 6b2e33714..172155d0c 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 eb3391a6d..a65dee3c6 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.06.22 10:09} +\edef\contextversion{2012.06.22 10:43} %D For those who want to use this: diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv index 63a4cc8ef..9fd6916b1 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.06.22 10:09} +\edef\contextversion{2012.06.22 10:43} %D For those who want to use this: diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf Binary files differindex 68edf2788..fab833cff 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 5f78b3656..4abae318e 100644 --- a/tex/context/base/status-lua.pdf +++ b/tex/context/base/status-lua.pdf diff --git a/tex/context/base/status-mkiv.tex b/tex/context/base/status-mkiv.tex index 7bb262352..47daa95c1 100644 --- a/tex/context/base/status-mkiv.tex +++ b/tex/context/base/status-mkiv.tex @@ -1,4 +1,8 @@ -\setupbodyfont[dejavu,10pt] +\setupbodyfont + [dejavu,9pt] + +\setuppapersize + [A4,landscape] \setuplayout [width=middle, @@ -73,13 +77,17 @@ table.sort(loaded,function(a,b) return a.filename < b.filename end) - context.starttabulate { "|Tr|Tl|Tl|l|p|" } + context.starttabulate { "|Tr|Tl|Tl|l|l|p|p|p|" } context.NC() -- context.bold("order") context.NC() context.bold("file") context.NC() context.bold("mark") context.NC() context.bold("status") + context.NC() context.bold("reference") + context.NC() context.bold("manual") + context.NC() context.bold("wiki") context.NC() context.bold("comment") context.NC() context.NR() + context.HL() for i=1,nofloaded do local module = loaded[i] local status = module.status @@ -92,6 +100,9 @@ else context.NC() context(status) end + context.NC() context(module.reference) + context.NC() context(module.manual) + context.NC() context(module.wiki) context.NC() context(module.comment) context.NC() context.NR() end diff --git a/tex/context/base/typo-mar.lua b/tex/context/base/typo-mar.lua index e3701afd4..8b9a083a5 100644 --- a/tex/context/base/typo-mar.lua +++ b/tex/context/base/typo-mar.lua @@ -246,10 +246,15 @@ end function margins.save(t) setmetatable(t,defaults) - local inline = t.inline + local content = texbox[t.number] local location = t.location local category = t.category + local inline = t.inline local scope = t.scope or v_global + if not content then + report_margindata("ignoring empty margin data: %s",location or "unknown") + return + end local store if inline then store = inlinestore @@ -303,7 +308,7 @@ function margins.save(t) end if t.number then -- better make a new table and make t entry in t - t.box = copy_node_list(texbox[t.number]) + t.box = copy_node_list(content) t.n = nofsaved -- used later (we will clean up this natural mess later) -- nice is to make a special status table mechanism diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua index a46ee2a44..5f9f83e70 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 : 06/22/12 10:09:32 +-- merge date : 06/22/12 10:43:49 do -- begin closure to overcome local limits and interference |
