From e1391d4e5204dd3f121abf16e1eb8125696b57e2 Mon Sep 17 00:00:00 2001 From: Marius Date: Tue, 21 Jan 2014 12:00:15 +0200 Subject: beta 2014.01.21 10:58 --- tex/context/base/cont-new.mkiv | 2 +- tex/context/base/context-version.pdf | Bin 4084 -> 4081 bytes tex/context/base/context.mkiv | 2 +- tex/context/base/publ-tra.lua | 18 ++-- tex/context/base/s-inf-03.mkiv | 4 +- tex/context/base/status-files.pdf | Bin 24767 -> 24816 bytes tex/context/base/status-lua.pdf | Bin 231610 -> 233039 bytes tex/context/base/status-mkiv.lua | 98 ++++++++++++++++++++- tex/generic/context/luatex/luatex-fonts-merged.lua | 2 +- 9 files changed, 109 insertions(+), 17 deletions(-) (limited to 'tex') diff --git a/tex/context/base/cont-new.mkiv b/tex/context/base/cont-new.mkiv index af9510e6e..622050993 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{2014.01.21 10:11} +\newcontextversion{2014.01.21 10:58} %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 index 0c821deda..f473d88cb 100644 Binary files a/tex/context/base/context-version.pdf and b/tex/context/base/context-version.pdf differ diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv index f62721b67..aea4994d3 100644 --- a/tex/context/base/context.mkiv +++ b/tex/context/base/context.mkiv @@ -28,7 +28,7 @@ %D up and the dependencies are more consistent. \edef\contextformat {\jobname} -\edef\contextversion{2014.01.21 10:11} +\edef\contextversion{2014.01.21 10:58} \edef\contextkind {beta} %D For those who want to use this: diff --git a/tex/context/base/publ-tra.lua b/tex/context/base/publ-tra.lua index 98c81d800..0b9c0525c 100644 --- a/tex/context/base/publ-tra.lua +++ b/tex/context/base/publ-tra.lua @@ -7,6 +7,8 @@ if not modules then modules = { } end modules ['publ-tra'] = { } local sortedhash = table.sortedhash +local sorted = table.sorted +local allocate = utilities.storage.allocate local tracers = { } publications.tracers = tracers @@ -17,7 +19,7 @@ local NC, NR = context.NC, context.NR local bold = context.bold local darkgreen, darkred, darkblue = context.darkgreen, context.darkred, context.darkblue -local fields = table.sorted { +local fields = allocate ( table.sorted { "abstract", "address", "annotate", @@ -64,9 +66,9 @@ local fields = table.sorted { "monthfiled", "yearfiled", "revision", -} +} ) -local citevariants = table.sorted { +local citevariants = allocate ( table.sorted { "author", "authoryear", "authoryears", @@ -81,13 +83,13 @@ local citevariants = table.sorted { "page", "none", "num", -} +} ) -local listvariants = table.sorted { +local listvariants = allocate ( table.sorted { "author", "editor", "artauthor", -} +} ) -- local categories = table.sorted { -- "article", @@ -106,7 +108,7 @@ local listvariants = table.sorted { -- "unpublished", -- } -local categories = { +local categories = allocate { article = { required = { "author", "title", "journal", "year" }, optional = { "volume", "number", "pages", "month", "note" }, @@ -232,7 +234,7 @@ function tracers.showdatasetcompleteness(dataset) local luadata = datasets[dataset].luadata if next(luadata) then - for tag, entry in table.sortedhash(luadata) do + for tag, entry in sortedhash(luadata) do local category = entry.category local fields = categories[category] if fields then diff --git a/tex/context/base/s-inf-03.mkiv b/tex/context/base/s-inf-03.mkiv index 822173d00..b6dada55a 100644 --- a/tex/context/base/s-inf-03.mkiv +++ b/tex/context/base/s-inf-03.mkiv @@ -16,7 +16,7 @@ \definefont [TitlePageFont] - [MonoBold at 16pt] + [MonoBold at 15pt] \setupbodyfont [tt,8pt] @@ -25,7 +25,7 @@ \definefont [TitlePageFont] - [MonoBold at 20pt] + [MonoBold at 18pt] \setupbodyfont [tt] diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf index 81d0a7287..b44d09fb0 100644 Binary files a/tex/context/base/status-files.pdf and b/tex/context/base/status-files.pdf differ diff --git a/tex/context/base/status-lua.pdf b/tex/context/base/status-lua.pdf index 6e0222616..4afc9b492 100644 Binary files a/tex/context/base/status-lua.pdf and b/tex/context/base/status-lua.pdf differ diff --git a/tex/context/base/status-mkiv.lua b/tex/context/base/status-mkiv.lua index caa7dc16c..339bc24f6 100644 --- a/tex/context/base/status-mkiv.lua +++ b/tex/context/base/status-mkiv.lua @@ -2014,13 +2014,13 @@ return { { category = "mkiv", filename = "bibl-bib", - loading = "always", + loading = "on demand", status = "pending", }, { category = "mkiv", filename = "bibl-tra", - loading = "always", + loading = "on demand", status = "pending", }, { @@ -2534,6 +2534,60 @@ return { loading = "on demand", status = "okay", }, + { + category = "mkiv", + filename = "publ-ini", + loading = "always", + status = "pending", + }, + { + category = "mkiv", + filename = "publ-old", + loading = "always", + status = "pending", + }, + { + category = "mkiv", + filename = "publ-tra", + loading = "always", + status = "pending", + }, + { + category = "mkiv", + filename = "publ-usr", + loading = "always", + status = "pending", + }, + { + category = "mkiv", + filename = "publ-xml", + loading = "always", + status = "pending", + }, + { + category = "mkiv", + filename = "publ-imp-apa", + loading = "always", + status = "pending", + }, + { + category = "mkiv", + filename = "publ-imp-cite", + loading = "always", + status = "pending", + }, + { + category = "mkiv", + filename = "publ-imp-definitions", + loading = "always", + status = "pending", + }, + { + category = "mkiv", + filename = "publ-imp-commands", + loading = "always", + status = "pending", + }, }, lua = { { @@ -2606,12 +2660,12 @@ return { { category = "lua", filename = "bibl-bib", - status = "todo", + loading = "on demand", }, { category = "lua", filename = "bibl-tra", - status = "todo", + loading = "on demand", }, { category = "lua", @@ -4997,6 +5051,42 @@ return { filename = "x-mathml", status = "todo", }, + { + category = "lua", + filename = "publ-ini", + loading = "publ-ini.mkiv", + status = "pending", + }, + { + category = "lua", + filename = "publ-aut", + loading = "publ-ini.mkiv", + status = "pending", + }, + { + category = "lua", + filename = "publ-dat", + loading = "publ-ini.mkiv", + status = "pending", + }, + { + category = "lua", + filename = "publ-oth", + loading = "publ-ini.mkiv", + status = "pending", + }, + { + category = "lua", + filename = "publ-tra", + loading = "publ-ini.mkiv", + status = "pending", + }, + { + category = "lua", + filename = "publ-usr", + loading = "publ-ini.mkiv", + status = "pending", + }, }, metafun = { { diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua index 7cb5503a7..caeccce65 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 : 01/21/14 10:11:08 +-- merge date : 01/21/14 10:58:12 do -- begin closure to overcome local limits and interference -- cgit v1.2.3