summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--scripts/context/lua/mtxlibs.lua1
-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.pdfbin4111 -> 4105 bytes
-rw-r--r--tex/context/base/context.mkiv2
-rw-r--r--tex/context/base/math-dir.lua151
-rw-r--r--tex/context/base/math-ini.mkiv1
-rw-r--r--tex/context/base/sort-lan.lua1
-rw-r--r--tex/context/base/status-files.pdfbin24770 -> 24761 bytes
-rw-r--r--tex/context/base/status-lua.log2
-rw-r--r--tex/context/base/tabl-xtb.lua3
-rw-r--r--tex/context/base/tabl-xtb.mkvi4
-rw-r--r--tex/context/base/typo-dha.lua474
-rw-r--r--tex/context/base/typo-dir.lua522
-rw-r--r--tex/context/base/typo-dir.mkiv25
-rw-r--r--tex/context/base/typo-uba.lua782
-rw-r--r--tex/context/base/typo-ubb.lua887
-rw-r--r--tex/generic/context/luatex/luatex-fonts-merged.lua2
18 files changed, 650 insertions, 2215 deletions
diff --git a/scripts/context/lua/mtxlibs.lua b/scripts/context/lua/mtxlibs.lua
index ad90a66dd..ae9d70108 100644
--- a/scripts/context/lua/mtxlibs.lua
+++ b/scripts/context/lua/mtxlibs.lua
@@ -111,6 +111,7 @@ local ownlibs = {
"lxml-aux.lua",
"lxml-xml.lua",
+ "trac-xml.lua", -- handy for helpinfo
}
package.path = "t:/sources/?.lua;t:/sources/?;" .. package.path
diff --git a/tex/context/base/back-exp.lua b/tex/context/base/back-exp.lua
index 1ff1cd7a0..efc62a786 100644
--- a/tex/context/base/back-exp.lua
+++ b/tex/context/base/back-exp.lua
@@ -6,6 +6,8 @@ if not modules then modules = { } end modules ['back-exp'] = {
license = "see context related readme files"
}
+-- beware: we run out of the 200 local limit
+
-- language -> only mainlanguage, local languages should happen through start/stoplanguage
-- tocs/registers -> maybe add a stripper (i.e. just don't flush entries in final tree)
-- footnotes -> css 3
@@ -22,10 +24,10 @@ if not modules then modules = { } end modules ['back-exp'] = {
-- todo: delay loading (apart from basic tag stuff)
local next, type = next, type
-local format, match, concat, rep, sub, gsub, gmatch, find = string.format, string.match, table.concat, string.rep, string.sub, string.gsub, string.gmatch, string.find
+local format, concat, sub, gsub = string.format, string.concat, string.sub, string.gsub
local validstring = string.valid
local lpegmatch = lpeg.match
-local utfchar, utfbyte, utfvalues = utf.char, utf.byte, utf.values
+local utfchar, utfvalues = utf.char, utf.values
local insert, remove = table.insert, table.remove
local fromunicode16 = fonts.mappings.fromunicode16
local sortedhash = table.sortedhash
diff --git a/tex/context/base/cont-new.mkiv b/tex/context/base/cont-new.mkiv
index 33aefc217..c75d01306 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.09.07 13:50}
+\newcontextversion{2013.09.09 11:46}
%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 07ae485d4..8f41405f0 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 af39cc2f0..bf4b1eaef 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.09.07 13:50}
+\edef\contextversion{2013.09.09 11:46}
\edef\contextkind {beta}
%D For those who want to use this:
diff --git a/tex/context/base/math-dir.lua b/tex/context/base/math-dir.lua
new file mode 100644
index 000000000..f5719b99d
--- /dev/null
+++ b/tex/context/base/math-dir.lua
@@ -0,0 +1,151 @@
+if not modules then modules = { } end modules ['math-dir'] = {
+ version = 1.001,
+ comment = "companion to typo-dir.mkiv",
+ author = "Hans Hagen, PRAGMA-ADE, Hasselt NL",
+ copyright = "PRAGMA ADE / ConTeXt Development Team",
+ license = "see context related readme files"
+}
+
+-- As I'm wrapping up the updated math support (for CTX/TUG 2013) I wondered about numbers in
+-- r2l math mode. Googling lead me to TUGboat, Volume 25 (2004), No. 2 where I see numbers
+-- running from left to right. Makes me wonder how far we should go. And as I was looking
+-- into bidi anyway, it's a nice distraction.
+--
+-- I first tried to hook something into noads but that gets pretty messy due to indirectness
+-- char noads. If needed, I'll do it that way. With regards to spacing: as we can assume that
+-- only numbers are involved we can safely swap them and the same is true for mirroring. But
+-- anyway, I'm not too happy with this solution so eventually I'll do something with noads (as
+-- an alternative method). Yet another heuristic approach.
+
+local nodes, node = nodes, node
+
+local trace_directions = false trackers.register("typesetters.directions.math", function(v) trace_directions = v end)
+
+local report_directions = logs.reporter("typesetting","math directions")
+
+local insert_node_before = nodes.insert_before
+local insert_node_after = nodes.insert_after
+
+local nodecodes = nodes.nodecodes
+local tasks = nodes.tasks
+
+local glyph_code = nodecodes.glyph
+local hlist_code = nodecodes.hlist
+local vlist_code = nodecodes.vlist
+
+local nodepool = nodes.pool
+
+local new_textdir = nodepool.textdir
+
+local chardirections = characters.directions
+local charmirrors = characters.mirrors
+local charclasses = characters.textclasses
+
+local directions = typesetters.directions or { }
+
+local a_mathbidi = attributes.private('mathbidi')
+
+local function processmath(head)
+ local current = head
+ local done = false
+ local start = nil
+ local stop = nil
+ local function capsulate()
+ head = insert_node_before(head,start,new_textdir("+TLT"))
+ insert_node_after(head,stop,new_textdir("-TLT"))
+ if trace_directions then
+ report_directions("reversed: %s",nodes.listtoutf(start,false,false,stop))
+ end
+ done = true
+ start = false
+ stop = nil
+ end
+ while current do
+ local id = current.id
+ if id == glyph_code then
+ local char = current.char
+ local cdir = chardirections[char]
+ if cdir == "en" or cdir == "an" then -- we could check for mathclass punctuation
+ if not start then
+ start = current
+ end
+ stop = current
+ else
+ if not start then
+ -- nothing
+ elseif start == stop then
+ start = nil
+ else
+ capsulate()
+ end
+ if cdir == "on" then
+ local mirror = charmirrors[char]
+ if mirror then
+ local class = charclasses[char]
+ if class == "open" or class == "close" then
+ current.char = mirror
+ if trace_directions then
+ report_directions("mirrored: %C to %C",char,mirror)
+ end
+ done = true
+ end
+ end
+ end
+ end
+ elseif not start then
+ -- nothing
+ elseif start == stop then
+ start = nil
+ else
+ capsulate(head,start,stop)
+ -- math can pack things into hlists .. we need to make sure we don't process
+ -- too often: needs checking
+ if id == hlist_code or id == vlist_code then
+ local list, d = processmath(current.list)
+ current.list = list
+ if d then
+ done = true
+ end
+ end
+ end
+ current = current.next
+ end
+ if not start then
+ -- nothing
+ elseif start == stop then
+ -- nothing
+ else
+ capsulate()
+ end
+ return head, done
+end
+
+local enabled = false
+
+function directions.processmath(head) -- style, penalties
+ if enabled then
+ local a = head[a_mathbidi]
+ if a and a > 0 then
+ return processmath(head)
+ end
+ end
+ return head, false
+end
+
+function directions.setmath(n)
+ if not enabled and n and n > 0 then
+ if trace_directions then
+ report_directions("enabling directions handler")
+ end
+ tasks.enableaction("math","typesetters.directions.processmath")
+ enabled = true
+ end
+end
+
+commands.setmathdirection = directions.setmath
+
+-- directions.mathhandler = nodes.installattributehandler {
+-- name = "directions",
+-- namespace = directions,
+-- processor = directions.processmath,
+-- }
diff --git a/tex/context/base/math-ini.mkiv b/tex/context/base/math-ini.mkiv
index e0afc3e93..ead95e630 100644
--- a/tex/context/base/math-ini.mkiv
+++ b/tex/context/base/math-ini.mkiv
@@ -44,6 +44,7 @@
\registerctxluafile{math-noa}{1.001}
\registerctxluafile{math-tag}{1.001}
\registerctxluafile{math-fbk}{1.001}
+\registerctxluafile{math-dir}{1.001}
%D A few compatibility helpers:
diff --git a/tex/context/base/sort-lan.lua b/tex/context/base/sort-lan.lua
index d2fa276d7..8efc0924a 100644
--- a/tex/context/base/sort-lan.lua
+++ b/tex/context/base/sort-lan.lua
@@ -9,6 +9,7 @@ if not modules then modules = { } end modules ['sort-lan'] = {
-- todo: look into uts#10 (2012) ... some experiments ... something
-- to finish in winter.
+-- todo: U+1E9E (german SS)
-- Many vectors were supplied by Wolfgang Schuster and Philipp
-- Gesang. However this is a quite adapted and reformatted variant
diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf
index 2933fd5b3..89ec0b148 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.log b/tex/context/base/status-lua.log
index 9279aef57..0e8bfaf28 100644
--- a/tex/context/base/status-lua.log
+++ b/tex/context/base/status-lua.log
@@ -1,6 +1,6 @@
(cont-yes.mkiv
-ConTeXt ver: 2013.09.07 13:50 MKIV beta fmt: 2013.9.7 int: english/english
+ConTeXt ver: 2013.09.09 11:46 MKIV beta fmt: 2013.9.9 int: english/english
system > 'cont-new.mkiv' loaded
(cont-new.mkiv)
diff --git a/tex/context/base/tabl-xtb.lua b/tex/context/base/tabl-xtb.lua
index b0af0d5c8..488ef5b78 100644
--- a/tex/context/base/tabl-xtb.lua
+++ b/tex/context/base/tabl-xtb.lua
@@ -989,3 +989,6 @@ commands.x_table_init_construct = xtables.initialize_construct
commands.x_table_set_reflow_width = xtables.set_reflow_width
commands.x_table_set_reflow_height = xtables.set_reflow_height
commands.x_table_set_construct = xtables.set_construct
+
+commands.x_table_r = function() context(data.currentrow or 0) end
+commands.x_table_c = function() context(data.currentcolumn or 0) end
diff --git a/tex/context/base/tabl-xtb.mkvi b/tex/context/base/tabl-xtb.mkvi
index aba4e5027..f63f83080 100644
--- a/tex/context/base/tabl-xtb.mkvi
+++ b/tex/context/base/tabl-xtb.mkvi
@@ -94,9 +94,11 @@
\newdimen\d_tabl_x_final_width
\newcount\c_tabl_x_nesting
\newcount\c_tabl_x_skip_mode % 1 = skip
-
\newdimen\d_tabl_x_textwidth
+\def\currentxtablerow {\ctxcommand{x_table_r()}}
+\def\currentxtablecolumn{\ctxcommand{x_table_c()}}
+
% \setupxtable[one][parent][a=b,c=d]
% \setupxtable[one] [a=b,c=d]
% \setupxtable [a=b,c=d]
diff --git a/tex/context/base/typo-dha.lua b/tex/context/base/typo-dha.lua
new file mode 100644
index 000000000..35dfa856e
--- /dev/null
+++ b/tex/context/base/typo-dha.lua
@@ -0,0 +1,474 @@
+if not modules then modules = { } end modules ['typo-dha'] = {
+ version = 1.001,
+ comment = "companion to typo-dir.mkiv",
+ author = "Hans Hagen, PRAGMA-ADE, Hasselt NL",
+ copyright = "PRAGMA ADE / ConTeXt Development Team",
+ license = "see context related readme files"
+}
+
+-- Some analysis by Idris:
+--
+-- 1. Assuming the reading- vs word-order distinction (bidi-char types) is governing;
+-- 2. Assuming that 'ARAB' represents an actual arabic string in raw input order, not word-order;
+-- 3. Assuming that 'BARA' represent the correct RL word order;
+--
+-- Then we have, with input: LATIN ARAB
+--
+-- \textdir TLT LATIN ARAB => LATIN BARA
+-- \textdir TRT LATIN ARAB => LATIN BARA
+-- \textdir TRT LRO LATIN ARAB => LATIN ARAB
+-- \textdir TLT LRO LATIN ARAB => LATIN ARAB
+-- \textdir TLT RLO LATIN ARAB => NITAL ARAB
+-- \textdir TRT RLO LATIN ARAB => NITAL ARAB
+
+-- elseif d == "es" then -- European Number Separator
+-- elseif d == "et" then -- European Number Terminator
+-- elseif d == "cs" then -- Common Number Separator
+-- elseif d == "nsm" then -- Non-Spacing Mark
+-- elseif d == "bn" then -- Boundary Neutral
+-- elseif d == "b" then -- Paragraph Separator
+-- elseif d == "s" then -- Segment Separator
+-- elseif d == "ws" then -- Whitespace
+-- elseif d == "on" then -- Other Neutrals
+
+-- todo : delayed inserts here
+-- todo : get rid of local functions here
+-- beware: math adds whatsits afterwards so that will mess things up
+-- todo : use new dir functions
+-- todo : make faster
+-- todo : move dir info into nodes
+-- todo : swappable tables and floats i.e. start-end overloads (probably loop in builders)
+-- todo : check if we still have crashes in luatex when non-matched (used to be the case)
+
+local nodes, node = nodes, node
+
+local trace_directions = false trackers.register("typesetters.directions.default", function(v) trace_directions = v end)
+
+local report_directions = logs.reporter("typesetting","text directions")
+
+local hasbit = number.hasbit
+local formatters = string.formatters
+local insert = table.insert
+
+local insert_node_before = nodes.insert_before
+local insert_node_after = nodes.insert_after
+local remove_node = nodes.remove
+local end_of_math = nodes.end_of_math
+
+local nodecodes = nodes.nodecodes
+local whatcodes = nodes.whatcodes
+local mathcodes = nodes.mathcodes
+
+local glyph_code = nodecodes.glyph
+local whatsit_code = nodecodes.whatsit
+local math_code = nodecodes.math
+local penalty_code = nodecodes.penalty
+local kern_code = nodecodes.kern
+local glue_code = nodecodes.glue
+local hlist_code = nodecodes.hlist
+local vlist_code = nodecodes.vlist
+
+local localpar_code = whatcodes.localpar
+local dir_code = whatcodes.dir
+
+local nodepool = nodes.pool
+
+local new_textdir = nodepool.textdir
+
+local fonthashes = fonts.hashes
+local fontdata = fonthashes.identifiers
+local fontchar = fonthashes.characters
+
+local chardirections = characters.directions
+local charmirrors = characters.mirrors
+local charclasses = characters.textclasses
+
+local directions = typesetters.directions
+local getglobal = directions.getglobal
+
+local a_state = attributes.private('state')
+local a_directions = attributes.private('directions')
+
+local strip = false
+
+local s_isol = fonts.analyzers.states.isol
+
+local function process(namespace,attribute,start)
+
+ local head = start
+
+ local current, inserted = head, nil
+ local finish, autodir, embedded, override, done = nil, 0, 0, 0, false
+ local list, glyphs = trace_directions and { }, false
+ local finished, finidir, finipos = nil, nil, 1
+ local stack, top, obsolete = { }, 0, { }
+ local lro, rlo, prevattr = false, false, 0
+
+ local function finish_auto_before()
+ local fdir = finish == "TRT" and "-TRT" or "-TLT"
+ head, inserted = insert_node_before(head,current,new_textdir(fdir))
+ finished, finidir, autodir = inserted, finish, 0
+ if trace_directions then
+ insert(list,#list,formatters["auto %a inserted before, autodir %a, embedded %a"](fdir,autodir,embedded))
+ finipos = #list - 1
+ end
+ finish, done = nil, true
+ end
+
+ local function finish_auto_after()
+ local fdir = finish == "TRT" and "-TRT" or "-TLT"
+ head, current = insert_node_after(head,current,new_textdir(fdir))
+ finished, finidir, autodir = current, finish, 0
+ if trace_directions then
+ list[#list+1] = formatters["auto %a inserted after, autodir %a, embedded %a"](fdir,autodir,embedded)
+ finipos = #list
+ end
+ finish, done = nil, true
+ end
+
+ local function force_auto_left_before(d)
+ if finish then
+ finish_auto_before()
+ end
+ if embedded >= 0 then
+ finish, autodir = "TLT", 1
+ else
+ finish, autodir = "TRT", -1
+ end
+ done = true
+ if finidir == finish then
+ head = remove_node(head,finished,true)
+ if trace_directions then
+ list[finipos] = list[finipos] .. ", deleted afterwards"
+ insert(list,#list,formatters["start text dir %a, auto left before, embedded %a, autodir %a, triggered by class %a"](finish,embedded,autodir,d))
+ end
+ else
+ head, inserted = insert_node_before(head,current,new_textdir("+"..finish))
+ if trace_directions then
+ insert(list,#list,formatters["start text dir %a, auto left before, embedded %a, autodir %a, triggered by class %a"](finish,embedded,autodir,d))
+ end
+ end
+ end
+
+ local function force_auto_right_before(d)
+ if finish then
+ finish_auto_before()
+ end
+ if embedded <= 0 then
+ finish, autodir, done = "TRT", -1
+ else
+ finish, autodir, done = "TLT", 1
+ end
+ done = true
+ if finidir == finish then
+ head = remove_node(head,finished,true)
+ if trace_directions then
+ list[finipos] = list[finipos] .. ", deleted afterwards"
+ insert(list,#list,formatters["start text dir %a, auto right before, embedded %a, autodir %a, triggered by class %a"](finish,embedded,autodir,d))
+ end
+ else
+ head, inserted = insert_node_before(head,current,new_textdir("+"..finish))
+ if trace_directions then
+ insert(list,#list,formatters["start text dir %a, auto right before, embedded %a, autodir %a, triggered by class %a"](finish,embedded,autodir,d))
+ end
+ end
+ end
+
+ local function nextisright(current)
+ -- repeat
+ current = current.next
+ local id = current.id
+ if id == glyph_code then
+ local char = current.char
+ local d = chardirections[char]
+ return d == "r" or d == "al" or d == "an"
+ -- elseif id == glue_code or id == kern_code or id == penalty_code then
+ -- -- too complex
+ -- else
+ -- return
+ end
+ -- until not current
+ end
+
+ local function previsright(current)
+ -- repeat
+ current = current.prev
+ local id = current.id
+ if id == glyph_code then
+ local char = current.char
+ local d = chardirections[char]
+ return d == "r" or d == "al" or d == "an"
+ -- elseif id == glue_code or id == kern_code or id == penalty_code then
+ -- -- too complex
+ -- else
+ -- return
+ end
+ -- until not current
+ end
+
+ while current do
+ local id = current.id
+ -- list[#list+1] = formatters["state: node %a, finish %a, autodir %a, embedded %a"](nutstring(current),finish or "unset",autodir,embedded)
+ if id == math_code then
+ current = end_of_math(current.next).next
+ else
+ local attr = current[attribute]
+ if attr and attr > 0 and attr ~= prevattr then
+ if getglobal(a) then
+ -- bidi parsing mode
+ else
+ -- local
+ if trace_directions and
+ current ~= head then list[#list+1] = formatters["override reset, bidi %a"](attr)
+ end
+ lro, rlo = false, false
+ end
+ prevattr = attr
+ end
+ -- if attr and attr > 0 then
+ -- if attr == 1 then
+ -- -- bidi parsing mode
+ -- elseif attr ~= prevattr then
+ -- -- no pop, grouped driven (2=normal,3=lro,4=rlo)
+ -- if attr == 3 then
+ -- if trace_directions then
+ -- list[#list+1] = formatters["override right -> left (lro), bidi %a"](attr)
+ -- end
+ -- lro, rlo = true, false
+ -- elseif attr == 4 then
+ -- if trace_directions then
+ -- list[#list+1] = formatters["override left -> right (rlo), bidi %a"](attr)
+ -- end
+ -- lro, rlo = false, true
+ -- else
+ -- if trace_directions and
+ -- current ~= head then list[#list+1] = formatters["override reset, bidi %a"](attr)
+ -- end
+ -- lro, rlo = false, false
+ -- end
+ -- prevattr = attr
+ -- end
+ -- end
+ if id == glyph_code then
+ glyphs = true
+ if attr and attr > 0 then
+ local char = current.char
+ local d = chardirections[char]
+ if rlo or override > 0 then
+ if d == "l" then
+ if trace_directions then
+ list[#list+1] = formatters["char %C of class %a overridden to r, bidi %a)"](char,d,attr)
+ end
+ d = "r"
+ elseif trace_directions then
+ if d == "lro" or d == "rlo" or d == "pdf" then -- else side effects on terminal
+ list[#list+1] = formatters["override char of class %a, bidi %a"](d,attr)
+ else -- todo: rle lre
+ list[#list+1] = formatters["char %C of class %a, bidi %a"](char,d,attr)
+ end
+ end
+ elseif lro or override < 0 then
+ if d == "r" or d == "al" then
+ current[a_state] = s_isol -- maybe better have a special bidi attr value -> override (9) -> todo
+ if trace_directions then
+ list[#list+1] = formatters["char %C of class %a overridden to l, bidi %a, state 'isol'"](char,d,attr)
+ end
+ d = "l"
+ elseif trace_directions then
+ if d == "lro" or d == "rlo" or d == "pdf" then -- else side effects on terminal
+ list[#list+1] = formatters["override char of class %a, bidi %a"](d,attr)
+ else -- todo: rle lre
+ list[#list+1] = formatters["char %C of class %a, bidi %a"](char,d,attr)
+ end
+ end
+ elseif trace_directions then
+ if d == "lro" or d == "rlo" or d == "pdf" then -- else side effects on terminal
+ list[#list+1] = formatters["override char of class %a, bidi %a"](d,attr)
+ else -- todo: rle lre
+ list[#list+1] = formatters["char %C of class %a, bidi %a"](char,d,attr)
+ end
+ end
+ if d == "on" then
+ local mirror = charmirrors[char]
+ if mirror and fontchar[current.font][mirror] then
+ -- todo: set attribute
+ local class = charclasses[char]
+ if class == "open" then
+ if nextisright(current) then
+ if autodir >= 0 then
+ force_auto_right_before(d)
+ end
+ current.char = mirror
+ done = true
+ else
+ mirror = nil
+ if autodir <= 0 then
+ force_auto_left_before(d)
+ end
+ end
+ elseif class == "close" then
+ if previsright(current) then
+ current.char = mirror
+ done = true
+ else
+ mirror = nil
+ end
+ elseif autodir < 0 then
+ current.char = mirror
+ done = true
+ else
+ mirror = nil
+ end
+ if trace_directions then
+ if mirror then
+ list[#list+1] = formatters["mirroring char %C of class %a to %C, autodir %a, bidi %a"](char,d,mirror,autodir,attr)
+ else
+ list[#list+1] = formatters["not mirroring char %C of class %a, autodir %a, bidi %a"](char,d,autodir,attr)
+ end
+ end
+ end
+ elseif d == "l" or d == "en" then -- european number
+ if autodir <= 0 then -- could be option
+ force_auto_left_before(d)
+ end
+ elseif d == "r" or d == "al" then -- arabic number
+ if autodir >= 0 then
+ force_auto_right_before(d)
+ end
+ elseif d == "an" then -- arabic number
+ -- actually this is language dependent ...
+ -- if autodir <= 0 then
+ -- force_auto_left_before(d)
+ -- end
+ if autodir >= 0 then
+ force_auto_right_before(d)
+ end
+ elseif d == "lro" then -- Left-to-Right Override -> right becomes left
+ if trace_directions then
+ list[#list+1] = "override right -> left"
+ end
+ top = top + 1
+ stack[top] = { override, embedded }
+ override = -1
+ obsolete[#obsolete+1] = current
+ elseif d == "rlo" then -- Right-to-Left Override -> left becomes right
+ if trace_directions then
+ list[#list+1] = "override left -> right"
+ end
+ top = top + 1
+ stack[top] = { override, embedded }
+ override = 1
+ obsolete[#obsolete+1] = current
+ elseif d == "lre" then -- Left-to-Right Embedding -> TLT
+ if trace_directions then
+ list[#list+1] = "embedding left -> right"
+ end
+ top = top + 1
+ stack[top] = { override, embedded }
+ embedded = 1
+ obsolete[#obsolete+1] = current
+ elseif d == "rle" then -- Right-to-Left Embedding -> TRT
+ if trace_directions then
+ list[#list+1] = "embedding right -> left"
+ end
+ top = top + 1
+ stack[top] = { override, embedded }
+ embedded = -1 -- was 1
+ obsolete[#obsolete+1] = current
+ elseif d == "pdf" then -- Pop Directional Format
+ -- override = 0
+ if top > 0 then
+ local s = stack[top]
+ override, embedded = s[1], s[2]
+ top = top - 1
+ if trace_directions then
+ list[#list+1] = formatters["state: override %a, embedded %a, autodir %a"](override,embedded,autodir)
+ end
+ else
+ if trace_directions then
+ list[#list+1] = "pop error: too many pops"
+ end
+ end
+ obsolete[#obsolete+1] = current
+ end
+ elseif trace_directions then
+ local char = current.char
+ local d = chardirections[char]
+ list[#list+1] = formatters["char %C of class %a, bidi %a"](char,d or "?")
+ end
+ elseif id == whatsit_code then
+ -- we have less directions now so we can do hard checks for strings instead of splitting into pieces
+ if finish then
+ finish_auto_before()
+ end
+ local subtype = current.subtype
+ if subtype == localpar_code then
+ -- if false then
+ local dir = current.dir
+ if dir == 'TRT' then
+ autodir = -1
+ elseif dir == 'TLT' then
+ autodir = 1
+ end
+ -- embedded = autodir
+ if trace_directions then
+ list[#list+1] = formatters["pardir %a"](dir)
+ end
+ -- end
+ elseif subtype == dir_code then
+ local dir = current.dir
+ if dir == "+TRT" then
+ finish, autodir = "TRT", -1
+ elseif dir == "-TRT" then
+ finish, autodir = nil, 0
+ elseif dir == "+TLT" then
+ finish, autodir = "TLT", 1
+ elseif dir == "-TLT" then
+ finish, autodir = nil, 0
+ end
+ if trace_directions then
+ list[#list+1] = formatters["textdir %a, autodir %a"](dir,autodir)
+ end
+ end
+ else
+ if trace_directions then
+ list[#list+1] = formatters["node %a, subtype %a"](nodecodes[id],current.subtype)
+ end
+ if finish then
+ finish_auto_before()
+ end
+ end
+ local cn = current.next
+ if not cn then
+ if finish then
+ finish_auto_after()
+ end
+ end
+ current = cn
+ end
+ end
+
+ if trace_directions and glyphs then
+ report_directions("start log")
+ for i=1,#list do
+ report_directions("%02i: %s",i,list[i])
+ end
+ report_directions("stop log")
+ end
+
+ if done and strip then
+ local n = #obsolete
+ if n > 0 then
+ for i=1,n do
+ remove_node(head,obsolete[i],true)
+ end
+ report_directions("%s character nodes removed",n)
+ end
+ end
+
+ return head, done
+
+end
+
+directions.installhandler(interfaces.variables.default,process)
+
diff --git a/tex/context/base/typo-dir.lua b/tex/context/base/typo-dir.lua
index 939850e81..04528f137 100644
--- a/tex/context/base/typo-dir.lua
+++ b/tex/context/base/typo-dir.lua
@@ -26,42 +26,6 @@ if not modules then modules = { } end modules ['typo-dir'] = {
-- = half tagging (the current implementation)
-- = unicode version x interpretation (several depending on the evolution)
--- Some analysis by Idris:
---
--- 1. Assuming the reading- vs word-order distinction (bidi-char types) is governing;
--- 2. Assuming that 'ARAB' represents an actual arabic string in raw input order, not word-order;
--- 3. Assuming that 'BARA' represent the correct RL word order;
---
--- Then we have, with input: LATIN ARAB
---
--- \textdir TLT LATIN ARAB => LATIN BARA
--- \textdir TRT LATIN ARAB => LATIN BARA
--- \textdir TRT LRO LATIN ARAB => LATIN ARAB
--- \textdir TLT LRO LATIN ARAB => LATIN ARAB
--- \textdir TLT RLO LATIN ARAB => NITAL ARAB
--- \textdir TRT RLO LATIN ARAB => NITAL ARAB
-
--- elseif d == "es" then -- European Number Separator
--- elseif d == "et" then -- European Number Terminator
--- elseif d == "cs" then -- Common Number Separator
--- elseif d == "nsm" then -- Non-Spacing Mark
--- elseif d == "bn" then -- Boundary Neutral
--- elseif d == "b" then -- Paragraph Separator
--- elseif d == "s" then -- Segment Separator
--- elseif d == "ws" then -- Whitespace
--- elseif d == "on" then -- Other Neutrals
-
--- todo : delayed inserts here
--- todo : get rid of local functions here
--- beware: math adds whatsits afterwards so that will mess things up
--- todo : use new dir functions
--- todo : make faster
--- todo : also use end_of_math here?
--- todo : use lpeg instead of match
--- todo : move dir info into nodes
--- todo : swappable tables and floats i.e. start-end overloads (probably loop in builders)
--- todo : check if we still have crashes in luatex when non-matched (used to be the case)
--- todo : look into the (new) unicode logic (non intuitive stuff)
local next, type = next, type
local format, insert, sub, find, match = string.format, table.insert, string.sub, string.find, string.match
@@ -192,7 +156,7 @@ local function getmethod(a)
end
directions.tomode = tomode
-directions.getscope = getscope
+directions.getglobal = getglobal
directions.getfences = getfences
directions.getmethod = getmethod
directions.installhandler = installhandler
@@ -201,374 +165,6 @@ function commands.getbidimode(specification)
context(tomode(specification)) -- hash at tex end
end
-local function process_direct(namespace,attribute,start)
-
- local head = start
-
- local current, inserted = head, nil
- local finish, autodir, embedded, override, done = nil, 0, 0, 0, false
- local list, glyphs = trace_textdirections and { }, false
- local finished, finidir, finipos = nil, nil, 1
- local stack, top, obsolete = { }, 0, { }
- local lro, rlo, prevattr = false, false, 0
-
- local function finish_auto_before()
- local fdir = finish == "TRT" and "-TRT" or "-TLT"
- head, inserted = insert_node_before(head,current,new_textdir(fdir))
- finished, finidir, autodir = inserted, finish, 0
- if trace_textdirections then
- insert(list,#list,formatters["auto %a inserted before, autodir %a, embedded %a"](fdir,autodir,embedded))
- finipos = #list - 1
- end
- finish, done = nil, true
- end
-
- local function finish_auto_after()
- local fdir = finish == "TRT" and "-TRT" or "-TLT"
- head, current = insert_node_after(head,current,new_textdir(fdir))
- finished, finidir, autodir = current, finish, 0
- if trace_textdirections then
- list[#list+1] = formatters["auto %a inserted after, autodir %a, embedded %a"](fdir,autodir,embedded)
- finipos = #list
- end
- finish, done = nil, true
- end
-
- local function force_auto_left_before(d)
- if finish then
- finish_auto_before()
- end
- if embedded >= 0 then
- finish, autodir = "TLT", 1
- else
- finish, autodir = "TRT", -1
- end
- done = true
- if finidir == finish then
- head = remove_node(head,finished,true)
- if trace_textdirections then
- list[finipos] = list[finipos] .. ", deleted afterwards"
- insert(list,#list,formatters["start text dir %a, auto left before, embedded %a, autodir %a, triggered by class %a"](finish,embedded,autodir,d))
- end
- else
- head, inserted = insert_node_before(head,current,new_textdir("+"..finish))
- if trace_textdirections then
- insert(list,#list,formatters["start text dir %a, auto left before, embedded %a, autodir %a, triggered by class %a"](finish,embedded,autodir,d))
- end
- end
- end
-
- local function force_auto_right_before(d)
- if finish then
- finish_auto_before()
- end
- if embedded <= 0 then
- finish, autodir, done = "TRT", -1
- else
- finish, autodir, done = "TLT", 1
- end
- done = true
- if finidir == finish then
- head = remove_node(head,finished,true)
- if trace_textdirections then
- list[finipos] = list[finipos] .. ", deleted afterwards"
- insert(list,#list,formatters["start text dir %a, auto right before, embedded %a, autodir %a, triggered by class %a"](finish,embedded,autodir,d))
- end
- else
- head, inserted = insert_node_before(head,current,new_textdir("+"..finish))
- if trace_textdirections then
- insert(list,#list,formatters["start text dir %a, auto right before, embedded %a, autodir %a, triggered by class %a"](finish,embedded,autodir,d))
- end
- end
- end
-
- local function nextisright(current)
- -- repeat
- current = current.next
- local id = current.id
- if id == glyph_code then
- local char = current.char
- local d = chardirections[char]
- return d == "r" or d == "al" or d == "an"
- -- elseif id == glue_code or id == kern_code or id == penalty_code then
- -- -- too complex
- -- else
- -- return
- end
- -- until not current
- end
-
- local function previsright(current)
- -- repeat
- current = current.prev
- local id = current.id
- if id == glyph_code then
- local char = current.char
- local d = chardirections[char]
- return d == "r" or d == "al" or d == "an"
- -- elseif id == glue_code or id == kern_code or id == penalty_code then
- -- -- too complex
- -- else
- -- return
- end
- -- until not current
- end
-
- while current do
- local id = current.id
- -- list[#list+1] = formatters["state: node %a, finish %a, autodir %a, embedded %a"](nutstring(current),finish or "unset",autodir,embedded)
- if id == math_code then
- current = end_of_math(current.next).next
- else
- local attr = current[attribute]
- if attr and attr > 0 then
- -- current[attribute] = unsetvalue -- slow, needed?
- if attr == 1 then
- -- bidi parsing mode
- elseif attr ~= prevattr then
- -- no pop, grouped driven (2=normal,3=lro,4=rlo)
- if attr == 3 then
- if trace_textdirections then
- list[#list+1] = formatters["override right -> left (lro), bidi %a"](attr)
- end
- lro, rlo = true, false
- elseif attr == 4 then
- if trace_textdirections then
- list[#list+1] = formatters["override left -> right (rlo), bidi %a"](attr)
- end
- lro, rlo = false, true
- else
- if trace_textdirections and
- current ~= head then list[#list+1] = formatters["override reset, bidi %a"](attr)
- end
- lro, rlo = false, false
- end
- prevattr = attr
- end
- end
- if id == glyph_code then
- glyphs = true
- if attr and attr > 0 then
- local char = current.char
- local d = chardirections[char]
- if rlo or override > 0 then
- if d == "l" then
- if trace_textdirections then
- list[#list+1] = formatters["char %C of class %a overridden to r, bidi %a)"](char,d,attr)
- end
- d = "r"
- elseif trace_textdirections then
- if d == "lro" or d == "rlo" or d == "pdf" then -- else side effects on terminal
- list[#list+1] = formatters["override char of class %a, bidi %a"](d,attr)
- else -- todo: rle lre
- list[#list+1] = formatters["char %C of class %a, bidi %a"](char,d,attr)
- end
- end
- elseif lro or override < 0 then
- if d == "r" or d == "al" then
- current[a_state] = s_isol -- maybe better have a special bidi attr value -> override (9) -> todo
- if trace_textdirections then
- list[#list+1] = formatters["char %C of class %a overridden to l, bidi %a, state 'isol'"](char,d,attr)
- end
- d = "l"
- elseif trace_textdirections then
- if d == "lro" or d == "rlo" or d == "pdf" then -- else side effects on terminal
- list[#list+1] = formatters["override char of class %a, bidi %a"](d,attr)
- else -- todo: rle lre
- list[#list+1] = formatters["char %C of class %a, bidi %a"](char,d,attr)
- end
- end
- elseif trace_textdirections then
- if d == "lro" or d == "rlo" or d == "pdf" then -- else side effects on terminal
- list[#list+1] = formatters["override char of class %a, bidi %a"](d,attr)
- else -- todo: rle lre
- list[#list+1] = formatters["char %C of class %a, bidi %a"](char,d,attr)
- end
- end
- if d == "on" then
- local mirror = charmirrors[char]
- if mirror and fontchar[current.font][mirror] then
- -- todo: set attribute
- local class = charclasses[char]
- if class == "open" then
- if nextisright(current) then
- if autodir >= 0 then
- force_auto_right_before(d)
- end
- current.char = mirror
- done = true
- else
- mirror = nil
- if autodir <= 0 then
- force_auto_left_before(d)
- end
- end
- elseif class == "close" then
- if previsright(current) then
- current.char = mirror
- done = true
- else
- mirror = nil
- end
- elseif autodir < 0 then
- current.char = mirror
- done = true
- else
- mirror = nil
- end
- if trace_textdirections then
- if mirror then
- list[#list+1] = formatters["mirroring char %C of class %a to %C, autodir %a, bidi %a"](char,d,mirror,autodir,attr)
- else
- list[#list+1] = formatters["not mirroring char %C of class %a, autodir %a, bidi %a"](char,d,autodir,attr)
- end
- end
- end
- elseif d == "l" or d == "en" then -- european number
- if autodir <= 0 then -- could be option
- force_auto_left_before(d)
- end
- elseif d == "r" or d == "al" then -- arabic number
- if autodir >= 0 then
- force_auto_right_before(d)
- end
- elseif d == "an" then -- arabic number
- -- actually this is language dependent ...
- -- if autodir <= 0 then
- -- force_auto_left_before(d)
- -- end
- if autodir >= 0 then
- force_auto_right_before(d)
- end
- elseif d == "lro" then -- Left-to-Right Override -> right becomes left
- if trace_textdirections then
- list[#list+1] = "override right -> left"
- end
- top = top + 1
- stack[top] = { override, embedded }
- override = -1
- obsolete[#obsolete+1] = current
- elseif d == "rlo" then -- Right-to-Left Override -> left becomes right
- if trace_textdirections then
- list[#list+1] = "override left -> right"
- end
- top = top + 1
- stack[top] = { override, embedded }
- override = 1
- obsolete[#obsolete+1] = current
- elseif d == "lre" then -- Left-to-Right Embedding -> TLT
- if trace_textdirections then
- list[#list+1] = "embedding left -> right"
- end
- top = top + 1
- stack[top] = { override, embedded }
- embedded = 1
- obsolete[#obsolete+1] = current
- elseif d == "rle" then -- Right-to-Left Embedding -> TRT
- if trace_textdirections then
- list[#list+1] = "embedding right -> left"
- end
- top = top + 1
- stack[top] = { override, embedded }
- embedded = -1 -- was 1
- obsolete[#obsolete+1] = current
- elseif d == "pdf" then -- Pop Directional Format
- -- override = 0
- if top > 0 then
- local s = stack[top]
- override, embedded = s[1], s[2]
- top = top - 1
- if trace_textdirections then
- list[#list+1] = formatters["state: override %a, embedded %a, autodir %a"](override,embedded,autodir)
- end
- else
- if trace_textdirections then
- list[#list+1] = "pop error: too many pops"
- end
- end
- obsolete[#obsolete+1] = current
- end
- elseif trace_textdirections then
- local char = current.char
- local d = chardirections[char]
- list[#list+1] = formatters["char %C of class %a, bidi %a"](char,d or "?")
- end
- elseif id == whatsit_code then
- -- we have less directions now so we can do hard checks for strings instead of splitting into pieces
- if finish then
- finish_auto_before()
- end
- local subtype = current.subtype
- if subtype == localpar_code then
- -- if false then
- local dir = current.dir
- if dir == 'TRT' then
- autodir = -1
- elseif dir == 'TLT' then
- autodir = 1
- end
- -- embedded = autodir
- if trace_textdirections then
- list[#list+1] = formatters["pardir %a"](dir)
- end
- -- end
- elseif subtype == dir_code then
- local dir = current.dir
- if dir == "+TRT" then
- finish, autodir = "TRT", -1
- elseif dir == "-TRT" then
- finish, autodir = nil, 0
- elseif dir == "+TLT" then
- finish, autodir = "TLT", 1
- elseif dir == "-TLT" then
- finish, autodir = nil, 0
- end
- if trace_textdirections then
- list[#list+1] = formatters["textdir %a, autodir %a"](dir,autodir)
- end
- end
- else
- if trace_textdirections then
- list[#list+1] = formatters["node %a, subtype %a"](nodecodes[id],current.subtype)
- end
- if finish then
- finish_auto_before()
- end
- end
- local cn = current.next
- if not cn then
- if finish then
- finish_auto_after()
- end
- end
- current = cn
- end
- end
-
- if trace_textdirections and glyphs then
- report_textdirections("start log")
- for i=1,#list do
- report_textdirections("%02i: %s",i,list[i])
- end
- report_textdirections("stop log")
- end
-
- if done and strip then
- local n = #obsolete
- if n > 0 then
- for i=1,n do
- remove_node(head,obsolete[i],true)
- end
- report_textdirections("%s character nodes removed",n)
- end
- end
-
- return head, done
-
-end
-
-installhandler(variables.default,process_direct)
-
function directions.process(namespace,attribute,head) -- nodes not nuts
if not head.next then
return head, false
@@ -613,119 +209,3 @@ directions.handler = nodes.installattributehandler {
namespace = directions,
processor = directions.process,
}
-
--- As I'm wrapping up the updated math support (for CTX/TUG 2013) I wondered about numbers in
--- r2l math mode. Googling lead me to TUGboat, Volume 25 (2004), No. 2 where I see numbers
--- running from left to right. Makes me wonder how far we should go. And as I was looking
--- into bidi anyway, it's a nice distraction.
---
--- I first tried to hook something into noads but that gets pretty messy due to indirectness
--- char noads. If needed, I'll do it that way. With regards to spacing: as we can assume that
--- only numbers are involved we can safely swap them and the same is true for mirroring. But
--- anyway, I'm not too happy with this solution so eventually I'll do something with noads (as
--- an alternative method).
-
-local function processmath(head)
- local current = head
- local done = false
- local start = nil
- local stop = nil
- local function capsulate()
- head = insert_node_before(head,start,new_textdir("+TLT"))
- insert_node_after(head,stop,new_textdir("-TLT"))
- if trace_mathdirections then
- report_mathdirections("reversed: %s",nodes.listtoutf(start,false,false,stop))
- end
- done = true
- start = false
- stop = nil
- end
- while current do
- local id = current.id
- if id == glyph_code then
- local char = current.char
- local cdir = chardirections[char]
- if cdir == "en" or cdir == "an" then -- we could check for mathclass punctuation
- if not start then
- start = current
- end
- stop = current
- else
- if not start then
- -- nothing
- elseif start == stop then
- start = nil
- else
- capsulate()
- end
- if cdir == "on" then
- local mirror = charmirrors[char]
- if mirror then
- local class = charclasses[char]
- if class == "open" or class == "close" then
- current.char = mirror
- if trace_mathdirections then
- report_mathdirections("mirrored: %C to %C",char,mirror)
- end
- done = true
- end
- end
- end
- end
- elseif not start then
- -- nothing
- elseif start == stop then
- start = nil
- else
- capsulate(head,start,stop)
- -- math can pack things into hlists .. we need to make sure we don't process
- -- too often: needs checking
- if id == hlist_code or id == vlist_code then
- local list, d = processmath(current.list)
- current.list = list
- if d then
- done = true
- end
- end
- end
- current = current.next
- end
- if not start then
- -- nothing
- elseif start == stop then
- -- nothing
- else
- capsulate()
- end
- return head, done
-end
-
-local enabled = false
-
-function directions.processmath(head) -- style, penalties
- if enabled then
- local a = head[a_mathbidi]
- if a and a > 0 then
- return processmath(head)
- end
- end
- return head, false
-end
-
-function directions.setmath(n)
- if not enabled and n and n > 0 then
- if trace_mathdirections then
- report_mathdirections("enabling directions handler")
- end
- nodes.tasks.enableaction("math","typesetters.directions.processmath")
- enabled = true
- end
-end
-
-commands.setmathdirection = directions.setmath
-
--- directions.mathhandler = nodes.installattributehandler {
--- name = "directions",
--- namespace = directions,
--- processor = directions.processmath,
--- }
diff --git a/tex/context/base/typo-dir.mkiv b/tex/context/base/typo-dir.mkiv
index 4dee24c53..2229ed37c 100644
--- a/tex/context/base/typo-dir.mkiv
+++ b/tex/context/base/typo-dir.mkiv
@@ -16,13 +16,14 @@
\unprotect
\registerctxluafile{typo-dir}{1.001}
+\registerctxluafile{typo-dha}{1.001}
+\registerctxluafile{typo-dua}{1.001}
+\registerctxluafile{typo-dub}{1.001}
\definesystemattribute[directions][public]
\installcorenamespace{directions}
\installcorenamespace{directionsbidimode}
-\installcorenamespace{directionsbidimethod}
-\installcorenamespace{directionsbidifences}
% plural as we can have a combination but maybe better singular
@@ -40,22 +41,10 @@
\newconstant\directionsbidimode % this one might become pivate
-% local modes = {
-% method = 1024, -- not used
-% global = 2048,
-% fences = 4096,
-% }
-
-% a = 0
-% a = a + modes.fences
-% a = a + modes.global
-% a = a + 2 -- method 2
-
-% print(a)
-
-% print(number.hasbit(a,modes.fences))
-% print(number.hasbit(a,modes.global))
-% print(a % modes.method)
+% \setupdirections[bidi=global,method=default]
+% \setupdirections[bidi=global,method=one]
+% \setupdirections[bidi=global,method=two]
+% \setupdirections[bidi=global,method=two,fences=no]
\def\typo_dir_get_mode
{\def\currentbidimode{\ctxcommand{getbidimode {
diff --git a/tex/context/base/typo-uba.lua b/tex/context/base/typo-uba.lua
deleted file mode 100644
index 3cfb7994b..000000000
--- a/tex/context/base/typo-uba.lua
+++ /dev/null
@@ -1,782 +0,0 @@
-if not modules then modules = { } end modules ['typo-uba'] = {
- version = 1.001,
- comment = "companion to typo-dir.mkiv",
- author = "Hans Hagen, PRAGMA-ADE, Hasselt NL",
- copyright = "PRAGMA ADE / ConTeXt Development Team / See below",
- license = "see context related readme files / whatever applies",
- comment = "Unicode bidi (sort of) variant a",
- derived = "derived from t-bidi by Khaled Hosny who derived from minibidi.c by Arabeyes",
-}
-
--- Comment by Khaled Hosny:
---
--- This code started as a line for line translation of Arabeyes' minibidi.c from C to Lua,
--- excluding parts that of no use to us like shaping. The C code is Copyright (c) 2004
--- Ahmad Khalifa, and is distributed under the MIT Licence. The full license text can be
--- found at: http://svn.arabeyes.org/viewvc/projects/adawat/minibidi/LICENCE.
---
--- Comment by Hans Hagen:
---
--- The initial conversion to Lua has been done by Khaled Hosny. As a first step I optimized the
--- code (to suit todays context mkiv). Next I fixed the foreign object handling, for instance,
--- we can skip over math but we need to inject before the open math node and after the close node,
--- so we need to keep track of the endpoint. After I fixed that bit I realized that it was possible
--- to generalize the object skipper if only because it saves memory (and processing time). The
--- current implementation is about three times as fast (roughly measured) and I can probably squeeze
--- out some more, only to sacrifice soem when I start adding features. A next stage will be to have
--- more granularity in foreign objects. Of course all errors are mine. I'll also added the usual bit
--- of context tracing and reshuffled some code. A memory optimization is on the agenda (already sort
--- of prepared). It is no longer line by line.
---
--- The first implementation of bidi in context started out from examples of mixed usage (including
--- more than text) with an at that point bugged r2l support. It has some alternatives for letting
--- the tex markup having a bit higher priority. I will probably add some local (style driven)
--- overrides to the following code as well. It also means that we can selectively enable and disable
--- the parser (because a document wide appliance migh tnot be what we want). This will bring a
--- slow down but not that much. (I need to check with Idris why we have things like isol there.)
---
--- We'll probably keep multiple methods around (this is just a side track of improving the already
--- available scanner). I need to look into the changed unicode recomendations anyway as a first
--- impression is that some fuzzyness has been removed. I finally need to spend time on those specs. So,
--- there will be a third variant (written from scratch) so some point. The fun about TeX is that we
--- can provide alternative solutions (given that it doesn't bloat the engine!)
---
--- A test with some hebrew, mixed with hboxes with latin/hebrew and simple math. In fact this triggered
--- playing with bidi again:
---
--- 0.11 : nothing
--- 0.14 : 0.03 node list only, one pass
--- 0.23 : 0.12 close to unicode bidi, multipass
--- 0.44 : 0.33 original previous
---
--- todo: check for introduced errors
--- todo: reuse list, we have size, so we can just change values (and auto allocate when not there)
--- todo: reuse the stack
--- todo: no need for a max check
--- todo: collapse bound similar ranges (not ok yet)
--- tood: combine some sweeps
-
-local insert, remove, unpack, concat = table.insert, table.remove, table.unpack, table.concat
-local utfchar = utf.char
-local formatters = string.formatters
-
-local directiondata = characters.directions
-local mirrordata = characters.mirrors
-
-local remove_node = nodes.remove
-local insert_node_after = nodes.insert_after
-local insert_node_before = nodes.insert_before
-
-local nodepool = nodes.pool
-local new_textdir = nodepool.textdir
-
-local nodecodes = nodes.nodecodes
-local whatsitcodes = nodes.whatsitcodes
-local skipcodes = nodes.skipcodes
-
-local glyph_code = nodecodes.glyph
-local glue_code = nodecodes.glue
-local hlist_code = nodecodes.hlist
-local vlist_code = nodecodes.vlist
-local math_code = nodecodes.math
-local whatsit_code = nodecodes.whatsit
-local dir_code = whatsitcodes.dir
-local localpar_code = whatsitcodes.localpar
-local parfillskip_code = skipcodes.skipcodes
-
------ object_replacement = 0xFFFC -- object replacement character
-local maximum_stack = 60 -- probably spec but not needed
-
-local setcolor = nodes.tracers.colors.set
-local resetcolor = nodes.tracers.colors.reset
-
-local directions = typesetters.directions
-
-local a_directions = attributes.private('directions')
-
-local remove_controls = true directives.register("typesetters.directions.one.removecontrols",function(v) remove_controls = v end)
-
-local trace_directions = false trackers .register("typesetters.directions.one", function(v) trace_directions = v end)
-local trace_details = false trackers .register("typesetters.directions.one.details", function(v) trace_details = v end)
-
-local report_directions = logs.reporter("typesetting","directions one")
-
-local whitespace = {
- lre = true,
- rle = true,
- lro = true,
- rlo = true,
- pdf = true,
- bn = true,
- ws = true,
-}
-
-local b_s_ws_on = {
- b = true,
- s = true,
- ws = true,
- on = true
-}
-
--- tracing
-
-local function show_list(list,size,what)
- local what = what or "direction"
- local joiner = utfchar(0x200C)
- local result = { }
- for i=1,size do
- local entry = list[i]
- local character = entry.char
- local direction = entry[what]
- if character == 0xFFFC then
- local first = entry.id
- local last = entry.last
- local skip = entry.skip
- if last then
- result[i] = formatters["%-3s:%s %s..%s (%i)"](direction,joiner,nodecodes[first],nodecodes[last],skip or 0)
- else
- result[i] = formatters["%-3s:%s %s (%i)"](direction,joiner,nodecodes[first],skip or 0)
- end
- elseif character >= 0x202A and character <= 0x202C then
- result[i] = formatters["%-3s:%s %U"](direction,joiner,character)
- else
- result[i] = formatters["%-3s:%s %c %U"](direction,joiner,character,character)
- end
- end
- return concat(result,joiner .. " | " .. joiner)
-end
-
--- preparation
-
-local function show_done(list,size)
- local joiner = utfchar(0x200C)
- local result = { }
- for i=1,size do
- local entry = list[i]
- local character = entry.char
- local begindir = entry.begindir
- local enddir = entry.enddir
- if begindir then
- result[#result+1] = formatters["<%s>"](begindir)
- end
- if entry.remove then
- -- continue
- elseif character == 0xFFFC then
- result[#result+1] = formatters["<%s>"]("?")
- elseif character == 0x0020 then
- result[#result+1] = formatters["<%s>"](" ")
- elseif character >= 0x202A and character <= 0x202C then
- result[#result+1] = formatters["<%s>"](entry.original)
- else
- result[#result+1] = utfchar(character)
- end
- if enddir then
- result[#result+1] = formatters["<%s>"](enddir)
- end
- end
- return concat(result,joiner)
-end
-
--- keeping the list and overwriting doesn't save much runtime, only a few percent
--- char is only used for mirror, so in fact we can as well only store it for
--- glyphs only
-
-local function build_list(head) -- todo: store node pointer ... saves loop
- -- P1
- local current = head
- local list = { }
- local size = 0
- while current do
- size = size + 1
- local id = current.id
- if id == glyph_code then
- local chr = current.char
- local dir = directiondata[chr]
- list[size] = { char = chr, direction = dir, original = dir, level = 0 }
- current = current.next
- elseif id == glue_code then
- list[size] = { char = 0x0020, direction = "ws", original = "ws", level = 0 }
- current = current.next
- elseif id == whatsit_code and current.subtype == dir_code then
- local dir = current.dir
- if dir == "+TLT" then
- list[size] = { char = 0x202A, direction = "lre", original = "lre", level = 0 }
- elseif dir == "+TRT" then
- list[size] = { char = 0x202B, direction = "rle", original = "rle", level = 0 }
- elseif dir == "-TLT" or dir == "-TRT" then
- list[size] = { char = 0x202C, direction = "pdf", original = "pdf", level = 0 }
- else
- list[size] = { char = 0xFFFC, direction = "on", original = "on", level = 0, id = id } -- object replacement character
- end
- current = current.next
- elseif id == math_code then
- local skip = 0
- current = current.next
- while current.id ~= math_code do
- skip = skip + 1
- current = current.next
- end
- skip = skip + 1
- current = current.next
- list[size] = { char = 0xFFFC, direction = "on", original = "on", level = 0, skip = skip, id = id }
- else
- local skip = 0
- local last = id
- current = current.next
- while n do
- local id = current.id
- if id ~= glyph_code and id ~= glue_code and not (id == whatsit_code and current.subtype == dir_code) then
- skip = skip + 1
- last = id
- current = current.next
- else
- break
- end
- end
- if id == last then
- list[size] = { char = 0xFFFC, direction = "on", original = "on", level = 0, skip = skip, id = id }
- else
- list[size] = { char = 0xFFFC, direction = "on", original = "on", level = 0, skip = skip, id = id, last = last }
- end
- end
- end
- return list, size
-end
-
--- the action
-
--- local function find_run_limit_et(list,run_start,limit)
--- local run_limit = run_start
--- local i = run_start
--- while i <= limit and list[i].direction == "et" do
--- run_limit = i
--- i = i + 1
--- end
--- return run_limit
--- end
-
-local function find_run_limit_et(list,start,limit) -- returns last match
- for i=start,limit do
- if list[i].direction == "et" then
- start = i
- else
- return start
- end
- end
- return start
-end
-
--- local function find_run_limit_b_s_ws_on(list,run_start,limit)
--- local run_limit = run_start
--- local i = run_start
--- while i <= limit and b_s_ws_on[list[i].direction] do
--- run_limit = i
--- i = i + 1
--- end
--- return run_limit
--- end
-
-local function find_run_limit_b_s_ws_on(list,start,limit)
- for i=start,limit do
- if b_s_ws_on[list[i].direction] then
- start = i
- else
- return start
- end
- end
- return start
-end
-
--- directions.maindir = "r2l"
-
-local function get_baselevel(head,list,size) -- todo: skip if first is object (or pass head and test for local_par)
- local maindir = directions.maindir
- if maindir == "r2l" then
- return 1, "TRT", false
- elseif maindir == "l2r" then
- return 0, "TLT", false
- elseif head.id == whatsit_code and head.subtype == localpar_code then
- if head.dir == "TRT" then
- return 1, "TRT", true
- else
- return 0, "TLT", true
- end
- else
- -- P2, P3
- for i=1,size do
- local entry = list[i]
- local direction = entry.direction
- if direction == "r" or direction == "al" then
- return 1, "TRT", true
- elseif direction == "l" then
- return 0, "TLT", true
- end
- end
- return 0, "TLT", false
- end
-end
-
-local function resolve_explicit(list,size,baselevel)
- -- X1
- local level = baselevel
- local override = "on"
- local stack = { }
- local nofstack = 0
- for i=1,size do
- local entry = list[i]
- local direction = entry.direction
- -- X2
- if direction == "rle" then
- if nofstack < maximum_stack then
- nofstack = nofstack + 1
- stack[nofstack] = { level, override }
- level = level + (level % 2 == 1 and 2 or 1) -- least_greater_odd(level)
- override = "on"
- entry.level = level
- entry.direction = "bn"
- entry.remove = true
- elseif trace_directions then
- report_directions("stack overflow at position %a with direction %a",i,direction)
- end
- -- X3
- elseif direction == "lre" then
- if nofstack < maximum_stack then
- nofstack = nofstack + 1
- stack[nofstack] = { level, override }
- level = level + (level % 2 == 1 and 1 or 2) -- least_greater_even(level)
- override = "on"
- entry.level = level
- entry.direction = "bn"
- entry.remove = true
- elseif trace_directions then
- report_directions("stack overflow at position %a with direction %a",i,direction)
- end
- -- X4
- elseif direction == "rlo" then
- if nofstack < maximum_stack then
- nofstack = nofstack + 1
- stack[nofstack] = { level, override }
- level = level + (level % 2 == 1 and 2 or 1) -- least_greater_odd(level)
- override = "r"
- entry.level = level
- entry.direction = "bn"
- entry.remove = true
- elseif trace_directions then
- report_directions("stack overflow at position %a with direction %a",i,direction)
- end
- -- X5
- elseif direction == "lro" then
- if nofstack < maximum_stack then
- nofstack = nofstack + 1
- stack[nofstack] = { level, override }
- level = level + (level % 2 == 1 and 1 or 2) -- least_greater_even(level)
- override = "l"
- entry.level = level
- entry.direction = "bn"
- entry.remove = true
- elseif trace_directions then
- report_directions("stack overflow at position %a with direction %a",i,direction)
- end
- -- X7
- elseif direction == "pdf" then
- if nofstack < maximum_stack then
- local stacktop = stack[nofstack]
- nofstack = nofstack - 1
- level = stacktop[1]
- override = stacktop[2]
- entry.level = level
- entry.direction = "bn"
- entry.remove = true
- elseif trace_directions then
- report_directions("stack overflow at position %a with direction %a",i,direction)
- end
- -- X6
- else
- entry.level = level
- if override ~= "on" then
- entry.direction = override
- end
- end
- end
- -- X8 (reset states and overrides after paragraph)
-end
-
-local function resolve_weak(list,size,start,limit,sor,eor)
- -- W1
- for i=start,limit do
- local entry = list[i]
- if entry.direction == "nsm" then
- if i == start then
- entry.direction = sor
- else
- entry.direction = list[i-1].direction
- end
- end
- end
- -- W2
- for i=start,limit do
- local entry = list[i]
- if entry.direction == "en" then
- for j=i-1,start,-1 do
- local prev = list[j]
- local direction = prev.direction
- if direction == "al" then
- entry.direction = "an"
- break
- elseif direction == "r" or direction == "l" then
- break
- end
- end
- end
- end
- -- W3
- for i=start,limit do
- local entry = list[i]
- if entry.direction == "al" then
- entry.direction = "r"
- end
- end
- -- W4
- for i=start+1,limit-1 do
- local entry = list[i]
- local direction = entry.direction
- if direction == "es" then
- if list[i-1].direction == "en" and list[i+1].direction == "en" then
- entry.direction = "en"
- end
- elseif direction == "cs" then
- local prevdirection = list[i-1].direction
- if prevdirection == "en" then
- if list[i+1].direction == "en" then
- entry.direction = "en"
- end
- elseif prevdirection == "an" and list[i+1].direction == "an" then
- entry.direction = "an"
- end
- end
- end
- -- W5
- local i = start
- while i <= limit do
- if list[i].direction == "et" then
- local runstart = i
- local runlimit = find_run_limit_et(list,runstart,limit) -- when moved inline we can probably collapse a lot
- local rundirection = runstart == start and sor or list[runstart-1].direction
- if rundirection ~= "en" then
- rundirection = runlimit == limit and eor or list[runlimit+1].direction
- end
- if rundirection == "en" then
- for j=runstart,runlimit do
- list[j].direction = "en"
- end
- end
- i = runlimit
- end
- i = i + 1
- end
- -- W6
- for i=start,limit do
- local entry = list[i]
- local direction = entry.direction
- if direction == "es" or direction == "et" or direction == "cs" then
- entry.direction = "on"
- end
- end
- -- W7
- for i=start,limit do
- local entry = list[i]
- if entry.direction == "en" then
- local prev_strong = sor
- for j=i-1,start,-1 do
- local direction = list[j].direction
- if direction == "l" or direction == "r" then
- prev_strong = direction
- break
- end
- end
- if prev_strong == "l" then
- entry.direction = "l"
- end
- end
- end
-end
-
-local function resolve_neutral(list,size,start,limit,sor,eor)
- -- N1, N2
- for i=start,limit do
- local entry = list[i]
- if b_s_ws_on[entry.direction] then
- local leading_direction, trailing_direction, resolved_direction
- local runstart = i
- local runlimit = find_run_limit_b_s_ws_on(list,runstart,limit)
- if runstart == start then
- leading_direction = sor
- else
- leading_direction = list[runstart-1].direction
- if leading_direction == "en" or leading_direction == "an" then
- leading_direction = "r"
- end
- end
- if runlimit == limit then
- trailing_direction = eor
- else
- trailing_direction = list[runlimit+1].direction
- if trailing_direction == "en" or trailing_direction == "an" then
- trailing_direction = "r"
- end
- end
- if leading_direction == trailing_direction then
- -- N1
- resolved_direction = leading_direction
- else
- -- N2 / does the weird period
- resolved_direction = entry.level % 2 == 1 and "r" or "l" -- direction_of_level(entry.level)
- end
- for j=runstart,runlimit do
- list[j].direction = resolved_direction
- end
- i = runlimit
- end
- i = i + 1
- end
-end
-
-local function resolve_implicit(list,size,start,limit,sor,eor)
- -- I1
- for i=start,limit do
- local entry = list[i]
- local level = entry.level
- if level % 2 ~= 1 then -- not odd(level)
- local direction = entry.direction
- if direction == "r" then
- entry.level = level + 1
- elseif direction == "an" or direction == "en" then
- entry.level = level + 2
- end
- end
- end
- -- I2
- for i=start,limit do
- local entry = list[i]
- local level = entry.level
- if level % 2 == 1 then -- odd(level)
- local direction = entry.direction
- if direction == "l" or direction == "en" or direction == "an" then
- entry.level = level + 1
- end
- end
- end
-end
-
-local function resolve_levels(list,size,baselevel)
- -- X10
- local start = 1
- while start < size do
- local level = list[start].level
- local limit = start + 1
- while limit < size and list[limit].level == level do
- limit = limit + 1
- end
- local prev_level = start == 1 and baselevel or list[start-1].level
- local next_level = limit == size and baselevel or list[limit+1].level
- local sor = (level > prev_level and level or prev_level) % 2 == 1 and "r" or "l" -- direction_of_level(max(level,prev_level))
- local eor = (level > next_level and level or next_level) % 2 == 1 and "r" or "l" -- direction_of_level(max(level,next_level))
- -- W1 .. W7
- resolve_weak(list,size,start,limit,sor,eor)
- -- N1 .. N2
- resolve_neutral(list,size,start,limit,sor,eor)
- -- I1 .. I2
- resolve_implicit(list,size,start,limit,sor,eor)
- start = limit
- end
- -- L1
- for i=1,size do
- local entry = list[i]
- local direction = entry.original
- -- (1)
- if direction == "s" or direction == "b" then
- entry.level = baselevel
- -- (2)
- for j=i-1,1,-1 do
- local entry = list[j]
- if whitespace[entry.original] then
- entry.level = baselevel
- else
- break
- end
- end
- end
- end
- -- (3)
- for i=size,1,-1 do
- local entry = list[i]
- if whitespace[entry.original] then
- entry.level = baselevel
- else
- break
- end
- end
- -- L4
- for i=1,size do
- local entry = list[i]
- if entry.level % 2 == 1 then -- odd(entry.level)
- local mirror = mirrordata[entry.char]
- if mirror then
- entry.mirror = mirror
- end
- end
- end
-end
-
-local function insert_dir_points(list,size)
- -- L2, but no actual reversion is done, we simply annotate where
- -- begindir/endddir node will be inserted.
- local maxlevel = 0
- local finaldir = false
- for i=1,size do
- local level = list[i].level
- if level > maxlevel then
- maxlevel = level
- end
- end
- for level=0,maxlevel do
- local started = false
- local begindir = nil
- local enddir = nil
- if level % 2 == 1 then
- begindir = "+TRT"
- enddir = "-TRT"
- else
- begindir = "+TLT"
- enddir = "-TLT"
- end
- for i=1,size do
- local entry = list[i]
- if entry.level >= level then
- if not started then
- entry.begindir = begindir
- started = true
- end
- else
- if started then
- list[i-1].enddir = enddir
- started = false
- end
- end
- end
- -- make sure to close the run at end of line
- if started then
- finaldir = enddir
- end
- end
- if finaldir then
- list[size].enddir = finaldir
- end
-end
-
-local function apply_to_list(list,size,head,pardir)
- local index = 1
- local current = head
- local done = false
- while current do
- if index > size then
- report_directions("fatal error, size mismatch")
- break
- end
- local id = current.id
- local entry = list[index]
- local begindir = entry.begindir
- local enddir = entry.enddir
- if id == glyph_code then
- local mirror = entry.mirror
- if mirror then
- current.char = mirror
- end
- if trace_directions then
- local original = entry.original
- local direction = entry.direction
- if mirror then
- setcolor(current,"trace:dc")
- elseif direction == "l" then
- if original == direction then
- setcolor(current,"trace:dr")
- else
- setcolor(current,"trace:dm")
- end
- elseif direction == "r" then
- if original == direction then
- setcolor(current,"trace:db")
- else
- setcolor(current,"trace:dg")
- end
- else
- resetcolor(current)
- end
- end
- elseif id == hlist_code or id == vlist_code then
- -- current.list = process(current.list) -- not needed
- current.dir = pardir -- is this really needed?
- elseif id == glue_code then
- if enddir and current.subtype == parfillskip_code then
- -- insert the last enddir before \parfillskip glue
- head = insert_node_before(head,current,new_textdir(enddir))
- enddir = false
- done = true
- end
- elseif id == whatsit_code then
- if begindir and current.subtype == localpar_code then
- -- local_par should always be the 1st node
- head, current = insert_node_after(head,current,new_textdir(begindir))
- begindir = nil
- done = true
- end
- end
- if begindir then
- head = insert_node_before(head,current,new_textdir(begindir))
- done = true
- end
- local skip = entry.skip
- if skip and skip > 0 then
- for i=1,skip do
- current = current.next
- end
- end
- if enddir then
- head, current = insert_node_after(head,current,new_textdir(enddir))
- done = true
- end
- if not entry.remove then
- current = current.next
- elseif remove_controls then
- -- X9
- head, current = remove_node(head,current,true)
- done = true
- else
- current = current.next
- end
- index = index + 1
- end
- return head, done
-end
-
-local function process(namespace,attribute,head)
- local list, size = build_list(head)
- local baselevel, pardir, dirfound = get_baselevel(head,list,size) -- we always have an inline dir node in context
- if not dirfound and trace_details then
- report_directions("no initial direction found, gambling")
- end
- if trace_details then
- report_directions("before : %s",show_list(list,size,"original"))
- end
- resolve_explicit(list,size,baselevel)
- resolve_levels(list,size,baselevel)
- insert_dir_points(list,size)
- if trace_details then
- report_directions("after : %s",show_list(list,size,"direction"))
- report_directions("result : %s",show_done(list,size))
- end
- head, done = apply_to_list(list,size,head,pardir)
- return head, done
-end
-
-directions.installhandler(interfaces.variables.one,process)
diff --git a/tex/context/base/typo-ubb.lua b/tex/context/base/typo-ubb.lua
deleted file mode 100644
index 4cec90084..000000000
--- a/tex/context/base/typo-ubb.lua
+++ /dev/null
@@ -1,887 +0,0 @@
-if not modules then modules = { } end modules ['typo-ubb'] = {
- version = 1.001,
- comment = "companion to typo-dir.mkiv",
- author = "Hans Hagen, PRAGMA-ADE, Hasselt NL",
- copyright = "PRAGMA ADE / ConTeXt Development Team",
- license = "see context related readme files",
- comment = "Unicode bidi (sort of) variant b",
-}
-
--- This is a follow up on typo-uba which itself is a follow up on t-bidi by Khaled Hosny which
--- in turn is based on minibidi.c from Arabeyes. This is a further optimizations, as well as
--- an update on some recent unicode bidi developments. There is (and will) also be more control
--- added. As a consequence this module is somewhat slower than its precursor which itself is
--- slower than the one-pass bidi handler. This is also a playground and I might add some plugin
--- support.
-
--- todo (cf html):
---
--- normal The element does not offer a additional level of embedding with respect to the bidirectional algorithm. For inline elements implicit reordering works across element boundaries.
--- embed If the element is inline, this value opens an additional level of embedding with respect to the bidirectional algorithm. The direction of this embedding level is given by the direction property.
--- bidi-override For inline elements this creates an override. For block container elements this creates an override for inline-level descendants not within another block container element. This means that inside the element, reordering is strictly in sequence according to the direction property; the implicit part of the bidirectional algorithm is ignored.
--- isolate This keyword indicates that the element's container directionality should be calculated without considering the content of this element. The element is therefore isolated from its siblings. When applying its bidirectional-resolution algorithm, its container element treats it as one or several U+FFFC Object Replacement Character, i.e. like an image.
--- isolate-override This keyword applies the isolation behavior of the isolate keyword to the surrounding content and the override behavior o f the bidi-override keyword to the inner content.
--- plaintext This keyword makes the elements directionality calculated without considering its parent bidirectional state or the value of the direction property. The directionality is calculated using the P2 and P3 rules of the Unicode Bidirectional Algorithm.
--- This value allows to display data which has already formatted using a tool following the Unicode Bidirectional Algorithm.
---
--- todo: check for introduced errors
--- todo: reuse list, we have size, so we can just change values (and auto allocate when not there)
--- todo: reuse the stack
--- todo: no need for a max check
--- todo: collapse bound similar ranges (not ok yet)
--- todo: combine some sweeps
--- todo: add fence parser
--- todo: removing is not needed when we inject at the same spot (only chnage the dir property)
--- todo: isolated runs (isolating runs are similar to bidi=local in the basic analyzer)
-
--- todo: check unicode addenda (from the draft):
---
--- Added support for canonical equivalents in BD16.
--- Changed logic in N0 to not check forwards for context in the case of enclosed text opposite the embedding direction.
--- Major extension of the algorithm to allow for the implementation of directional isolates and the introduction of new isolate-related values to the Bidi_Class property.
--- Adds BD8, BD9, BD10, BD11, BD12, BD13, BD14, BD15, and BD16, Sections 2.4 and 2.5, and Rules X5a, X5b, X5c and X6a.
--- Extensively revises Section 3.3.2, Explicit Levels and Directions and its existing X rules to formalize the algorithm for matching a PDF with the embedding or override initiator whose scope it terminates.
--- Moves Rules X9 and X10 into a separate new Section 3.3.3, Preparations for Implicit Processing.
--- Modifies Rule X10 to make the isolating run sequence the unit to which subsequent rules are applied.
--- Modifies Rule W1 to change an NSM preceded by an isolate initiator or PDI into ON.
--- Adds Rule N0 and makes other changes to Section 3.3.5, Resolving Neutral and Isolate Formatting Types to resolve bracket pairs to the same level.
--- Adds the new ARABIC LETTER MARK (U+061C) character to Section 2.6, Implicit Directional Marks and Table 4 Bidirectional Character Types.
-
-local insert, remove, unpack, concat = table.insert, table.remove, table.unpack, table.concat
-local utfchar = utf.char
-local formatters = string.formatters
-
-local directiondata = characters.directions
-local mirrordata = characters.mirrors
-local textclassdata = characters.textclasses
-
-local remove_node = nodes.remove
-local insert_node_after = nodes.insert_after
-local insert_node_before = nodes.insert_before
-
-local nodepool = nodes.pool
-local new_textdir = nodepool.textdir
-
-local nodecodes = nodes.nodecodes
-local whatsitcodes = nodes.whatsitcodes
-local skipcodes = nodes.skipcodes
-
-local glyph_code = nodecodes.glyph
-local glue_code = nodecodes.glue
-local hlist_code = nodecodes.hlist
-local vlist_code = nodecodes.vlist
-local math_code = nodecodes.math
-local whatsit_code = nodecodes.whatsit
-local dir_code = whatsitcodes.dir
-local localpar_code = whatsitcodes.localpar
-local parfillskip_code = skipcodes.skipcodes
-
-local maximum_stack = 0xFF -- unicode: 60, will be jumped to 125, we don't care too much
-
-local setcolor = nodes.tracers.colors.set
-local resetcolor = nodes.tracers.colors.reset
-
-local directions = typesetters.directions
-directions.maindir = nil -- not used
-
-local getfences = directions.getfences
-
-local a_directions = attributes.private('directions')
-local a_textbidi = attributes.private('textbidi')
-local a_state = attributes.private('state')
-
-local s_isol = fonts.analyzers.states.isol
-
--- current[a_state] = s_isol -- maybe better have a special bidi attr value -> override (9) -> todo
-
-local remove_controls = true directives.register("typesetters.directions.removecontrols",function(v) remove_controls = v end)
------ analyze_fences = true directives.register("typesetters.directions.analyzefences", function(v) analyze_fences = v end)
-
-local trace_directions = false trackers .register("typesetters.directions.two", function(v) trace_directions = v end)
-local trace_details = false trackers .register("typesetters.directions.two.details", function(v) trace_details = v end)
-
-local report_directions = logs.reporter("typesetting","directions two")
-
--- strong (old):
---
--- l : left to right
--- r : right to left
--- lro : left to right override
--- rlo : left to left override
--- lre : left to right embedding
--- rle : left to left embedding
--- al : right to legt arabic (esp punctuation issues)
-
--- weak:
---
--- en : english number
--- es : english number separator
--- et : english number terminator
--- an : arabic number
--- cs : common number separator
--- nsm : nonspacing mark
--- bn : boundary neutral
-
--- neutral:
---
--- b : paragraph separator
--- s : segment separator
--- ws : whitespace
--- on : other neutrals
-
--- interesting: this is indeed better (and more what we expect i.e. we already use this split
--- in the old original (also these isolates)
-
--- strong (new):
---
--- l : left to right
--- r : right to left
--- al : right to legt arabic (esp punctuation issues)
-
--- explicit: (new)
---
--- lro : left to right override
--- rlo : left to left override
--- lre : left to right embedding
--- rle : left to left embedding
--- pdf : pop dir format
--- lri : left to right isolate
--- rli : left to left isolate
--- fsi : first string isolate
--- pdi : pop directional isolate
-
-local whitespace = {
- lre = true,
- rle = true,
- lro = true,
- rlo = true,
- pdf = true,
- bn = true,
- ws = true,
-}
-
-local b_s_ws_on = {
- b = true,
- s = true,
- ws = true,
- on = true
-}
-
--- tracing
-
-local function show_list(list,size,what)
- local what = what or "direction"
- local joiner = utfchar(0x200C)
- local result = { }
- for i=1,size do
- local entry = list[i]
- local character = entry.char
- local direction = entry[what]
- if character == 0xFFFC then
- local first = entry.id
- local last = entry.last
- local skip = entry.skip
- if last then
- result[i] = formatters["%-3s:%s %s..%s (%i)"](direction,joiner,nodecodes[first],nodecodes[last],skip or 0)
- else
- result[i] = formatters["%-3s:%s %s (%i)"](direction,joiner,nodecodes[first],skip or 0)
- end
- elseif character >= 0x202A and character <= 0x202C then
- result[i] = formatters["%-3s:%s %U"](direction,joiner,character)
- else
- result[i] = formatters["%-3s:%s %c %U"](direction,joiner,character,character)
- end
- end
- return concat(result,joiner .. " | " .. joiner)
-end
-
--- preparation
-
-local function show_done(list,size)
- local joiner = utfchar(0x200C)
- local result = { }
- for i=1,size do
- local entry = list[i]
- local character = entry.char
- local begindir = entry.begindir
- local enddir = entry.enddir
- if begindir then
- result[#result+1] = formatters["<%s>"](begindir)
- end
- if entry.remove then
- -- continue
- elseif character == 0xFFFC then
- result[#result+1] = formatters["<%s>"]("?")
- elseif character == 0x0020 then
- result[#result+1] = formatters["<%s>"](" ")
- elseif character >= 0x202A and character <= 0x202C then
- result[#result+1] = formatters["<%s>"](entry.original)
- else
- result[#result+1] = utfchar(character)
- end
- if enddir then
- result[#result+1] = formatters["<%s>"](enddir)
- end
- end
- return concat(result,joiner)
-end
-
--- keeping the list and overwriting doesn't save much runtime, only a few percent
--- char is only used for mirror, so in fact we can as well only store it for
--- glyphs only
-
-local function build_list(head) -- todo: store node pointer ... saves loop
- -- P1
- local current = head
- local list = { }
- local size = 0
- while current do
- size = size + 1
- local id = current.id
- if id == glyph_code then
- local chr = current.char
- local dir = directiondata[chr]
- list[size] = { char = chr, direction = dir, original = dir, level = 0 }
- current = current.next
- elseif id == glue_code then
- list[size] = { char = 0x0020, direction = "ws", original = "ws", level = 0 }
- current = current.next
- elseif id == whatsit_code and current.subtype == dir_code then
- local dir = current.dir
- if dir == "+TLT" then
- list[size] = { char = 0x202A, direction = "lre", original = "lre", level = 0 }
- elseif dir == "+TRT" then
- list[size] = { char = 0x202B, direction = "rle", original = "rle", level = 0 }
- elseif dir == "-TLT" or dir == "-TRT" then
- list[size] = { char = 0x202C, direction = "pdf", original = "pdf", level = 0 }
- else
- list[size] = { char = 0xFFFC, direction = "on", original = "on", level = 0, id = id } -- object replacement character
- end
- current = current.next
- elseif id == math_code then
- local skip = 0
- current = current.next
- while current.id ~= math_code do
- skip = skip + 1
- current = current.next
- end
- skip = skip + 1
- current = current.next
- list[size] = { char = 0xFFFC, direction = "on", original = "on", level = 0, skip = skip, id = id }
- else
- local skip = 0
- local last = id
- current = current.next
- while n do
- local id = current.id
- if id ~= glyph_code and id ~= glue_code and not (id == whatsit_code and current.subtype == dir_code) then
- skip = skip + 1
- last = id
- current = current.next
- else
- break
- end
- end
- if id == last then
- list[size] = { char = 0xFFFC, direction = "on", original = "on", level = 0, skip = skip, id = id }
- else
- list[size] = { char = 0xFFFC, direction = "on", original = "on", level = 0, skip = skip, id = id, last = last }
- end
- end
- end
- return list, size
-end
-
--- new
-
--- we could support ( ] and [ ) and such ...
-
--- ש ) ל ( א 0-0
--- ש ( ל ] א 0-0
--- ש ( ל ) א 2-4
--- ש ( ל [ א ) כ ] 2-6
--- ש ( ל ] א ) כ 2-6
--- ש ( ל ) א ) כ 2-4
--- ש ( ל ( א ) כ 4-6
--- ש ( ל ( א ) כ ) 2-8,4-6
--- ש ( ל [ א ] כ ) 2-8,4-6
-
-function resolve_fences(list,size,start,limit)
- -- N0
- local stack = { }
- local top = 0
- for i=start,limit do
- local entry = list[i]
- if entry.direction == "on" then
- local char = entry.char
- local mirror = mirrordata[char]
- if mirror then
- local class = textclassdata[char]
- entry.mirror = mirror
- entry.class = class
- if class == "open" then
- top = top + 1
- stack[top] = { mirror, i, false }
- elseif top == 0 then
- -- skip
- elseif class == "close" then
- for j=top,1,-1 do
- top = j
- local s = stack[j]
- if s[1] == char and not s[3] then
- s[3] = i
- break
- end
- end
- end
- end
- end
- end
- for i=1,#stack do
- local s = stack[i]
- if s[3] then
- local open = s[2]
- local close = s[3]
- list[open ].paired = close
- list[close].paired = open
- end
- end
--- inspect(stack)
--- inspect(list)
-end
-
--- the action
-
-local function get_baselevel(head,list,size) -- todo: skip if first is object (or pass head and test for local_par)
- local maindir = directions.maindir
- if maindir == "r2l" then
- return 1, "TRT", false
- elseif maindir == "l2r" then
- return 0, "TLT", false
- elseif head.id == whatsit_code and head.subtype == localpar_code then
- if head.dir == "TRT" then
- return 1, "TRT", true
- else
- return 0, "TLT", true
- end
- else
- -- P2, P3
- for i=1,size do
- local entry = list[i]
- local direction = entry.direction
- if direction == "r" or direction == "al" then
- return 1, "TRT", true
- elseif direction == "l" then
- return 0, "TLT", true
- end
- end
- return 0, "TLT", false
- end
-end
-
-local function resolve_explicit(list,size,baselevel)
- -- X1
- local level = baselevel
- local override = "on"
- local stack = { }
- local nofstack = 0
- for i=1,size do
- local entry = list[i]
- local direction = entry.direction
- -- X2
- if direction == "rle" then
- if nofstack < maximum_stack then
- nofstack = nofstack + 1
- stack[nofstack] = { level, override }
- level = level + (level % 2 == 1 and 2 or 1) -- least_greater_odd(level)
- override = "on"
- entry.level = level
- entry.direction = "bn"
- entry.remove = true
- elseif trace_directions then
- report_directions("stack overflow at position %a with direction %a",i,direction)
- end
- -- X3
- elseif direction == "lre" then
- if nofstack < maximum_stack then
- nofstack = nofstack + 1
- stack[nofstack] = { level, override }
- level = level + (level % 2 == 1 and 1 or 2) -- least_greater_even(level)
- override = "on"
- entry.level = level
- entry.direction = "bn"
- entry.remove = true
- elseif trace_directions then
- report_directions("stack overflow at position %a with direction %a",i,direction)
- end
- -- X4
- elseif direction == "rlo" then
- if nofstack < maximum_stack then
- nofstack = nofstack + 1
- stack[nofstack] = { level, override }
- level = level + (level % 2 == 1 and 2 or 1) -- least_greater_odd(level)
- override = "r"
- entry.level = level
- entry.direction = "bn"
- entry.remove = true
- elseif trace_directions then
- report_directions("stack overflow at position %a with direction %a",i,direction)
- end
- -- X5
- elseif direction == "lro" then
- if nofstack < maximum_stack then
- nofstack = nofstack + 1
- stack[nofstack] = { level, override }
- level = level + (level % 2 == 1 and 1 or 2) -- least_greater_even(level)
- override = "l"
- entry.level = level
- entry.direction = "bn"
- entry.remove = true
- elseif trace_directions then
- report_directions("stack overflow at position %a with direction %a",i,direction)
- end
- -- X7
- elseif direction == "pdf" then
- if nofstack < maximum_stack then
- local stacktop = stack[nofstack]
- nofstack = nofstack - 1
- level = stacktop[1]
- override = stacktop[2]
- entry.level = level
- entry.direction = "bn"
- entry.remove = true
- elseif trace_directions then
- report_directions("stack overflow at position %a with direction %a",i,direction)
- end
- -- X6
- else
- entry.level = level
- if override ~= "on" then
- entry.direction = override
- end
- end
- end
- -- X8 (reset states and overrides after paragraph)
-end
-
-local function resolve_weak(list,size,start,limit,orderbefore,orderafter)
- -- W1: non spacing marks get the direction of the previous character
- for i=start,limit do
- local entry = list[i]
- if entry.direction == "nsm" then
- if i == start then
- entry.direction = orderbefore
- else
- entry.direction = list[i-1].direction
- end
- end
- end
- -- W2: mess with numbers and arabic
- for i=start,limit do
- local entry = list[i]
- if entry.direction == "en" then
- for j=i-1,start,-1 do
- local prev = list[j]
- local direction = prev.direction
- if direction == "al" then
- entry.direction = "an"
- break
- elseif direction == "r" or direction == "l" then
- break
- end
- end
- end
- end
- -- W3
- for i=start,limit do
- local entry = list[i]
- if entry.direction == "al" then
- entry.direction = "r"
- end
- end
- -- W4: make separators number
- for i=start+1,limit-1 do
- local entry = list[i]
- local direction = entry.direction
- if direction == "es" then
- if list[i-1].direction == "en" and list[i+1].direction == "en" then
- entry.direction = "en"
- end
- elseif direction == "cs" then
- local prevdirection = list[i-1].direction
- if prevdirection == "en" then
- if list[i+1].direction == "en" then
- entry.direction = "en"
- end
- elseif prevdirection == "an" and list[i+1].direction == "an" then
- entry.direction = "an"
- end
- end
- end
- -- W5
- local i = start
- while i <= limit do
- if list[i].direction == "et" then
- local runstart = i
- -- local runlimit = find_run_limit_et(list,runstart,limit) -- when moved inline we can probably collapse a lot
-
- local runlimit = runstart
- for i=runstart,limit do
- if list[i].direction == "et" then
- runlimit = i
- else
- break
- end
- end
-
- local rundirection = runstart == start and sor or list[runstart-1].direction
- if rundirection ~= "en" then
- rundirection = runlimit == limit and orderafter or list[runlimit+1].direction
- end
- if rundirection == "en" then
- for j=runstart,runlimit do
- list[j].direction = "en"
- end
- end
- i = runlimit
- end
- i = i + 1
- end
- -- W6
- for i=start,limit do
- local entry = list[i]
- local direction = entry.direction
- if direction == "es" or direction == "et" or direction == "cs" then
- entry.direction = "on"
- end
- end
- -- W7
- for i=start,limit do
- local entry = list[i]
- if entry.direction == "en" then
- local prev_strong = orderbefore
- for j=i-1,start,-1 do
- local direction = list[j].direction
- if direction == "l" or direction == "r" then
- prev_strong = direction
- break
- end
- end
- if prev_strong == "l" then
- entry.direction = "l"
- end
- end
- end
-end
-
-local function resolve_neutral(list,size,start,limit,orderbefore,orderafter)
- -- N1, N2
- for i=start,limit do
- local entry = list[i]
- if b_s_ws_on[entry.direction] then
- local leading_direction, trailing_direction, resolved_direction
- local runstart = i
- -- local runlimit = find_run_limit_b_s_ws_on(list,runstart,limit)
-
- local runlimit = runstart
- for i=runstart,limit do
- if b_s_ws_on[list[i].direction] then
- runstart = i
- else
- break
- end
- end
-
- if runstart == start then
- leading_direction = sor
- else
- leading_direction = list[runstart-1].direction
- if leading_direction == "en" or leading_direction == "an" then
- leading_direction = "r"
- end
- end
- if runlimit == limit then
- trailing_direction = orderafter
- else
- trailing_direction = list[runlimit+1].direction
- if trailing_direction == "en" or trailing_direction == "an" then
- trailing_direction = "r"
- end
- end
- if leading_direction == trailing_direction then
- -- N1
- resolved_direction = leading_direction
- else
- -- N2 / does the weird period
- resolved_direction = entry.level % 2 == 1 and "r" or "l" -- direction_of_level(entry.level)
- end
- for j=runstart,runlimit do
- list[j].direction = resolved_direction
- end
- i = runlimit
- end
- i = i + 1
- end
-end
-
-local function resolve_implicit(list,size,start,limit,orderbefore,orderafter)
- -- I1
- for i=start,limit do
- local entry = list[i]
- local level = entry.level
- if level % 2 ~= 1 then -- not odd(level)
- local direction = entry.direction
- if direction == "r" then
- entry.level = level + 1
- elseif direction == "an" or direction == "en" then
- entry.level = level + 2
- end
- end
- end
- -- I2
- for i=start,limit do
- local entry = list[i]
- local level = entry.level
- if level % 2 == 1 then -- odd(level)
- local direction = entry.direction
- if direction == "l" or direction == "en" or direction == "an" then
- entry.level = level + 1
- end
- end
- end
-end
-
-local function resolve_levels(list,size,baselevel,analyze_fences)
- -- X10
- local start = 1
- while start < size do
- local level = list[start].level
- local limit = start + 1
- while limit < size and list[limit].level == level do
- limit = limit + 1
- end
- local prev_level = start == 1 and baselevel or list[start-1].level
- local next_level = limit == size and baselevel or list[limit+1].level
- local orderbefore = (level > prev_level and level or prev_level) % 2 == 1 and "r" or "l" -- direction_of_level(max(level,prev_level))
- local orderafter = (level > next_level and level or next_level) % 2 == 1 and "r" or "l" -- direction_of_level(max(level,next_level))
- -- W1 .. W7
- resolve_weak(list,size,start,limit,orderbefore,orderafter)
- -- N0
- if analyze_fences then
- resolve_fences(list,size,start,limit)
- end
- -- N1 .. N2
- resolve_neutral(list,size,start,limit,orderbefore,orderafter)
- -- I1 .. I2
- resolve_implicit(list,size,start,limit,orderbefore,orderafter)
- start = limit
- end
- -- L1
- for i=1,size do
- local entry = list[i]
- local direction = entry.original
- -- (1)
- if direction == "s" or direction == "b" then
- entry.level = baselevel
- -- (2)
- for j=i-1,1,-1 do
- local entry = list[j]
- if whitespace[entry.original] then
- entry.level = baselevel
- else
- break
- end
- end
- end
- end
- -- (3)
- for i=size,1,-1 do
- local entry = list[i]
- if whitespace[entry.original] then
- entry.level = baselevel
- else
- break
- end
- end
- -- L4
- if analyze_fences then
- for i=1,size do
- local entry = list[i]
- if entry.level % 2 == 1 then -- odd(entry.level)
- if entry.mirror and not entry.paired then
- entry.mirror = false
- end
- -- okay
- elseif entry.mirror then
- entry.mirror = false
- end
- end
- else
- for i=1,size do
- local entry = list[i]
- if entry.level % 2 == 1 then -- odd(entry.level)
- local mirror = mirrordata[entry.char]
- if mirror then
- entry.mirror = mirror
- end
- end
- end
- end
-end
-
-local function insert_dir_points(list,size)
- -- L2, but no actual reversion is done, we simply annotate where
- -- begindir/endddir node will be inserted.
- local maxlevel = 0
- local finaldir = false
- for i=1,size do
- local level = list[i].level
- if level > maxlevel then
- maxlevel = level
- end
- end
- for level=0,maxlevel do
- local started = false
- local begindir = nil
- local enddir = nil
- if level % 2 == 1 then
- begindir = "+TRT"
- enddir = "-TRT"
- else
- begindir = "+TLT"
- enddir = "-TLT"
- end
- for i=1,size do
- local entry = list[i]
- if entry.level >= level then
- if not started then
- entry.begindir = begindir
- started = true
- end
- else
- if started then
- list[i-1].enddir = enddir
- started = false
- end
- end
- end
- -- make sure to close the run at end of line
- if started then
- finaldir = enddir
- end
- end
- if finaldir then
- list[size].enddir = finaldir
- end
-end
-
-local function apply_to_list(list,size,head,pardir)
- local index = 1
- local current = head
- local done = false
- while current do
- if index > size then
- report_directions("fatal error, size mismatch")
- break
- end
- local id = current.id
- local entry = list[index]
- local begindir = entry.begindir
- local enddir = entry.enddir
- if id == glyph_code then
- local mirror = entry.mirror
- if mirror then
- current.char = mirror
- end
- if trace_directions then
- local original = entry.original
- local direction = entry.direction
- if mirror then
- setcolor(current,"trace:dc")
- elseif direction == "l" then
- if original == direction then
- setcolor(current,"trace:dr")
- else
- setcolor(current,"trace:dm")
- end
- elseif direction == "r" then
- if original == direction then
- setcolor(current,"trace:db")
- else
- setcolor(current,"trace:dg")
- end
- else
- resetcolor(current)
- end
- end
- elseif id == hlist_code or id == vlist_code then
- -- current.list = process(current.list) -- not needed
- current.dir = pardir -- is this really needed?
- elseif id == glue_code then
- if enddir and current.subtype == parfillskip_code then
- -- insert the last enddir before \parfillskip glue
- head = insert_node_before(head,current,new_textdir(enddir))
- enddir = false
- done = true
- end
- elseif id == whatsit_code then
- if begindir and current.subtype == localpar_code then
- -- local_par should always be the 1st node
- head, current = insert_node_after(head,current,new_textdir(begindir))
- begindir = nil
- done = true
- end
- end
- if begindir then
- head = insert_node_before(head,current,new_textdir(begindir))
- done = true
- end
- local skip = entry.skip
- if skip and skip > 0 then
- for i=1,skip do
- current = current.next
- end
- end
- if enddir then
- head, current = insert_node_after(head,current,new_textdir(enddir))
- done = true
- end
- if not entry.remove then
- current = current.next
- elseif remove_controls then
- -- X9
- head, current = remove_node(head,current,true)
- done = true
- else
- current = current.next
- end
- index = index + 1
- end
- return head, done
-end
-
-local function process(namespace,attribute,head)
- -- for the moment a whole paragraph property
- local attr = head[a_directions]
- local analyze_fences = getfences(attr)
- --
- local list, size = build_list(head)
- local baselevel, pardir, dirfound = get_baselevel(head,list,size) -- we always have an inline dir node in context
- if not dirfound and trace_details then
- report_directions("no initial direction found, gambling")
- end
- if trace_details then
- report_directions("before : %s",show_list(list,size,"original"))
- end
- resolve_explicit(list,size,baselevel)
- resolve_levels(list,size,baselevel,analyze_fences)
- insert_dir_points(list,size)
- if trace_details then
- report_directions("after : %s",show_list(list,size,"direction"))
- report_directions("result : %s",show_done(list,size))
- end
- head, done = apply_to_list(list,size,head,pardir)
- return head, done
-end
-
-directions.installhandler(interfaces.variables.two,process)
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index 4a51d33e1..5ac5cbd14 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 : 09/07/13 13:50:00
+-- merge date : 09/09/13 11:46:58
do -- begin closure to overcome local limits and interference
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-27 09:31:15 +0000