diff options
| -rw-r--r-- | tex/context/base/cont-new.mkiv | 2 | ||||
| -rw-r--r-- | tex/context/base/context-version.pdf | bin | 4085 -> 4093 bytes | |||
| -rw-r--r-- | tex/context/base/context.mkiv | 2 | ||||
| -rw-r--r-- | tex/context/base/publ-dat.lua | 21 | ||||
| -rw-r--r-- | tex/context/base/status-files.pdf | bin | 24797 -> 24775 bytes | |||
| -rw-r--r-- | tex/context/base/status-lua.pdf | bin | 229081 -> 229268 bytes | |||
| -rw-r--r-- | tex/generic/context/luatex/luatex-fonts-merged.lua | 2 |
7 files changed, 17 insertions, 10 deletions
diff --git a/tex/context/base/cont-new.mkiv b/tex/context/base/cont-new.mkiv index 2f5668663..90b114573 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.19 16:44} +\newcontextversion{2014.01.19 17:35} %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 12b8b4672..46c672325 100644 --- a/tex/context/base/context-version.pdf +++ b/tex/context/base/context-version.pdf diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv index 85f99f501..d63bacb07 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.19 16:44} +\edef\contextversion{2014.01.19 17:35} \edef\contextkind {beta} %D For those who want to use this: diff --git a/tex/context/base/publ-dat.lua b/tex/context/base/publ-dat.lua index 049b97ad5..8b59b1dee 100644 --- a/tex/context/base/publ-dat.lua +++ b/tex/context/base/publ-dat.lua @@ -150,12 +150,17 @@ local filter_2 = Cs( -- in tugboat.bib this is not that efficient. However, eventually strings get -- hashed again. -local function do_shortcut(tag,key,value,shortcuts) +-- local function do_shortcut(tag,key,value,dataset) +-- publicationsstats.nofshortcuts = publicationsstats.nofshortcuts + 1 +-- tag = lowercase(tag) +-- if tag == "@string" then +-- dataset.shortcuts[key] = value +-- end +-- end + +local function do_shortcut(key,value,dataset) publicationsstats.nofshortcuts = publicationsstats.nofshortcuts + 1 - tag = lowercase(tag) - if tag == "@string" then - shortcuts[key] = value - end + dataset.shortcuts[key] = value end local function getindex(dataset,luadata,tag) @@ -247,14 +252,16 @@ local somevalue = s_value + d_value + b_value + r_value local value = Cs((somevalue * ((spacing * hash * spacing)/"" * somevalue)^0)) local assignment = spacing * keyword * spacing * equal * spacing * value * spacing -local shortcut = keyword * spacing * left * spacing * (assignment * comma^0)^0 * spacing * right * Carg(1) +----- shortcut = keyword * spacing * left * spacing * (assignment * comma^0)^0 * spacing * right * Carg(1) +local shortcut = P("@") * (P("string") + P("STRING")) * spacing * left * ((assignment * Carg(1))/do_shortcut * comma^0)^0 * spacing * right local definition = keyword * spacing * left * spacing * keyword * comma * Ct((assignment * comma^0)^0) * spacing * right * Carg(1) local comment = keyword * spacing * left * (1-right)^0 * spacing * right local forget = percent^1 * (1-lineending)^0 -- todo \% -local bibtotable = (space + forget + shortcut/do_shortcut + definition/do_definition + comment + 1)^0 +-- local bibtotable = (space + forget + shortcut/do_shortcut + definition/do_definition + comment + 1)^0 +local bibtotable = (space + forget + shortcut + definition/do_definition + comment + 1)^0 -- loadbibdata -> dataset.luadata -- loadtexdata -> dataset.luadata diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf Binary files differindex 6d6b10a19..ea41e0226 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 c54deb19a..f099c4741 100644 --- a/tex/context/base/status-lua.pdf +++ b/tex/context/base/status-lua.pdf diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua index b30adf315..3088ab4be 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/19/14 16:44:51 +-- merge date : 01/19/14 17:35:01 do -- begin closure to overcome local limits and interference |