From 65ac490d12b57da094d98763d515f178d3db0195 Mon Sep 17 00:00:00 2001
From: Hans Hagen <pragma@wxs.nl>
Date: Sun, 2 May 2010 16:43:00 +0200
Subject: beta 2010.05.02 16:43
---
tex/context/base/colo-ini.lua | 1 +
tex/context/base/cont-new.tex | 2 +-
tex/context/base/context.tex | 2 +-
tex/context/base/lpdf-ini.lua | 35 ++++++++++++++++-------------
tex/context/base/strc-def.mkiv | 1 +
tex/context/base/strc-doc.lua | 8 +++----
tex/context/base/strc-lst.lua | 4 +++-
tex/context/base/strc-lst.mkiv | 2 +-
tex/generic/context/luatex-fonts-merged.lua | 2 +-
9 files changed, 32 insertions(+), 25 deletions(-)
diff --git a/tex/context/base/colo-ini.lua b/tex/context/base/colo-ini.lua
index b92f7561f..0298f91ca 100644
--- a/tex/context/base/colo-ini.lua
+++ b/tex/context/base/colo-ini.lua
@@ -6,6 +6,7 @@ if not modules then modules = { } end modules ['colo-ini'] = {
license = "see context related readme files"
}
+local type = type
local concat = table.concat
local format, gmatch, gsub, lower, match, find = string.format, string.gmatch, string.gsub, string.lower, string.match, string.find
local texsprint = tex.sprint
diff --git a/tex/context/base/cont-new.tex b/tex/context/base/cont-new.tex
index dd1051d0a..cbe5296fa 100644
--- a/tex/context/base/cont-new.tex
+++ b/tex/context/base/cont-new.tex
@@ -11,7 +11,7 @@
%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
%C details.
-\newcontextversion{2010.04.25 15:55}
+\newcontextversion{2010.05.02 16:43}
%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/context.tex b/tex/context/base/context.tex
index 8d8c45910..8f682741f 100644
--- a/tex/context/base/context.tex
+++ b/tex/context/base/context.tex
@@ -20,7 +20,7 @@
%D your styles an modules.
\edef\contextformat {\jobname}
-\edef\contextversion{2010.04.25 15:55}
+\edef\contextversion{2010.05.02 16:43}
%D For those who want to use this:
diff --git a/tex/context/base/lpdf-ini.lua b/tex/context/base/lpdf-ini.lua
index 887ab4db6..416e2eae2 100644
--- a/tex/context/base/lpdf-ini.lua
+++ b/tex/context/base/lpdf-ini.lua
@@ -44,24 +44,27 @@ lpdf.tosixteen = tosixteen
-- lpeg is some 5 times faster than gsub (in test) on escaping
-local escapes = {
- ["\\"] = "\\\\",
- ["/"] = "\\/", ["#"] = "\\#",
- ["<"] = "\\<", [">"] = "\\>",
- ["["] = "\\[", ["]"] = "\\]",
- ["("] = "\\(", [")"] = "\\)",
-}
-
-local escaped = lpeg.Cs(lpeg.Cc("(") * (lpeg.S("\\/#<>[]()")/escapes + lpeg.P(1))^0 * lpeg.Cc(")"))
+-- local escapes = {
+-- ["\\"] = "\\\\",
+-- ["/"] = "\\/", ["#"] = "\\#",
+-- ["<"] = "\\<", [">"] = "\\>",
+-- ["["] = "\\[", ["]"] = "\\]",
+-- ["("] = "\\(", [")"] = "\\)",
+-- }
+--
+-- local escaped = lpeg.Cs(lpeg.Cc("(") * (lpeg.S("\\/#<>[]()")/escapes + lpeg.P(1))^0 * lpeg.Cc(")"))
+--
+-- local function toeight(str)
+-- if not str or str == "" then
+-- return "()"
+-- else
+-- return lpegmatch(escaped,str)
+-- end
+-- end
+--
+-- -- no need for escaping .. just use unicode instead
local function toeight(str)
- -- if not str or str == "" then
- -- return "()"
- -- else
- -- return lpegmatch(escaped,str)
- -- end
- --
- -- no need for escaping .. just use unicode instead
return "(" .. str .. ")"
end
diff --git a/tex/context/base/strc-def.mkiv b/tex/context/base/strc-def.mkiv
index 4425959a8..77793c7eb 100644
--- a/tex/context/base/strc-def.mkiv
+++ b/tex/context/base/strc-def.mkiv
@@ -115,6 +115,7 @@
\definestructureprefixset [\s!default] [section-1,section-2,section-3] []
\definestructureprefixset [\v!all] [section-1,section-2,section-3,section-4,section-5,section-6,section-7,section-8] []
+\definestructureprefixset [\v!none] [] []
\definestructureprefixset [\v!part] [section-1] []
\definestructureprefixset [\v!chapter] [section-2] []
diff --git a/tex/context/base/strc-doc.lua b/tex/context/base/strc-doc.lua
index b3b9d05a5..7ebb1e927 100644
--- a/tex/context/base/strc-doc.lua
+++ b/tex/context/base/strc-doc.lua
@@ -250,7 +250,7 @@ function sections.somelevel(given)
status[i] = nil
end
end
-structure.counters.check(newdepth)
+ structure.counters.check(newdepth)
ownnumbers[newdepth] = given.numberdata.ownnumber or ""
given.numberdata.ownnumber = nil
data.depth = newdepth
@@ -569,9 +569,9 @@ function sections.typesetnumber(entry,kind,...) -- kind='section','number','pref
end
--
local prefixlist = set and sets.getall("structure:prefixes","",set) -- "" == block
-if starter then
- processors.sprint(ctxcatcodes,starter)
-end
+ if starter then
+ processors.sprint(ctxcatcodes,starter)
+ end
if prefixlist and (kind == 'section' or kind == 'prefix') then
-- find valid set (problem: for sectionnumber we should pass the level)
-- if kind == "section" then
diff --git a/tex/context/base/strc-lst.lua b/tex/context/base/strc-lst.lua
index 5f6726d44..2ef789f2c 100644
--- a/tex/context/base/strc-lst.lua
+++ b/tex/context/base/strc-lst.lua
@@ -330,6 +330,7 @@ function lists.process(...)
local r = lists.result[i]
local m = r.metadata
texsprint(ctxcatcodes,format("\\processlistofstructure{%s}{%s}{%i}",m.name,m.kind,i))
+--~ context.processlistofstructure(m.name,m.kind,i)
end
end
@@ -454,7 +455,8 @@ function lists.prefixednumber(name,n,prefixspec,numberspec)
helpers.prefix(data,prefixspec)
local numberdata = data.numberdata
if numberdata then
- sections.typesetnumber(numberdata,"number",spec or false,numberdata or false)
+--~ print(table.serialize(numberspec))
+ sections.typesetnumber(numberdata,"number",numberspec or false,numberdata or false)
end
end
end
diff --git a/tex/context/base/strc-lst.mkiv b/tex/context/base/strc-lst.mkiv
index a2c3dfd82..b800aa6a8 100644
--- a/tex/context/base/strc-lst.mkiv
+++ b/tex/context/base/strc-lst.mkiv
@@ -182,7 +182,7 @@
\currentlist
\structurelistlocation
\structurelistgenericnumber
- \structurelistgenerictitle
+ \structurelistgenerictitle % hm, can end up in message (volkers test)
\structurelistpagenumber
\structurelistrealpagenumber}
diff --git a/tex/generic/context/luatex-fonts-merged.lua b/tex/generic/context/luatex-fonts-merged.lua
index e256689cb..53494e57c 100644
--- a/tex/generic/context/luatex-fonts-merged.lua
+++ b/tex/generic/context/luatex-fonts-merged.lua
@@ -1,6 +1,6 @@
-- merged file : luatex-fonts-merged.lua
-- parent file : luatex-fonts.lua
--- merge date : 04/29/10 22:30:18
+-- merge date : 05/02/10 16:43:27
do -- begin closure to overcome local limits and interference
--
cgit v1.2.3