summaryrefslogtreecommitdiff
path: root/tex
diff options
context:
space:
mode:
Diffstat (limited to 'tex')
-rw-r--r--tex/context/base/back-exp.lua6
-rw-r--r--tex/context/base/cont-new.mkiv2
-rw-r--r--tex/context/base/context-version.pdfbin4384 -> 4378 bytes
-rw-r--r--tex/context/base/context.mkiv2
-rw-r--r--tex/context/base/export-example.css4
-rw-r--r--tex/context/base/math-ali.mkiv30
-rw-r--r--tex/context/base/publ-dat.lua6
-rw-r--r--tex/context/base/publ-imp-apa.mkvi19
-rw-r--r--tex/context/base/publ-ini.lua12
-rw-r--r--tex/context/base/sort-ini.lua30
-rw-r--r--tex/context/base/status-files.pdfbin24726 -> 24710 bytes
-rw-r--r--tex/context/base/status-lua.pdfbin333868 -> 333933 bytes
-rw-r--r--tex/context/base/strc-reg.lua2
-rw-r--r--tex/context/base/strc-tag.lua3
-rw-r--r--tex/context/base/strc-tag.mkiv1
-rw-r--r--tex/generic/context/luatex/luatex-fonts-merged.lua2
16 files changed, 80 insertions, 39 deletions
diff --git a/tex/context/base/back-exp.lua b/tex/context/base/back-exp.lua
index e1e17628e..bff673f16 100644
--- a/tex/context/base/back-exp.lua
+++ b/tex/context/base/back-exp.lua
@@ -67,6 +67,7 @@ local attributes = attributes
local variables = interfaces.variables
local v_yes = variables.yes
+local v_no = variables.no
local v_normal = variables.normal
local v_flushright = variables.flushright
local v_middle = variables.middle
@@ -3340,7 +3341,10 @@ local htmltemplate = [[
function commands.setupexport(t)
table.merge(finetuning,t)
keephyphens = finetuning.hyphen == v_yes
- exportproperties = finetuning.properties == v_no and false or finetuning.properties
+ exportproperties = finetuning.properties
+ if exportproperties == v_no then
+ exportproperties = false
+ end
end
local function startexport(v)
diff --git a/tex/context/base/cont-new.mkiv b/tex/context/base/cont-new.mkiv
index c5f6df4c4..afbd1292a 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.16 11:53}
+\newcontextversion{2014.10.16 17:26}
%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 e58cbbe87..edd049408 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 260027119..3b9dc48c5 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.16 11:53}
+\edef\contextversion{2014.10.16 17:26}
\edef\contextkind {beta}
%D For those who want to use this:
diff --git a/tex/context/base/export-example.css b/tex/context/base/export-example.css
index fb48e9426..36c308c17 100644
--- a/tex/context/base/export-example.css
+++ b/tex/context/base/export-example.css
@@ -21,6 +21,10 @@ ignore, div.ignore {
display : none ;
}
+ignore, div.private {
+ display : none ;
+}
+
xmetadata, div.xmetadata {
display : none ;
}
diff --git a/tex/context/base/math-ali.mkiv b/tex/context/base/math-ali.mkiv
index 6db88cf21..bba55ba72 100644
--- a/tex/context/base/math-ali.mkiv
+++ b/tex/context/base/math-ali.mkiv
@@ -31,6 +31,8 @@
\newtoks\c_math_align_b
\newtoks\c_math_align_c
+\def\displayopenupvalue{.25\bodyfontsize}
+
\def\math_build_eqalign
{\scratchtoks\emptytoks
\dorecurse{\mathalignmentparameter\c!m}\math_build_eqalign_step
@@ -38,19 +40,25 @@
\def\math_build_eqalign_step
{\ifnum\recurselevel>\plusone
- %\appendtoks
- % \tabskip\mathalignmentparameter\c!distance\aligntab\tabskip\zeropoint
- %\to\scratchtoks
\scratchtoks\expandafter{\the\scratchtoks\tabskip\mathalignmentparameter\c!distance\aligntab\tabskip\zeropoint}%
\fi
\normalexpanded{\scratchtoks{\the\scratchtoks\the\c_math_align_a}}%
\dorecurse{\numexpr\mathalignmentparameter\c!n-\plusone\relax}
{\normalexpanded{\scratchtoks{\the\scratchtoks\the\c_math_align_b}}}}
-\def\math_math_in_eqalign#1{$\tabskip\zeropoint\everycr\emptytoks\displaystyle{{}#1{}}$}
-\def\math_text_in_eqalign#1{$\tabskip\zeropoint\everycr\emptytoks#1$}
+\def\math_math_in_eqalign#1%
+ {\startforceddisplaymath
+ \tabskip\zeropoint
+ \everycr\emptytoks
+ {{}#1{}}%
+ \stopforceddisplaymath}
-\def\displayopenupvalue{.25\bodyfontsize}
+\def\math_text_in_eqalign#1%
+ {\startimath
+ \tabskip\zeropoint
+ \everycr\emptytoks
+ #1%
+ \stopimath}
\def\eqalign#1% why no halign here, probably because of displaywidth
{\emptyhbox
@@ -58,7 +66,15 @@
\vcenter
{\math_openup\displayopenupvalue % was: \openup\jot
\mathsurround\zeropoint
- \ialign{\strut\hfil$\displaystyle{\alignmark\alignmark}$\aligntab$\displaystyle{{}\alignmark\alignmark{}}$\hfil\crcr#1\crcr}}%
+ \ialign{%
+ \strut
+ \hfil
+ \startforceddisplaymath{\alignmark\alignmark}\stopforceddisplaymath
+ \aligntab
+ \startforceddisplaymath{{}\alignmark\alignmark{}}\stopforceddisplaymath
+ \hfil\crcr
+ #1\crcr}%
+ }%
\mskip\thinmuskip}
% preamble is scanned for tabskips so we need the span to prevent an error message
diff --git a/tex/context/base/publ-dat.lua b/tex/context/base/publ-dat.lua
index 357b381c6..ce2f56123 100644
--- a/tex/context/base/publ-dat.lua
+++ b/tex/context/base/publ-dat.lua
@@ -174,10 +174,10 @@ function publications.new(name)
end
function publications.markasupdated(name)
- if name == "string" then
- datasets[name].details = nil
+ if type(name) == "string" then
+ rawset(datasets[name],"details",nil)
else
- datasets.details = nil
+ rawset(name,"details",nil)
end
end
diff --git a/tex/context/base/publ-imp-apa.mkvi b/tex/context/base/publ-imp-apa.mkvi
index c8841444f..047e7c49b 100644
--- a/tex/context/base/publ-imp-apa.mkvi
+++ b/tex/context/base/publ-imp-apa.mkvi
@@ -128,25 +128,30 @@
[apa:mastersthesis={Masterarbeit},
apa:phdthesis={Dissertation},
apa:technicalreport={Technischer Bericht},
+ apa:supplement={Beilage}, % Supplement
apa:patent=Patent,
- apa:editor=Herausgeber,
+ apa:Translator={Übersetzer}, % Übers.
+ apa:editor=Herausgeber, % Hrsg./Hg.
apa:editors=Herausgeber,
- apa:edition=Auflage,
- apa:volume=Band,
+ apa:edition=Auf\/lage,
+ apa:volume=Band, % Bd.
apa:Volume=Band,
- apa:number=Numer,
- apa:Number=Numer,
+ apa:Volumes={Bände},
+ apa:number=Nummer,
+ apa:Number={Nr.},
+ apa:nd={o.D.}, % ohne Datum (mostly: o.J. / ohne Jahr)
apa:in=in,
apa:of=von,
apa:In=In,
+ apa:Part={Teil},
apa:p=S,
apa:pp=S,
apa:pages=Seiten,
apa:and=und,
apa:period={. },
apa:Author=Autor,
- apa:Advanced={Erweiterte Online-Publikation}, % Check this German!
- apa:Retrieved={aus abgerufen}, % heruntergeladen? Check this German!
+ apa:Advanced={Erweiterte Online-Publikation},
+ apa:Retrieved={heruntergeladen von},
apa:others={et al.}]
% Thanks: Andrea Valle
diff --git a/tex/context/base/publ-ini.lua b/tex/context/base/publ-ini.lua
index 489145e08..9c1293c18 100644
--- a/tex/context/base/publ-ini.lua
+++ b/tex/context/base/publ-ini.lua
@@ -788,6 +788,7 @@ function publications.enhance(dataset) -- for the moment split runs (maybe publi
end
end
end
+ dataset.enhanced = true
statistics.stoptiming(publications)
end
@@ -1362,8 +1363,9 @@ function lists.prepareentries(dataset)
local repeated = rendering.repeated == v_yes
local sorttype = rendering.sorttype or v_default
local sorter = lists.sorters[sorttype] or lists.sorters[v_default]
- local luadata = datasets[dataset].luadata
- local details = datasets[dataset].details
+ local current = datasets[dataset]
+ local luadata = current.luadata
+ local details = current.details
local newlist = { }
for i=1,#list do
local li = list[i]
@@ -1385,7 +1387,11 @@ function lists.prepareentries(dataset)
end
li[3] = number
else
- -- weird, this shouldn't happen
+ report("missing details for tag %a in dataset %a (enhanced: %s)",tag,dataset,current.enhanced and "yes" or "no")
+ -- weird, this shouldn't happen .. all have a detail
+ lastnumber = lastnumber + 1
+ details[tag] = { number = lastnumber }
+ li[3] = lastnumber
end
end
end
diff --git a/tex/context/base/sort-ini.lua b/tex/context/base/sort-ini.lua
index 3937c77d5..a13517a98 100644
--- a/tex/context/base/sort-ini.lua
+++ b/tex/context/base/sort-ini.lua
@@ -238,10 +238,10 @@ local function preparetables(data)
end
end
else
- -- -- we probably never enter this branch
- -- -- fschars returns a single char
- --
- -- s = fschars[k]
+ -- this is a kind of last resort branch that we might want to revise
+ -- one day
+ --
+ -- s = fschars[k] -- returns a single char
-- if s and s ~= k then
-- if trace_orders then
-- report_sorters(" 6 split: %s",s)
@@ -256,7 +256,11 @@ local function preparetables(data)
-- end
-- end
-- end
- local b = utfbyte(k)
+ --
+ -- we need to move way above valid order (new per 2014-10-16) .. maybe we
+ -- need to move it even more up to get numbers right (not all have orders)
+ --
+ local b = 2 * #orders + utfbyte(k)
n = decomposed[b] or { b }
if trace_orders then
report_sorters(" 6 split: %s",utf.tostring(b)) -- todo
@@ -313,8 +317,8 @@ end
local function setlanguage(l,m,d,u)
language = (l ~= "" and l) or constants.defaultlanguage
data = definitions[language or constants.defaultlanguage] or definitions[constants.defaultlanguage]
- method = (m ~= "" and m) or data.method or constants.defaultmethod
- digits = (d ~= "" and d) or data.digits or constants.defaultdigits
+ method = (m ~= "" and m) or (data.method ~= "" and data.method) or constants.defaultmethod
+ digits = (d ~= "" and d) or (data.digits ~= "" and data.digits) or constants.defaultdigits
if trace_tests then
report_sorters("setting language %a, method %a, digits %a",language,method,digits)
end
@@ -517,15 +521,15 @@ end
-- end
-- end
-local function numify(s)
+local function numify(old)
if digits == v_numbers then
- return s
+ return old
else
- s = digitsoffset + tonumber(s) -- alternatively we can create range
- if s > digitsmaximum then
- s = digitsmaximum
+ local new = digitsoffset + tonumber(old) -- alternatively we can create range
+ if new > digitsmaximum then
+ new = digitsmaximum
end
- return utfchar(s)
+ return utfchar(new)
end
end
diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf
index c2d1abd1c..26846b17c 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 9bd3da7b3..e6b431709 100644
--- a/tex/context/base/status-lua.pdf
+++ b/tex/context/base/status-lua.pdf
Binary files differ
diff --git a/tex/context/base/strc-reg.lua b/tex/context/base/strc-reg.lua
index 03f4ae0be..ff30bb0df 100644
--- a/tex/context/base/strc-reg.lua
+++ b/tex/context/base/strc-reg.lua
@@ -823,7 +823,7 @@ end
registers.analyze = analyzeregister
-function registers.analyze(class,options)
+function commands.analyzeregister(class,options)
context(analyzeregister(class,options))
end
diff --git a/tex/context/base/strc-tag.lua b/tex/context/base/strc-tag.lua
index d37298a61..0cb00ec51 100644
--- a/tex/context/base/strc-tag.lua
+++ b/tex/context/base/strc-tag.lua
@@ -169,7 +169,8 @@ local properties = allocate {
mtr = { pdf = "TR", nature = "display" }, -- might change
mtd = { pdf = "TD", nature = "display" }, -- might change
- ignore = { pdf = "Span", nature = "mixed" },
+ ignore = { pdf = "Span", nature = "mixed" }, -- used internally
+ private = { pdf = "Span", nature = "mixed" }, -- for users (like LS) when they need it
metadata = { pdf = "Div", nature = "display" },
metavariable = { pdf = "Span", nature = "mixed" },
diff --git a/tex/context/base/strc-tag.mkiv b/tex/context/base/strc-tag.mkiv
index bbb0dcddd..a97bec7c9 100644
--- a/tex/context/base/strc-tag.mkiv
+++ b/tex/context/base/strc-tag.mkiv
@@ -137,6 +137,7 @@
\def\t!number {number} % Span
\def\t!ignore {ignore} % Span
+\def\t!private {private} % Span
\def\t!mid {mid} % Span
\def\t!sub {sub} % Span
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index 1fcdabf1c..1196713e6 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/16/14 11:53:40
+-- merge date : 10/16/14 17:26:14
do -- begin closure to overcome local limits and interference
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-24 02:04:41 +0000