summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorContext Git Mirror Bot <phg42.2a@gmail.com>2014-11-02 13:15:04 +0100
committerContext Git Mirror Bot <phg42.2a@gmail.com>2014-11-02 13:15:04 +0100
commite64cf645e43641c8e1ebb069b7c8bf86d736b01c (patch)
treec39d73332e689b0f72be562976823b40970b0640
parentc0f7956c718fa1dbeeeb337cd5439164060698d1 (diff)
downloadcontext-e64cf645e43641c8e1ebb069b7c8bf86d736b01c.tar.gz
2014-11-02 12:25:00
-rw-r--r--tex/context/base/cont-new.mkiv2
-rw-r--r--tex/context/base/context-version.pdfbin4383 -> 4386 bytes
-rw-r--r--tex/context/base/context.mkiv2
-rw-r--r--tex/context/base/meta-ini.mkiv2
-rw-r--r--tex/context/base/mlib-pdf.lua8
-rw-r--r--tex/context/base/publ-imp-author.mkvi6
-rw-r--r--tex/context/base/publ-ini.mkiv94
-rw-r--r--tex/context/base/status-files.pdfbin24697 -> 24708 bytes
-rw-r--r--tex/context/base/status-lua.pdfbin333912 -> 333913 bytes
-rw-r--r--tex/generic/context/luatex/luatex-fonts-merged.lua2
10 files changed, 71 insertions, 45 deletions
diff --git a/tex/context/base/cont-new.mkiv b/tex/context/base/cont-new.mkiv
index d44a00ccd..3e925590f 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.10.31 12:47}
+\newcontextversion{2014.11.02 12:23}
%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
index 8575e21a7..a993ae649 100644
--- a/tex/context/base/context-version.pdf
+++ b/tex/context/base/context-version.pdf
Binary files differ
diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv
index 5831b21b4..ac76e4d27 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.10.31 12:47}
+\edef\contextversion{2014.11.02 12:23}
\edef\contextkind {beta}
%D For those who want to use this:
diff --git a/tex/context/base/meta-ini.mkiv b/tex/context/base/meta-ini.mkiv
index dc8ccd7d6..de5def983 100644
--- a/tex/context/base/meta-ini.mkiv
+++ b/tex/context/base/meta-ini.mkiv
@@ -224,7 +224,7 @@
\defineMPinstance[decimalfun][\s!format=metafun,\s!extensions=\v!yes,\s!initializations=\v!yes,\c!method=\s!decimal]
\defineMPinstance[mprun] [\s!format=metafun,\s!extensions=\v!yes,\s!initializations=\v!yes]
\defineMPinstance[metapost] [\s!format=mpost]
-\defineMPinstance[megapost] [\s!format=mpost,\c!method=\s!double]
+\defineMPinstance[megapost] [\s!format=mpost,\c!method=\s!decimal]
\defineMPinstance[nofun] [\s!format=mpost]
\newconditional\c_meta_include_initializations
diff --git a/tex/context/base/mlib-pdf.lua b/tex/context/base/mlib-pdf.lua
index 1699e8fc5..025bfc144 100644
--- a/tex/context/base/mlib-pdf.lua
+++ b/tex/context/base/mlib-pdf.lua
@@ -445,7 +445,7 @@ function metapost.flush(result,flusher,askedfig)
result[#result+1] = evenodd and "W* n" or "W n"
elseif objecttype == "stop_clip" then
result[#result+1] = "Q"
- miterlimit, linecap, linejoin, dashed = -1, -1, -1, false
+ miterlimit, linecap, linejoin, dashed = -1, -1, -1, "" -- was false
elseif objecttype == "text" then
result[#result+1] = "q"
local ot = object.transform -- 3,4,5,6,1,2
@@ -491,9 +491,9 @@ function metapost.flush(result,flusher,askedfig)
local d = f_d(concat(dl.dashes or {}," "),dl.offset)
if d ~= dashed then
dashed = d
- result[#result+1] = dashed
+ result[#result+1] = d
end
- elseif dashed then
+ elseif dashed ~= false then -- was just dashed test
result[#result+1] = "[] 0 d"
dashed = false
end
@@ -559,7 +559,7 @@ function metapost.flush(result,flusher,askedfig)
end
if object.grouped then
-- can be qQ'd so changes can end up in groups
- miterlimit, linecap, linejoin, dashed = -1, -1, -1, false
+ miterlimit, linecap, linejoin, dashed = -1, -1, -1, "" -- was false
end
end
end
diff --git a/tex/context/base/publ-imp-author.mkvi b/tex/context/base/publ-imp-author.mkvi
index dfae44af0..5620d3720 100644
--- a/tex/context/base/publ-imp-author.mkvi
+++ b/tex/context/base/publ-imp-author.mkvi
@@ -144,11 +144,7 @@
\startsetups \s!btx:\s!cite:\s!author:name
\ifcase\currentbtxauthorstate
\fastsetup{\s!btx:\s!cite:\s!author:concat}
- \ifx\currentbtxvons\empty \else
- \currentbtxvons
- \btxcitevariantparameter\c!vonsep
- \fi
- \currentbtxsurnames
+ \fastsetup{\s!btx:\s!list:\s!author:normal}
\fastsetup{\s!btx:\s!cite:\s!author:others}
\else
\fastsetup{\s!btx:\s!list:\s!author:normal}
diff --git a/tex/context/base/publ-ini.mkiv b/tex/context/base/publ-ini.mkiv
index 8114b4a56..f056acf3b 100644
--- a/tex/context/base/publ-ini.mkiv
+++ b/tex/context/base/publ-ini.mkiv
@@ -852,7 +852,8 @@
\ctxcommand{btxauthor("\currentbtxdataset","\currentbtxtag","\currentbtxfield",{
combiner = "#1",
kind = "list",
- % symbol = ".",
+ %symbol = \btxlistvariantparameter\c!initialsterminator,
+ %connector = \btxlistvariantparameter\c!initialssep,
etallimit = \number\btxlistvariantparameter\c!etallimit,
etaldisplay = \number\btxlistvariantparameter\c!etaldisplay,
})}%
@@ -869,7 +870,8 @@
\ctxcommand{btxauthor("\currentbtxdataset","\currentbtxtag","author",{
combiner = "\btxcitevariantparameter\c!authorconversion",
kind = "cite",
- % symbol = ".",
+ %symbol = \btxcitevariantparameter\c!initialsterminator,
+ %connector = \btxcitevariantparameter\c!initialssep,
etallimit = \number\btxcitevariantparameter\c!etallimit,
etaldisplay = \number\btxcitevariantparameter\c!etaldisplay,
})}%
@@ -1348,14 +1350,16 @@
\setupbtxlistvariant
[\c!namesep={, },
- \c!lastnamesep={ \btxlabeltext{\currentbtxalternative:and} },
- \c!finalnamesep={ \btxlabeltext{\currentbtxalternative:and} },
+ \c!lastnamesep={,\nobreakspace\textampersand\space},
+ \c!finalnamesep={,\nobreakspace\textampersand\space},
\c!firstnamesep={ },
% \c!andtext={ \btxlabeltext{\currentbtxalternative:and} },
\c!otherstext={ \btxlabeltext{\currentbtxalternative:others}},
\c!juniorsep={ },
\c!vonsep={ },
- \c!initialsep={ },
+ \c!initialsep={ }, % between initials and lastname
+ %\c!initialssep={ }, % between multiple initials
+ %\c!initialsterminator={.},
\c!surnamesep={, },
\c!surnameinitialsep={, },
\c!surnamefirstnamesep={, },
@@ -1384,9 +1388,9 @@
% \c!setups=btx:cite:initialize,
\c!alternative=num,
% APA 2013 section 6.16 (p. 177)
- \c!pubsep={; }, % {, },
- \c!lastpubsep={; }, % { \btxlabeltext{\currentbtxalternative:and} },
- \c!finalpubsep={; }, % { \btxlabeltext{\currentbtxalternative:and} },
+ \c!pubsep={, },
+ \c!lastpubsep={ \btxlabeltext{\currentbtxalternative:and} },
+ \c!finalpubsep={ \btxlabeltext{\currentbtxalternative:and} },
\c!compress=\v!no,
\c!inbetween={ },
\c!range=\endash,
@@ -1394,31 +1398,36 @@
\c!middle=,
\c!right=]
-% \c!authorconversion=\v!normal
-
\definebtxcitevariant
[author]
- [%c!sorttype=,
- \c!left={(},
- \c!middle={, },
- \c!right={)}]
+ %[c!sorttype=,
\definebtxcitevariant
[authornum]
[author]
- [\c!inbetween={ }]
+ [\c!left={(},
+ %\c!middle={, },
+ \c!right={)}]
\definebtxcitevariant
[authoryear]
[\c!compress=\v!yes,
\c!inbetween={, },
\c!left={(},
- \c!middle={, },
- \c!right={)}]
+ %\c!middle={, },
+ \c!right={)},
+ \c!pubsep={; },
+ \c!lastpubsep={; },
+ \c!finalpubsep={; }]
\definebtxcitevariant
[authoryears]
[authoryear]
+ [\c!left=,
+ \c!inbetween={ (},
+ \c!pubsep={); },
+ \c!lastpubsep={); },
+ \c!finalpubsep={); }]
\definebtxcitevariant
[author:num]
@@ -1445,7 +1454,7 @@
\definebtxcitevariant
[year]
[\c!left={(},
- \c!middle={, }, % is middle used?
+ %\c!middle={, },
\c!pubsep={, },
\c!lastpubsep={, },
\c!finalpubsep={, },
@@ -1453,12 +1462,12 @@
\definebtxcitevariant
[title]
- [\c!middle={, }]
+ %[\c!middle={, }]
\definebtxcitevariant
[tag]
[\c!left={[},
- \c!middle={, },
+ %\c!middle={, },
\c!right={]}]
\definebtxcitevariant
@@ -1468,13 +1477,13 @@
\definebtxcitevariant
[serial]
[\c!left={[},
- \c!middle={, },
+ %\c!middle={, },
\c!right={]}]
\definebtxcitevariant
[page]
[\c!left={[},
- \c!middle={, },
+ %\c!middle={, },
\c!right={]}]
\definebtxcitevariant
@@ -1487,13 +1496,13 @@
\definebtxcitevariant
[short]
[\c!left={[},
- \c!middle={, },
+ %\c!middle={, },
\c!right={]}]
\definebtxcitevariant
[category]
[\c!left={[},
- \c!middle={, },
+ %\c!middle={, },
\c!right={]}]
\definebtxcitevariant
@@ -1503,38 +1512,45 @@
\definebtxcitevariant
[doi]
[\c!left={[},
- \c!middle={, },
+ %\c!middle={, },
\c!right={]}]
\definebtxcitevariant
[url]
[\c!left={[},
- \c!middle={, },
+ %\c!middle={, },
\c!right={]}]
\definebtxcitevariant
[page]
[\c!left=,
- \c!middle={, },
+ %\c!middle={, },
\c!right=]
\definebtxcitevariant
[num]
[\c!compress=\v!yes,
\c!left={[},
- \c!middle={, },
- \c!right={]}]
+ %\c!middle={, },
+ \c!right={]},
+ \c!pubsep={,},
+ \c!lastpubsep={,},
+ \c!finalpubsep={,}]
+
+% These cannot, for some reason, be folded-in above...
\setupbtxcitevariant
[\c!namesep={, },
- \c!lastnamesep={\nobreakspace\textampersand\space},
- \c!finalnamesep={\nobreakspace\textampersand\space},
+ \c!lastnamesep={,\nobreakspace\textampersand\space},
+ \c!finalnamesep={,\nobreakspace\textampersand\space},
\c!firstnamesep={ },
- % \c!andtext={ \btxlabeltext{\currentbtxalternative:and} },
+ %\c!andtext={ \btxlabeltext{\currentbtxalternative:and} },
\c!otherstext={ \btxlabeltext{\currentbtxalternative:others}},
\c!juniorsep={ },
\c!vonsep={ },
\c!initialsep={ },
+ %\c!initialssep={ }, % used?
+ %\c!initialsterminator={.},
\c!surnamesep={, },
\c!surnameinitialsep={, },
\c!surnamefirstnamesep={, },
@@ -1543,6 +1559,20 @@
\c!monthconversion=\v!number,
\c!authorconversion=\v!name]
+% And why these here:
+
+\setupbtxcitevariant
+ [author]
+ [\c!lastnamesep={, \btxlabeltext{\currentbtxalternative:and} },
+ \c!finalnamesep={, \btxlabeltext{\currentbtxalternative:and} },
+ \c!authorconversion=\v!name]
+
+\setupbtxcitevariant
+ [authoryears]
+ [\c!lastnamesep={, \btxlabeltext{\currentbtxalternative:and} },
+ \c!finalnamesep={, \btxlabeltext{\currentbtxalternative:and} },
+ \c!authorconversion=\v!name]
+
% Do we want these in the format? Loading them delayed is somewhat messy.
\loadbtxdefinitionfile[commands]
diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf
index e8db291f4..49b7d784e 100644
--- a/tex/context/base/status-files.pdf
+++ b/tex/context/base/status-files.pdf
Binary files differ
diff --git a/tex/context/base/status-lua.pdf b/tex/context/base/status-lua.pdf
index ba262cf4a..af7effa94 100644
--- a/tex/context/base/status-lua.pdf
+++ b/tex/context/base/status-lua.pdf
Binary files differ
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index 51064940a..b31389ea4 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 : 10/31/14 12:47:47
+-- merge date : 11/02/14 12:23:01
do -- begin closure to overcome local limits and interference