diff options
| -rw-r--r-- | tex/context/base/cont-new.mkiv | 2 | ||||
| -rw-r--r-- | tex/context/base/context-version.pdf | bin | 4083 -> 4081 bytes | |||
| -rw-r--r-- | tex/context/base/context.mkiv | 2 | ||||
| -rw-r--r-- | tex/context/base/publ-imp-apa.mkiv | 8 | ||||
| -rw-r--r-- | tex/context/base/publ-ini.lua | 11 | ||||
| -rw-r--r-- | tex/context/base/publ-ini.mkiv | 11 | ||||
| -rw-r--r-- | tex/context/base/status-files.pdf | bin | 24794 -> 24792 bytes | |||
| -rw-r--r-- | tex/context/base/status-lua.pdf | bin | 229099 -> 229047 bytes | |||
| -rw-r--r-- | tex/generic/context/luatex/luatex-fonts-merged.lua | 2 |
9 files changed, 27 insertions, 9 deletions
diff --git a/tex/context/base/cont-new.mkiv b/tex/context/base/cont-new.mkiv index 963fbe1ce..bc6dbb8f5 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.16 22:09} +\newcontextversion{2014.01.16 22:46} %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 90c0f95a0..505c00786 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 01214984f..c03272aca 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.16 22:09} +\edef\contextversion{2014.01.16 22:46} \edef\contextkind {beta} %D For those who want to use this: diff --git a/tex/context/base/publ-imp-apa.mkiv b/tex/context/base/publ-imp-apa.mkiv index 3df33ce63..327daa986 100644 --- a/tex/context/base/publ-imp-apa.mkiv +++ b/tex/context/base/publ-imp-apa.mkiv @@ -163,7 +163,7 @@ \btxdoifelse {editor} { \enablemode[btx:apa:edited-book] \btxflushauthor{editor} - \btxcomma\btxsingularplural{editor}{editors} + \btxcomma\btxsingularplural{editor}{editor}{editors} } { % weird period \btxdoif {crossref} { @@ -181,7 +181,7 @@ \btxdoifelse {editor} { \enablemode[btx:apa:edited-book] \btxflushauthor{editor} - \btxcomma\btxsingularplural{editor}{editors} + \btxcomma\btxsingularplural{editor}{editor}{editors} } { \btxdoif {key} { \btxlbracket\btxsetup{btx:format:key}\btxrbracket @@ -439,9 +439,9 @@ } In\btxspace \btxdoifelse {title} { - \btxdoif {editors} { + \btxdoif {editor} { \btxflush{btx:apa:format:editors} - \btxcomma\btxsingularplural{editor}{editors}\btxcomma + \btxcomma\btxsingularplural{editor}{editor}{editors}\btxcomma } \bgroup\it\btxflush{title}\/\egroup \btxdoif {series} { diff --git a/tex/context/base/publ-ini.lua b/tex/context/base/publ-ini.lua index ceaeab0ee..b0e8d8b2f 100644 --- a/tex/context/base/publ-ini.lua +++ b/tex/context/base/publ-ini.lua @@ -199,6 +199,17 @@ local function getdetail(dataset,tag,name) return d and d[name] end +function commands.btxsingularorplural(dataset,tag,name) -- todo: make field dependent + local d = datasets[dataset].details[tag] + if d then + d = d[name] + end + if d then + d = #d <= 1 + end + commands.doifelse(d) +end + -- basic loading function commands.usebtxdataset(name,filename) diff --git a/tex/context/base/publ-ini.mkiv b/tex/context/base/publ-ini.mkiv index 97a5e05fc..92dffdce3 100644 --- a/tex/context/base/publ-ini.mkiv +++ b/tex/context/base/publ-ini.mkiv @@ -683,18 +683,25 @@ \let\nocitation \btxnocite \let\usepublication\btxnocite -%D Cite: helpers +%D Cite helpers: \unexpanded\def\btxcitevariant#1% {\ctxcommand{btxcitevariant("\currentbtxdataset","\currentbtxblock","\currentbtxtag","#1")}} -%D List: helpers +%D List helpers: \def\currentbtxindex{0} \unexpanded\def\btxlistvariant#1% {\ctxcommand{btxlistvariant("\currentbtxdataset","\currentbtxblock","\currentbtxtag","#1","\currentbtxindex")}} % some can go +%D Whatever helpers: + +\unexpanded\def\btxsingularplural#1% + {\ctxcommand{btxsingularorplural("\currentbtxdataset","\currentbtxtag","#1")}} + +\let\btxsingularorplural\btxsingularplural + %D Loading variants: \appendtoks diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf Binary files differindex c651e22ea..dda297e6b 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 711e41765..535bd87f9 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 ac82338a4..4ab512308 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/16/14 22:09:05 +-- merge date : 01/16/14 22:46:19 do -- begin closure to overcome local limits and interference |