diff options
Diffstat (limited to 'tex')
| -rw-r--r-- | tex/context/base/cont-new.mkiv | 2 | ||||
| -rw-r--r-- | tex/context/base/context-version.pdf | bin | 4427 -> 4433 bytes | |||
| -rw-r--r-- | tex/context/base/context.mkiv | 2 | ||||
| -rw-r--r-- | tex/context/base/publ-ini.lua | 49 | ||||
| -rw-r--r-- | tex/context/base/status-files.pdf | bin | 24982 -> 25007 bytes | |||
| -rw-r--r-- | tex/context/base/status-lua.pdf | bin | 327139 -> 327144 bytes | |||
| -rw-r--r-- | tex/generic/context/luatex/luatex-fonts-merged.lua | 2 |
7 files changed, 16 insertions, 39 deletions
diff --git a/tex/context/base/cont-new.mkiv b/tex/context/base/cont-new.mkiv index deaf90116..7740f8a79 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.09.03 22:05} +\newcontextversion{2014.09.04 18:33} %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 e804806be..a50aec7d1 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 a0a38b843..770d92143 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.09.03 22:05} +\edef\contextversion{2014.09.04 18:33} \edef\contextkind {beta} %D For those who want to use this: diff --git a/tex/context/base/publ-ini.lua b/tex/context/base/publ-ini.lua index fb1c01f97..755c78273 100644 --- a/tex/context/base/publ-ini.lua +++ b/tex/context/base/publ-ini.lua @@ -1652,8 +1652,8 @@ local function processcite(dataset,reference,mark,compress,setup,internal,getter source[i] = data end - local function flush(i,n,entry,tag) - local tag = tag or entry.tag + local function flush(i,n,entry,last) + local tag = entry.tag local currentcitation = markcite(dataset,tag) ctx_btxstartcite() ctx_btxsettag(tag) @@ -1670,7 +1670,7 @@ local function processcite(dataset,reference,mark,compress,setup,internal,getter if language then ctx_btxsetlanguage(language) end - if not setter(entry,entry.last) then + if not setter(entry,last) then ctx_btxsetfirst(f_missing(tag)) end ctx_btxsetconcat(concatstate(i,n)) @@ -1688,7 +1688,7 @@ local function processcite(dataset,reference,mark,compress,setup,internal,getter local entry = target[i] local first = entry.first if first then - flush(i,nofcollected,first,list[1]) -- somewhat messy as we can be sorted so this needs checking! might be wrong + flush(i,nofcollected,first,entry.last) else flush(i,nofcollected,entry) end @@ -1821,7 +1821,6 @@ local function setter(dataset,tag,entry,internal) local entries = entry.entries local text = entries and entries.text or "?" return { - dataset = dataset, tag = tag, internal = internal, num = text, @@ -1835,22 +1834,11 @@ end function citevariants.num(dataset,reference,mark,compress,variant,internal) processcite(dataset,reference,mark,compress,"num",internal,setter,getter) +-- processcite(dataset,reference,mark,false,"num",internal,setter,getter) end -- year --- local function setter(dataset,tag,entry,internal) --- local year = getfield(dataset,tag,"year") --- return { --- dataset = dataset, --- tag = tag, --- internal = internal, --- year = year, --- sortkey = year, --- sortfld = "year", --- } --- end - local function setter(dataset,tag,entry,internal) return { dataset = dataset, @@ -2005,30 +1993,19 @@ local function authorconcat(target,key,setup) ctx_btxsetinternal(bl and bl.references.internal or "") if first then ctx_btxsetfirst(first[key] or f_missing(first.tag)) --- third ? of gewoon getfield? local suffix = entry.suffix local value = entry.last[key] --- if suffix then --- ctx_btxsetsecond(value .. converters.characters(suffix)) --- else --- ctx_btxsetsecond(value) --- end -ctx_btxsetsecond(value) -if suffix then - ctx_btxsetthird(suffix) -end + ctx_btxsetsecond(value) + if suffix then + ctx_btxsetthird(suffix) + end else local suffix = entry.suffix local value = entry[key] or f_missing(tag) --- if suffix then --- ctx_btxsetfirst(value .. converters.characters(suffix)) --- else --- ctx_btxsetfirst(value) --- end -ctx_btxsetfirst(value) -if suffix then - ctx_btxsetthird(suffix) -end + ctx_btxsetfirst(value) + if suffix then + ctx_btxsetthird(suffix) + end end ctx_btxsetconcat(concatstate(i,nofcollected)) ctx_btxcitesetup(setup) diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf Binary files differindex 69f385a5b..48f57559e 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 86c7ece91..91bd797c9 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 9d3fbbdc5..00917b2cd 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 : 09/03/14 22:05:34 +-- merge date : 09/04/14 18:33:25 do -- begin closure to overcome local limits and interference |