summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--tex/context/base/cont-new.mkiv2
-rw-r--r--tex/context/base/context-version.pdfbin4113 -> 4112 bytes
-rw-r--r--tex/context/base/context.mkiv2
-rw-r--r--tex/context/base/mult-def.mkiv1
-rw-r--r--tex/context/base/status-files.pdfbin25437 -> 25448 bytes
-rw-r--r--tex/context/base/status-lua.pdfbin253267 -> 253261 bytes
-rw-r--r--tex/context/base/strc-bkm.lua21
-rw-r--r--tex/context/base/strc-bkm.mkiv16
-rw-r--r--tex/context/base/typo-tal.lua23
-rw-r--r--tex/context/base/typo-tal.mkiv9
-rw-r--r--tex/generic/context/luatex/luatex-fonts-merged.lua2
11 files changed, 47 insertions, 29 deletions
diff --git a/tex/context/base/cont-new.mkiv b/tex/context/base/cont-new.mkiv
index 29db39968..36c173d60 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{2013.11.07 15:28}
+\newcontextversion{2013.11.08 11:50}
%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 99a25304b..c4c7d70d0 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 956166209..a0250d234 100644
--- a/tex/context/base/context.mkiv
+++ b/tex/context/base/context.mkiv
@@ -25,7 +25,7 @@
%D up and the dependencies are more consistent.
\edef\contextformat {\jobname}
-\edef\contextversion{2013.11.07 15:28}
+\edef\contextversion{2013.11.08 11:50}
\edef\contextkind {beta}
%D For those who want to use this:
diff --git a/tex/context/base/mult-def.mkiv b/tex/context/base/mult-def.mkiv
index 0c52d5a92..15d533009 100644
--- a/tex/context/base/mult-def.mkiv
+++ b/tex/context/base/mult-def.mkiv
@@ -36,6 +36,7 @@
\def\c!fences {fences}
+\def\c!sectionblock {sectionblock}
\def\c!language {language}
\def\c!compressseparator{compressseparator}
\def\c!renderingsetup {renderingsetup}
diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf
index 83a5e5d03..180a0971f 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 73535bb60..66a3aa417 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-bkm.lua b/tex/context/base/strc-bkm.lua
index 6cf325363..c38ab3c2e 100644
--- a/tex/context/base/strc-bkm.lua
+++ b/tex/context/base/strc-bkm.lua
@@ -155,6 +155,7 @@ function bookmarks.place()
local noflevels = 0
local lastlevel = 1
local nofblocks = #lists.sectionblocks -- always >= 1
+ local showblocktitle = toboolean(numberspec.showblocktitle,true)
for i=1,nofblocks do
local block = lists.sectionblocks[i]
local blockdone = nofblocks == 1
@@ -167,15 +168,17 @@ function bookmarks.place()
local titledata = li.titledata
if titledata then
if not blockdone then
- -- add block entry
- local blockdata = sections.sectionblockdata[block]
- noflevels = noflevels + 1
- levels[noflevels] = {
- 1, -- toplevel
- stripped(blockdata.bookmark ~= "" and blockdata.bookmark or block),
- li.references,
- allopen or opened[name] -- same as first entry
- }
+ if showblocktitle then
+ -- add block entry
+ local blockdata = sections.sectionblockdata[block]
+ noflevels = noflevels + 1
+ levels[noflevels] = {
+ 1, -- toplevel
+ stripped(blockdata.bookmark ~= "" and blockdata.bookmark or block),
+ li.references,
+ allopen or opened[name] -- same as first entry
+ }
+ end
blockdone = true
end
local structural = levelmap[name]
diff --git a/tex/context/base/strc-bkm.mkiv b/tex/context/base/strc-bkm.mkiv
index 8e1252329..9d2ebd796 100644
--- a/tex/context/base/strc-bkm.mkiv
+++ b/tex/context/base/strc-bkm.mkiv
@@ -55,8 +55,9 @@
\installsetuponlycommandhandler \??bookmark {bookmark} % installdirectparametersethandler
\setupbookmark
- [\c!force=\v!no, % it's easier to force that to inhibit
- \c!number=\v!yes] % might become v!no
+ [\c!force=\v!no, % it's easier to force that to inhibit
+ \c!number=\v!yes, % might become v!no
+ \c!sectionblock=\v!no] % show sectionblock level + title
\let\setupbookmarks\setupbookmark
@@ -117,11 +118,12 @@
\appendtoks
\ctxcommand{setupbookmarks {
- separatorset = "\bookmarkparameter\c!numberseparatorset",
- conversionset = "\bookmarkparameter\c!numberconversionset",
- starter = \!!bs\bookmarkparameter\c!numberstarter\!!es,
- stopper = \!!bs\bookmarkparameter\c!numberstopper\!!es,
- segments = "\bookmarkparameter\c!numbersegments",
+ separatorset = "\bookmarkparameter\c!numberseparatorset",
+ conversionset = "\bookmarkparameter\c!numberconversionset",
+ starter = \!!bs\bookmarkparameter\c!numberstarter\!!es,
+ stopper = \!!bs\bookmarkparameter\c!numberstopper\!!es,
+ segments = "\bookmarkparameter\c!numbersegments",
+ showblocktitle = "\bookmarkparameter\c!sectionblock",
}}%
\to \everysetupbookmark
diff --git a/tex/context/base/typo-tal.lua b/tex/context/base/typo-tal.lua
index 4cfd27d91..becf2d401 100644
--- a/tex/context/base/typo-tal.lua
+++ b/tex/context/base/typo-tal.lua
@@ -75,7 +75,7 @@ function characteralign.handler(head,where)
end
-- local first = first_glyph(head) -- we could do that once
local first
- for n in traverse_list_by_id(glyhp_code,head) do
+ for n in traverse_list_by_id(glyph_code,head) do
first = n
break
end
@@ -120,7 +120,7 @@ function characteralign.handler(head,where)
end
a_stop = current
if trace_split then
- setcolor(current,"darkgreen")
+ setcolor(current,validseparators[unicode] and "darkcyan" or "darkblue")
end
else
if not b_start then
@@ -138,13 +138,17 @@ function characteralign.handler(head,where)
end
end
sign = nil
+ b_stop = current
else
b_start = current
+ b_stop = current
+ setcolor(current,validseparators[unicode] and "darkcyan" or "darkblue")
+ end
+ else
+ b_stop = current
+ if trace_split then
+ setcolor(current,validseparators[unicode] and "darkcyan" or "darkblue")
end
- end
- b_stop = current
- if trace_split then
- setcolor(current,"darkblue")
end
end
elseif not b_start then
@@ -155,11 +159,16 @@ function characteralign.handler(head,where)
local next = current.next
local prev = current.prev
if next and prev and next.id == glyph_code and prev.id == glyph_code then -- too much checking
- local width = fontcharacters[b_start.font][period].width
+ local width = fontcharacters[b_start.font][separator or period].width
-- local spec = current.spec
-- nodes.free(spec) -- hm, we leak but not that many specs
current.spec = new_gluespec(width)
current[a_character] = punctuationspace
+ if a_start then
+ a_stop = current
+ elseif b_start then
+ b_stop = current
+ end
end
end
current = current.next
diff --git a/tex/context/base/typo-tal.mkiv b/tex/context/base/typo-tal.mkiv
index 85643a5f9..7de10a6ec 100644
--- a/tex/context/base/typo-tal.mkiv
+++ b/tex/context/base/typo-tal.mkiv
@@ -148,10 +148,13 @@
\def\m_font_feature_auto_tabnum{system:tabnum}
-\def\typo_charalign_adapt_font % slow but seldom used
+\unexpanded\def\typo_charalign_adapt_font_indeed
+ {\let\m_font_feature_asked\m_font_feature_auto_tabnum
+ \font_feature_reset_add_indeed}
+
+\def\typo_charalign_adapt_font % slow but seldom used (expanded in preamble)
{\ifconditional\c_tabl_ntb_char_align_auto_font
- \let\m_font_feature_asked\m_font_feature_auto_tabnum
- \font_feature_reset_add_indeed
+ \typo_charalign_adapt_font_indeed
\fi}
\protect \endinput
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index b426ce304..705c1146f 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 : 11/07/13 15:28:28
+-- merge date : 11/08/13 11:50:45
do -- begin closure to overcome local limits and interference
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-23 18:24:20 +0000