diff options
Diffstat (limited to 'tex')
| -rw-r--r-- | tex/context/base/anch-pos.mkiv | 2 | ||||
| -rw-r--r-- | tex/context/base/cont-new.mkiv | 2 | ||||
| -rw-r--r-- | tex/context/base/context-version.pdf | bin | 4394 -> 4388 bytes | |||
| -rw-r--r-- | tex/context/base/context.mkiv | 2 | ||||
| -rw-r--r-- | tex/context/base/publ-imp-cite.mkvi | 4 | ||||
| -rw-r--r-- | tex/context/base/publ-ini.lua | 15 | ||||
| -rw-r--r-- | tex/context/base/status-files.pdf | bin | 24658 -> 24657 bytes | |||
| -rw-r--r-- | tex/context/base/status-lua.pdf | bin | 343151 -> 343150 bytes | |||
| -rw-r--r-- | tex/generic/context/luatex/luatex-fonts-merged.lua | 2 |
9 files changed, 14 insertions, 13 deletions
diff --git a/tex/context/base/anch-pos.mkiv b/tex/context/base/anch-pos.mkiv index f91dfb0f9..516f695f8 100644 --- a/tex/context/base/anch-pos.mkiv +++ b/tex/context/base/anch-pos.mkiv @@ -42,6 +42,8 @@ \def\dosetpositionbox #1#2{\ctxcommand{poswhd("#1",\number\wd#2,\number\ht#2,\number\dp#2)}} \def\dosetpositionstrut #1{\ctxcommand{posstrut("#1")}} +\unexpanded\def\doifelsepositionsused{\ctxcommand{doifelsepositionsused()}} + \newbox\b_anch_position \newif \ifpositioning % sort of public diff --git a/tex/context/base/cont-new.mkiv b/tex/context/base/cont-new.mkiv index d38507d34..a866d0895 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{2015.03.09 19:27} +\newcontextversion{2015.03.09 22:02} %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 1907d4063..5d7728e18 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 9e66e2f65..e8f7e49af 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{2015.03.09 19:27} +\edef\contextversion{2015.03.09 22:02} \edef\contextkind {beta} %D For those who want to use this: diff --git a/tex/context/base/publ-imp-cite.mkvi b/tex/context/base/publ-imp-cite.mkvi index 869384969..f743a7212 100644 --- a/tex/context/base/publ-imp-cite.mkvi +++ b/tex/context/base/publ-imp-cite.mkvi @@ -55,9 +55,9 @@ \endgroup \stopsetups -\startsetups btx:cite:empty +\startsetups btx:cite:invalid \btxcitereference - <empty> + <\currentbtxreference> \stopsetups % \startsetups btx:cite:normal diff --git a/tex/context/base/publ-ini.lua b/tex/context/base/publ-ini.lua index 6cde49d7b..bef506141 100644 --- a/tex/context/base/publ-ini.lua +++ b/tex/context/base/publ-ini.lua @@ -600,15 +600,15 @@ local concatstate = publications.concatstate local tobemarked = nil -local function marknocite(dataset,tag,nofcitations) -- or just: ctx_btxdomarkcitation +local function marknocite(dataset,tag,nofcitations,setup) ctx_btxstartcite() ctx_btxsetdataset(dataset) ctx_btxsettag(tag) ctx_btxsetbacklink(nofcitations) if trace_detail then - report("expanding %a cite setup %a","nocite","nocite") + report("expanding cite setup %a",setup) end - ctx_btxcitesetup("nocite") + ctx_btxcitesetup(setup) ctx_btxstopcite() end @@ -626,7 +626,7 @@ local function markcite(dataset,tag,flush) report_cite("mark, dataset: %s, tag: %s, number: %s, state: %s",dataset,tag,nofcitations,"cited") end if flush then - marknocite(dataset,tag,nofcitations) + marknocite(dataset,tag,nofcitations,"nocite") end tobemarked[tag] = nofcitations return nofcitations @@ -649,13 +649,12 @@ function commands.flushmarked() -- keep order local tag = marked_list[i] local tbm = tobemarked[tag] - if tbm == nil or tbm == true then + if tbm == true or not tbm then nofcitations = nofcitations + 1 - marknocite(marked_dataset,tag,nofcitations) + marknocite(marked_dataset,tag,nofcitations,tbm and "nocite" or "invalid") if trace_cite then - report_cite("mark, dataset: %s, tag: %s, number: %s, state: %s",marked_dataset,tag,nofcitations,"unset") + report_cite("mark, dataset: %s, tag: %s, number: %s, state: %s",marked_dataset,tag,nofcitations,tbm and "unset" or "invalid") end - else end end end diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf Binary files differindex a210afdc5..c2e5ee261 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 ab1a38859..317f1e8b5 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 6dba44785..bbd5ac5e0 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 : 03/09/15 19:27:36 +-- merge date : 03/09/15 22:02:23 do -- begin closure to overcome local limits and interference |