From 289b6ec6fcbd5b4dbec69b5c5c9f2d597b8df8c6 Mon Sep 17 00:00:00 2001
From: Context Git Mirror Bot <phg42.2a@gmail.com>
Date: Wed, 22 Oct 2014 16:15:04 +0200
Subject: 2014-10-22 16:05:00
---
tex/context/base/cont-new.mkiv | 2 +-
tex/context/base/context-version.pdf | Bin 4394 -> 4382 bytes
tex/context/base/context.mkiv | 2 +-
tex/context/base/publ-ini.lua | 14 +++++++++++---
tex/context/base/publ-ini.mkiv | 6 ++++--
tex/context/base/status-files.pdf | Bin 24724 -> 24727 bytes
tex/context/base/status-lua.pdf | Bin 333416 -> 333413 bytes
tex/generic/context/luatex/luatex-fonts-merged.lua | 2 +-
8 files changed, 18 insertions(+), 8 deletions(-)
(limited to 'tex')
diff --git a/tex/context/base/cont-new.mkiv b/tex/context/base/cont-new.mkiv
index d6088c3e9..4e38c9757 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.22 13:59}
+\newcontextversion{2014.10.22 16:03}
%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 63e011c3a..497b1fcb8 100644
Binary files a/tex/context/base/context-version.pdf and b/tex/context/base/context-version.pdf differ
diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv
index b98e3b123..c751ce462 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.22 13:59}
+\edef\contextversion{2014.10.22 16:03}
\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 2f6bb5dca..a057c48fa 100644
--- a/tex/context/base/publ-ini.lua
+++ b/tex/context/base/publ-ini.lua
@@ -717,15 +717,23 @@ function publications.enhance(dataset) -- for the moment split runs (maybe publi
report("internal error, no detail for tag %s",tag)
end
--
- local pages = entry.pages
+ local pages = entry.pages or entry.page
if pages then
local first, last = lpegmatch(pagessplitter,pages)
- details[tag].pages = first and last and { first, last } or pages
+ detail.pages = first and last and { first, last } or pages
end
--
local keyword = entry.keyword
if keyword then
- details[tag].keyword = settings_to_set(keyword)
+ detail.keyword = settings_to_set(keyword)
+ end
+ --
+ if category == "inbook" then
+ detail.maintitle = entry.chapter or entry.title
+ elseif category == "incollection" then
+ detail.maintitle = entry.title or entry.booktitle
+ else
+ detail.maintitle = entry.title or entry.chapter or entry.booktitle
end
else
report("internal error, no tag at index %s",i)
diff --git a/tex/context/base/publ-ini.mkiv b/tex/context/base/publ-ini.mkiv
index c4137ea6b..01b0b9653 100644
--- a/tex/context/base/publ-ini.mkiv
+++ b/tex/context/base/publ-ini.mkiv
@@ -1242,9 +1242,11 @@
\edef\currentbtxtag {#2}%
\edef\currentbtxfield {#3}%
\let\currentbtxlistvariant\currentbtxfield
+ \edef\currentbtxcitevariant{invertedshort}%
\ctxcommand{btxauthor("\currentbtxdataset","\currentbtxtag","\currentbtxfield",{
- kind = "list",
- index = \number#4,
+ kind = "list",
+ index = \number#4,
+ combiner = "\currentbtxcitevariant",
})}%
\endgroup}
diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf
index ba3367114..b0a25a492 100644
Binary files a/tex/context/base/status-files.pdf and b/tex/context/base/status-files.pdf differ
diff --git a/tex/context/base/status-lua.pdf b/tex/context/base/status-lua.pdf
index fc5109686..4670bcc59 100644
Binary files a/tex/context/base/status-lua.pdf and b/tex/context/base/status-lua.pdf differ
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index 8e4d17de1..542c91ec5 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/22/14 13:59:38
+-- merge date : 10/22/14 16:03:21
do -- begin closure to overcome local limits and interference
--
cgit v1.2.3