diff options
Diffstat (limited to 'tex')
21 files changed, 59 insertions, 13 deletions
diff --git a/tex/context/base/mkii/cont-new.mkii b/tex/context/base/mkii/cont-new.mkii index 6cdd793b7..ed4567e86 100644 --- a/tex/context/base/mkii/cont-new.mkii +++ b/tex/context/base/mkii/cont-new.mkii @@ -11,7 +11,7 @@ %C therefore copyrighted by \PRAGMA. See mreadme.pdf for %C details. -\newcontextversion{2017.02.23 18:37} +\newcontextversion{2017.02.25 16:24} %D This file is loaded at runtime, thereby providing an %D excellent place for hacks, patches, extensions and new diff --git a/tex/context/base/mkii/context.mkii b/tex/context/base/mkii/context.mkii index 4dd3a317e..bc277e721 100644 --- a/tex/context/base/mkii/context.mkii +++ b/tex/context/base/mkii/context.mkii @@ -20,7 +20,7 @@ %D your styles an modules. \edef\contextformat {\jobname} -\edef\contextversion{2017.02.23 18:37} +\edef\contextversion{2017.02.25 16:24} %D For those who want to use this: diff --git a/tex/context/base/mkiv/bibl-tra.mkiv b/tex/context/base/mkiv/bibl-tra.mkiv index 4c9e83fdf..93f84872a 100644 --- a/tex/context/base/mkiv/bibl-tra.mkiv +++ b/tex/context/base/mkiv/bibl-tra.mkiv @@ -959,10 +959,10 @@ {#1}% {\getparameters[LO][\c!alternative=,\c!extras=,#1]% \edef\@@currentalternative{\LOalternative}% - \ifx\@@currentalternative\empty + \ifx\@@currentalternative\empty \edef\@@currentalternative{\@@citedefault}% \fi - \ifx\LOextras\empty + \ifx\LOextras\empty \setupcite[\@@currentalternative][#1]% \else \expandafter\ifx\csname \??pv \@@currentalternative\c!right\endcsname\relax diff --git a/tex/context/base/mkiv/cont-new.mkiv b/tex/context/base/mkiv/cont-new.mkiv index 4df7d0c92..d931309da 100644 --- a/tex/context/base/mkiv/cont-new.mkiv +++ b/tex/context/base/mkiv/cont-new.mkiv @@ -11,7 +11,7 @@ %C therefore copyrighted by \PRAGMA. See mreadme.pdf for %C details. -\newcontextversion{2017.02.23 18:37} +\newcontextversion{2017.02.25 16:24} %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/mkiv/context.mkiv b/tex/context/base/mkiv/context.mkiv index 94393a0a7..5b3bba8da 100644 --- a/tex/context/base/mkiv/context.mkiv +++ b/tex/context/base/mkiv/context.mkiv @@ -39,7 +39,7 @@ %D up and the dependencies are more consistent. \edef\contextformat {\jobname} -\edef\contextversion{2017.02.23 18:37} +\edef\contextversion{2017.02.25 16:24} \edef\contextkind {beta} %D For those who want to use this: diff --git a/tex/context/base/mkiv/lang-dis.lua b/tex/context/base/mkiv/lang-dis.lua index 42abea569..448966d49 100644 --- a/tex/context/base/mkiv/lang-dis.lua +++ b/tex/context/base/mkiv/lang-dis.lua @@ -96,6 +96,12 @@ local expanders = { return template end, [automatic_code] = function(d,template) + -- the penalty has been determined by the mode (currently we force 1): + -- + -- 0 : exhyphenpenalty + -- 1 : hyphenpenalty + -- 2 : automatichyphenpenalty + -- -- following a - : the pre and post chars are already appended and set -- so we have pre=preex and post=postex .. however, the previous -- hyphen is already injected ... downside: the font handler sees this diff --git a/tex/context/base/mkiv/lpdf-grp.lua b/tex/context/base/mkiv/lpdf-grp.lua index e3826faeb..1ebc9b23d 100644 --- a/tex/context/base/mkiv/lpdf-grp.lua +++ b/tex/context/base/mkiv/lpdf-grp.lua @@ -49,7 +49,9 @@ local function shade(stype,name,domain,color_a,color_b,n,colorspace,coordinates, local bounds = pdfarray() local encode = pdfarray() for i=1,steps do - bounds[i] = fractions[i] or 1 + if i < steps then + bounds[i] = fractions[i] or 1 + end encode[2*i-1] = 0 encode[2*i] = 1 list [i] = pdfdictionary { diff --git a/tex/context/base/mkiv/mult-prm.lua b/tex/context/base/mkiv/mult-prm.lua index 59c3b7f2e..7715037dd 100644 --- a/tex/context/base/mkiv/mult-prm.lua +++ b/tex/context/base/mkiv/mult-prm.lua @@ -233,6 +233,9 @@ return { "aligntab", "attribute", "attributedef", + "hyphenpenaltymode", + "automatichyphenpenalty", + "explicithyphenpenalty", "bodydir", "boundary", "boxdir", @@ -682,6 +685,9 @@ return { "atopwithdelims", "attribute", "attributedef", + "hyphenpenaltymode", + "automatichyphenpenalty", + "explicithyphenpenalty", "badness", "baselineskip", "batchmode", diff --git a/tex/context/base/mkiv/publ-imp-apa.mkvi b/tex/context/base/mkiv/publ-imp-apa.mkvi index 77fcb8995..06651ea63 100644 --- a/tex/context/base/mkiv/publ-imp-apa.mkvi +++ b/tex/context/base/mkiv/publ-imp-apa.mkvi @@ -792,7 +792,7 @@ % #author may be author(set) or editor \starttexdefinition unexpanded btx:apa:author-or-editor #author - \btxdoif {#author} { + \btxdoifelse {#author} { \btxflush{#author} \doifelse {\btxfoundname{#author}} {editor} { \btxleftparenthesis @@ -842,6 +842,8 @@ \btxflush{withauthor} \btxrightparenthesis } + } { + \texdefinition{btx:apa:title} } \stoptexdefinition diff --git a/tex/context/base/mkiv/spac-ali.mkiv b/tex/context/base/mkiv/spac-ali.mkiv index e0deb8a77..67cc1494c 100644 --- a/tex/context/base/mkiv/spac-ali.mkiv +++ b/tex/context/base/mkiv/spac-ali.mkiv @@ -954,7 +954,7 @@ \leftskip \rightskip \spaceskip \xspaceskip \parindent \parfillskip - \hyphenpenalty \exhyphenpenalty + \hyphenpenalty \exhyphenpenalty \automatichyphenpenalty \explicithyphenpenalty \displaywidowpenalty \widowpenalty \clubpenalty \brokenpenalty \doublehyphendemerits \finalhyphendemerits \adjdemerits \relax}% diff --git a/tex/context/base/mkiv/status-files.pdf b/tex/context/base/mkiv/status-files.pdf Binary files differindex 34c6150f3..aea5f09b7 100644 --- a/tex/context/base/mkiv/status-files.pdf +++ b/tex/context/base/mkiv/status-files.pdf diff --git a/tex/context/base/mkiv/status-lua.pdf b/tex/context/base/mkiv/status-lua.pdf Binary files differindex f5e5e1bf3..f36de8747 100644 --- a/tex/context/base/mkiv/status-lua.pdf +++ b/tex/context/base/mkiv/status-lua.pdf diff --git a/tex/context/base/mkiv/strc-lst.mkvi b/tex/context/base/mkiv/strc-lst.mkvi index a3718af18..08e56a700 100644 --- a/tex/context/base/mkiv/strc-lst.mkvi +++ b/tex/context/base/mkiv/strc-lst.mkvi @@ -309,7 +309,7 @@ {\strc_lists_complete_indeed[#tag][#tag][#settings]} \def\strc_lists_complete_indeed[#singular][#plural][#settings]% - {\normalexpanded{\startnamedsection[\v!title][\c!title=\headtext{#plural},\c!reference=#singular]}% + {\normalexpanded{\startnamedsection[\v!title][\c!title=\headtext{#plural},\c!reference=#singular]}% {} around ref ? \strc_lists_place[#singular][#settings]% \stopnamedsection} @@ -350,7 +350,7 @@ \endgroup} \def\strc_lists_combined_complete[#tag][#settings]% - {\normalexpanded{\startnamedsection[\v!title][\c!title={\headtext{#tag}},\c!reference=#tag]}% + {\normalexpanded{\startnamedsection[\v!title][\c!title={\headtext{#tag}},\c!reference=#tag]}% {} around ref ? \strc_lists_combined_place[#tag][#settings]% \stopnamedsection} diff --git a/tex/context/base/mkiv/strc-not.lua b/tex/context/base/mkiv/strc-not.lua index 1464c7f73..eff357eea 100644 --- a/tex/context/base/mkiv/strc-not.lua +++ b/tex/context/base/mkiv/strc-not.lua @@ -471,7 +471,7 @@ local texsetglue = tex.setglue local function check_spacing(n,i) local gn, pn, mn = texgetglue(n) local gi, pi, mi = texgetglue(i > 1 and "s_strc_notes_inbetween" or "s_strc_notes_before") - local gi, pi, mi = gn+gi, pn+pi, mn+mi + local gt, pt, mt = gn+gi, pn+pi, mn+mi if trace_insert then report_insert("%s %i: %p plus %p minus %p","always ",n,gn,pn,mn) report_insert("%s %i: %p plus %p minus %p",i > 1 and "inbetween" or "before ",n,gi,pi,mi) diff --git a/tex/context/base/mkiv/strc-ref.lua b/tex/context/base/mkiv/strc-ref.lua index 23aa79ed4..a9a7c7121 100644 --- a/tex/context/base/mkiv/strc-ref.lua +++ b/tex/context/base/mkiv/strc-ref.lua @@ -896,6 +896,26 @@ local function resolve(prefix,reference,args,set) -- we start with prefix,refere if var then var.reference = ri local vo, vi = var.outer, var.inner + -- we catch this here .. it's a way to pass references with commas + if vi == "name" then + local arguments = var.arguments + if arguments then + vi = arguments + var.inner = arguments + var.reference = arguments + var.arguments = nil + end + elseif var.special == "name" then + local operation = var.operation + if operation then + vi = operation + var.inner = operation + var.reference = operation + var.operation = nil + var.special = nil + end + end + -- end of catch if not vo and vi then -- to be checked d = defined[prefix][vi] or defined[""][vi] diff --git a/tex/context/base/mkiv/strc-rsc.lua b/tex/context/base/mkiv/strc-rsc.lua index ee7f885e0..d7dc47827 100644 --- a/tex/context/base/mkiv/strc-rsc.lua +++ b/tex/context/base/mkiv/strc-rsc.lua @@ -125,6 +125,10 @@ references.splitcomponent = splitcomponent -- inspect(splitprefix([[component:::inner]])) -- inspect(splitprefix([[component:inner]])) +-- inspect(splitreference([[name(foo)]])) +-- inspect(splitreference([[name{foo}]])) +-- inspect(splitreference([[xx::name(foo, bar and me)]])) + -- inspect(splitreference([[ ]])) -- inspect(splitreference([[ inner ]])) -- inspect(splitreference([[ special ( operation { argument, argument } ) ]])) diff --git a/tex/context/base/mkiv/syst-ini.mkiv b/tex/context/base/mkiv/syst-ini.mkiv index d5e311448..1b7f8fd19 100644 --- a/tex/context/base/mkiv/syst-ini.mkiv +++ b/tex/context/base/mkiv/syst-ini.mkiv @@ -1173,4 +1173,8 @@ \ifdefined\mathsurroundmode \else \newcount\mathsurroundmode \fi \ifdefined\mathitalicsmode \else \newcount\mathitalicsmode \fi +\ifdefined\hyphenpenaltymode \else \newcount\hyphenpenaltymode \fi +\ifdefined\automatichyphenpenalty \else \newcount\automatichyphenpenalty \fi +\ifdefined\explicithyphenpenalty \else \newcount\explicithyphenpenalty \fi + \protect \endinput diff --git a/tex/context/interface/mkiv/i-common-value.xml b/tex/context/interface/mkiv/i-common-value.xml index f0196341f..36f2c1d52 100644 --- a/tex/context/interface/mkiv/i-common-value.xml +++ b/tex/context/interface/mkiv/i-common-value.xml @@ -296,6 +296,8 @@ <cd:constant type="page"/> <cd:constant type="leftpage"/> <cd:constant type="rightpage"/> + <cd:constant type="header"/> + <cd:constant type="footer"/> <cd:constant type="somewhere"/> <cd:constant type="effective"/> </cd:define> diff --git a/tex/context/interface/mkiv/i-context.pdf b/tex/context/interface/mkiv/i-context.pdf Binary files differindex d847627dd..16463b9be 100644 --- a/tex/context/interface/mkiv/i-context.pdf +++ b/tex/context/interface/mkiv/i-context.pdf diff --git a/tex/context/interface/mkiv/i-readme.pdf b/tex/context/interface/mkiv/i-readme.pdf Binary files differindex 39d9d5def..98314b3a2 100644 --- a/tex/context/interface/mkiv/i-readme.pdf +++ b/tex/context/interface/mkiv/i-readme.pdf diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua index 414aa3e0b..52344aa26 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 : c:/data/develop/context/sources/luatex-fonts-merged.lua -- parent file : c:/data/develop/context/sources/luatex-fonts.lua --- merge date : 02/23/17 18:37:07 +-- merge date : 02/25/17 16:24:36 do -- begin closure to overcome local limits and interference |