diff options
| -rw-r--r-- | tex/context/base/cont-new.mkiv | 2 | ||||
| -rw-r--r-- | tex/context/base/context-version.pdf | bin | 4194 -> 4178 bytes | |||
| -rw-r--r-- | tex/context/base/context.mkiv | 2 | ||||
| -rw-r--r-- | tex/context/base/publ-imp-cite.mkvi | 10 | ||||
| -rw-r--r-- | tex/context/base/publ-ini.lua | 57 | ||||
| -rw-r--r-- | tex/context/base/publ-ini.mkiv | 11 | ||||
| -rw-r--r-- | tex/context/base/status-files.pdf | bin | 24545 -> 24544 bytes | |||
| -rw-r--r-- | tex/context/base/status-lua.pdf | bin | 416995 -> 416994 bytes | |||
| -rw-r--r-- | tex/generic/context/luatex/luatex-fonts-merged.lua | 2 |
9 files changed, 52 insertions, 32 deletions
diff --git a/tex/context/base/cont-new.mkiv b/tex/context/base/cont-new.mkiv index b4f3ab2ab..92da40985 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.04.08 19:49} +\newcontextversion{2015.04.08 21:31} %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 54fcaed76..344f96cf3 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 b0057c819..03653f6fd 100644 --- a/tex/context/base/context.mkiv +++ b/tex/context/base/context.mkiv @@ -39,7 +39,7 @@ %D up and the dependencies are more consistent. \edef\contextformat {\jobname} -\edef\contextversion{2015.04.08 19:49} +\edef\contextversion{2015.04.08 21:31} \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 ca4f2a970..94fa3f528 100644 --- a/tex/context/base/publ-imp-cite.mkvi +++ b/tex/context/base/publ-imp-cite.mkvi @@ -111,6 +111,7 @@ \startsetups btx:cite:normal \texdefinition{\s!btx:\s!cite:concat} + \currentbtxleftttext \ifx\currentbtxfirst\empty \fastsetup{\s!btx:\s!cite:\s!empty} \else @@ -136,10 +137,12 @@ } \fi \fi + \currentbtxrighttext \stopsetups \startsetups btx:cite:range \texdefinition{\s!btx:\s!cite:concat} + \currentbtxleftttext \ifx\currentbtxfirst\empty \fastsetup{\s!btx:\s!cite:\s!empty} \else @@ -155,10 +158,12 @@ \fi } \fi + \currentbtxrighttext \stopsetups \startsetups btx:cite:listelement \texdefinition{\s!btx:\s!cite:concat} + \currentbtxleftttext \ifx\currentbtxfirst\empty \fastsetup{\s!btx:\s!cite:\s!empty} \else @@ -167,10 +172,12 @@ \currentbtxfirst } \fi + \currentbtxrighttext \stopsetups \startsetups btx:cite:author \texdefinition{\s!btx:\s!cite:concat} + \currentbtxlefttext \ifx\currentbtxfirst\empty \fastsetup{\s!btx:\s!cite:\s!empty} \else @@ -191,11 +198,14 @@ \currentbtxthird } \fi + \currentbtxrighttext \stopsetups \startsetups \s!btx:\s!cite:entry \texdefinition{\s!btx:\s!cite:concat} + \currentbtxlefttext \btxhandleciteentry + \currentbtxrighttext \stopsetups % these three are goodies to get something bit are not set up as it makes no diff --git a/tex/context/base/publ-ini.lua b/tex/context/base/publ-ini.lua index 3ddb49eff..7b36852a9 100644 --- a/tex/context/base/publ-ini.lua +++ b/tex/context/base/publ-ini.lua @@ -2299,12 +2299,12 @@ do if before and before ~= "" then before = settings_to_array(before) end if after and after ~= "" then after = settings_to_array(after) end - local oneleft = lefttext and #lefttext == 1 and lefttext [1] - local oneright = righttext and #righttext == 1 and righttext[1] - - if not oneleft or not oneright then - compress = false -- very hard coded, or should we have compreess == auto? - end + -- local oneleft = lefttext and #lefttext == 1 and lefttext [1] + -- local oneright = righttext and #righttext == 1 and righttext[1] + -- + -- if not oneleft or not oneright then + -- compress = false -- very hard coded, or should we have compreess == auto? + -- end local function flush(i,n,entry,last) local tag = entry.tag @@ -2314,26 +2314,31 @@ do ctx_btxsettag(tag) ctx_btxsetcategory(entry.category or "unknown") -- - if oneleft then - if i == 1 then - ctx_btxsetlefttext(oneleft) - end - elseif lefttext then - ctx_btxsetlefttext(lefttext[i] or "") - end - if oneright then - if i == n then - ctx_btxsetrighttext(oneright) - end - elseif righttext then - ctx_btxsetrighttext(righttext[i] or "") - end - if before then - ctx_btxsetbefore(before[i] or (#before == 1 and before[1]) or "") - end - if after then - ctx_btxsetafter(after[i] or (#after == 1 and after[1]) or "") - end + -- if oneleft then + -- if i == 1 then + -- ctx_btxsetlefttext(oneleft) + -- end + -- elseif lefttext then + -- ctx_btxsetlefttext(lefttext[i] or "") + -- end + -- if oneright then + -- if i == n then + -- ctx_btxsetrighttext(oneright) + -- end + -- elseif righttext then + -- ctx_btxsetrighttext(righttext[i] or "") + -- end + -- if before then + -- ctx_btxsetbefore(before[i] or (#before == 1 and before[1]) or "") + -- end + -- if after then + -- ctx_btxsetafter(after[i] or (#after == 1 and after[1]) or "") + -- end + -- + if lefttext then local text = lefttext [i] ; if text and text ~= "" then ctx_btxsetlefttext (text) end end + if righttext then local text = righttext[i] ; if text and text ~= "" then ctx_btxsetrighttext(text) end end + if before then local text = before [i] ; if text and text ~= "" then ctx_btxsetbefore (text) end end + if after then local text = after [i] ; if text and text ~= "" then ctx_btxsetafter (text) end end -- ctx_btxsetbacklink(currentcitation) local bl = listtocite[currentcitation] diff --git a/tex/context/base/publ-ini.mkiv b/tex/context/base/publ-ini.mkiv index 79150c53e..6010df995 100644 --- a/tex/context/base/publ-ini.mkiv +++ b/tex/context/base/publ-ini.mkiv @@ -1382,12 +1382,17 @@ \setfalse\c_btx_cite_reference_injected \to \everybtxciteentry +% \unexpanded\def\btxcitesetup#1% +% {\the\everybtxciteentry +% \everybtxciteentry\emptytoks % tricky maybe not when subcites +% \currentbtxlefttext +% \fastbtxsetup\s!cite{#1}% +% \currentbtxrighttext} % no \btxcitereset as we loose dataset and such + \unexpanded\def\btxcitesetup#1% {\the\everybtxciteentry \everybtxciteentry\emptytoks % tricky maybe not when subcites - \currentbtxlefttext - \fastbtxsetup\s!cite{#1}% - \currentbtxrighttext} % no \btxcitereset as we loose dataset and such + \fastbtxsetup\s!cite{#1}} % no \btxcitereset as we loose dataset and such \appendtoks \btx_check_language diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf Binary files differindex 108f8877d..829e20164 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 84a544541..b0e7c9663 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 e4a24cab7..56687d5db 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 : 04/08/15 19:49:24 +-- merge date : 04/08/15 21:31:36 do -- begin closure to overcome local limits and interference |