summaryrefslogtreecommitdiff
path: root/tex
diff options
context:
space:
mode:
Diffstat (limited to 'tex')
-rw-r--r--tex/context/base/context-version.pdfbin4175 -> 4160 bytes
-rw-r--r--tex/context/base/mkiv/cont-new.mkiv2
-rw-r--r--tex/context/base/mkiv/context.mkiv2
-rw-r--r--tex/context/base/mkiv/lxml-tab.lua5
-rw-r--r--tex/context/base/mkiv/lxml-tex.lua28
-rw-r--r--tex/context/base/mkiv/pack-rul.mkiv78
-rw-r--r--tex/context/base/mkiv/status-files.pdfbin9018 -> 9067 bytes
-rw-r--r--tex/context/base/mkiv/status-lua.pdfbin258792 -> 258745 bytes
-rw-r--r--tex/context/base/mkiv/typo-del.mkiv35
-rw-r--r--tex/context/modules/mkiv/x-set-11.mkiv793
-rw-r--r--tex/generic/context/luatex/luatex-fonts-merged.lua2
11 files changed, 587 insertions, 358 deletions
diff --git a/tex/context/base/context-version.pdf b/tex/context/base/context-version.pdf
index 25f70f2af..9bc6c85d8 100644
--- a/tex/context/base/context-version.pdf
+++ b/tex/context/base/context-version.pdf
Binary files differ
diff --git a/tex/context/base/mkiv/cont-new.mkiv b/tex/context/base/mkiv/cont-new.mkiv
index 420befa6e..b5c4ebf82 100644
--- a/tex/context/base/mkiv/cont-new.mkiv
+++ b/tex/context/base/mkiv/cont-new.mkiv
@@ -11,7 +11,7 @@
%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
%C details.
-\newcontextversion{2016.01.17 18:49}
+\newcontextversion{2016.01.18 22:21}
%D This file is loaded at runtime, thereby providing an excellent place for
%D hacks, patches, extensions and new features.
diff --git a/tex/context/base/mkiv/context.mkiv b/tex/context/base/mkiv/context.mkiv
index 95edb74ee..d8a8910ca 100644
--- a/tex/context/base/mkiv/context.mkiv
+++ b/tex/context/base/mkiv/context.mkiv
@@ -39,7 +39,7 @@
%D up and the dependencies are more consistent.
\edef\contextformat {\jobname}
-\edef\contextversion{2016.01.17 18:49}
+\edef\contextversion{2016.01.18 22:21}
\edef\contextkind {beta}
%D For those who want to use this:
diff --git a/tex/context/base/mkiv/lxml-tab.lua b/tex/context/base/mkiv/lxml-tab.lua
index c5480f746..e29058eb6 100644
--- a/tex/context/base/mkiv/lxml-tab.lua
+++ b/tex/context/base/mkiv/lxml-tab.lua
@@ -168,6 +168,7 @@ local entities = { }
local strip = false
local cleanup = false
local utfize = false
+local resolve = false
local resolve_predefined = false
local unify_predefined = false
@@ -635,8 +636,8 @@ local spacing = C(space^0)
----- entitycontent = (1-open-semicolon)^0
local anyentitycontent = (1-open-semicolon-space-close-ampersand)^0
-local hexentitycontent = R("AF","af","09")^0
-local decentitycontent = R("09")^0
+local hexentitycontent = R("AF","af","09")^1
+local decentitycontent = R("09")^1
local parsedentity = P("#")/"" * (
P("x")/"" * (hexentitycontent/handle_hex_entity) +
(decentitycontent/handle_dec_entity)
diff --git a/tex/context/base/mkiv/lxml-tex.lua b/tex/context/base/mkiv/lxml-tex.lua
index 718b8f8c6..aad86ed6d 100644
--- a/tex/context/base/mkiv/lxml-tex.lua
+++ b/tex/context/base/mkiv/lxml-tex.lua
@@ -233,9 +233,13 @@ local _, ctxtextcapture_nop = context.newtexthandler {
catcodes = ctxcatcodes,
}
-local xmltextcapture, xmlspacecapture, xmllinecapture, ctxtextcapture
+local xmltextcapture = xmltextcapture_yes
+local xmlspacecapture = xmlspacecapture_yes
+local xmllinecapture = xmllinecapture_yes
+local ctxtextcapture = ctxtextcapture_yes
+local prefertexentities = true
-function lxml.setescapedentities(v)
+directives.register("lxml.entities.escaped",function(v)
if v then
xmltextcapture = xmltextcapture_yes
xmlspacecapture = xmlspacecapture_yes
@@ -247,11 +251,11 @@ function lxml.setescapedentities(v)
xmllinecapture = xmllinecapture_nop
ctxtextcapture = ctxtextcapture_nop
end
-end
-
-lxml.setescapedentities() -- off by default (for now)
+end)
-directives.register("lxml.escapedentities",lxml.setescapedentities)
+directives.register("lxml.entities.prefertex",function(v)
+ prefertex = v
+end)
-- cdata
@@ -464,8 +468,16 @@ function xml.load(filename,settings)
return xmltable
end
-local function entityconverter(id,str,ent) -- todo ent optional
- return xmlentities[str] or ent[str] or xmlprivatetoken(str) or "" -- roundtrip handler
+-- local function entityconverter(id,str,ent) -- todo ent optional
+-- return xmlentities[str] or ent[str] or xmlprivatetoken(str) or "" -- roundtrip handler
+-- end
+
+local function entityconverter(id,str,ent) -- todo: disable tex entities when raw
+ if prefertexentities then
+ return xmlentities[str] or (texentities[str] and xmlprivatetoken(str)) or ent[str] or xmlprivatetoken(str) or "" -- roundtrip handler
+ else
+ return xmlentities[str] or ent[str] or (texentities[str] and xmlprivatetoken(str)) or xmlprivatetoken(str) or "" -- roundtrip handler
+ end
end
local function lxmlconvert(id,data,compress,currentresource)
diff --git a/tex/context/base/mkiv/pack-rul.mkiv b/tex/context/base/mkiv/pack-rul.mkiv
index 0d6ab20bd..5fa938bda 100644
--- a/tex/context/base/mkiv/pack-rul.mkiv
+++ b/tex/context/base/mkiv/pack-rul.mkiv
@@ -507,19 +507,19 @@
%D \macros
%D {overlayfakebox}
-\unexpanded\def\overlayfakebox
- {\hpack
- {\setbox\scratchbox\emptyhbox
- \wd\scratchbox\d_overlay_width
- \ht\scratchbox\d_overlay_height
- \box\scratchbox}}
-
% \unexpanded\def\overlayfakebox
-% {\hpack % redundant but needs testing
-% {\novrule
-% \s!width \d_overlay_width
-% \s!height\d_overlay_height
-% \s!depth \zeropoint}}
+% {\hpack
+% {\setbox\scratchbox\emptyhbox
+% \wd\scratchbox\d_overlay_width
+% \ht\scratchbox\d_overlay_height
+% \box\scratchbox}}
+
+\unexpanded\def\overlayfakebox
+ {\hpack % redundant but needs testing
+ {\novrule
+ \s!width \d_overlay_width
+ \s!height\d_overlay_height
+ \s!depth \zeropoint}}
%D For testing we provide:
@@ -697,41 +697,17 @@
\box\b_framed_normal
\box\b_framed_extra}}
-\def\pack_framed_stroked_box_normal
- {\setbox\scratchbox\emptyhbox
- \wd\scratchbox\d_framed_target_wd
- \ht\scratchbox\d_framed_target_ht
- \dp\scratchbox\d_framed_target_dp
- \setbox\scratchbox\vpack \bgroup
- \csname \??framedtop\p_framed_frame\framedparameter\c!topframe \endcsname
- \nointerlineskip % new (needed for fences)
- \hbox \bgroup
- \csname \??framedleft\p_framed_frame\framedparameter\c!leftframe \endcsname
- \box\scratchbox
- \csname \??framedright\p_framed_frame\framedparameter\c!rightframe \endcsname
- \egroup
- \nointerlineskip % new (needed for fences)
- \csname \??framedbottom\p_framed_frame\framedparameter\c!bottomframe\endcsname
- \egroup
- \wd\scratchbox\d_framed_target_wd
- \ht\scratchbox\d_framed_target_ht
- \dp\scratchbox\d_framed_target_dp
- \box\scratchbox}
-
% \def\pack_framed_stroked_box_normal
-% {%\setbox\scratchbox\emptyhbox
-% %\wd\scratchbox\d_framed_target_wd
-% %\ht\scratchbox\d_framed_target_ht
-% %\dp\scratchbox\d_framed_target_dp
+% {\setbox\scratchbox\emptyhbox
+% \wd\scratchbox\d_framed_target_wd
+% \ht\scratchbox\d_framed_target_ht
+% \dp\scratchbox\d_framed_target_dp
% \setbox\scratchbox\vpack \bgroup
% \csname \??framedtop\p_framed_frame\framedparameter\c!topframe \endcsname
% \nointerlineskip % new (needed for fences)
% \hbox \bgroup
% \csname \??framedleft\p_framed_frame\framedparameter\c!leftframe \endcsname
-% \novrule
-% \s!width \d_framed_target_wd
-% \s!height\d_framed_target_ht
-% \s!depth \d_framed_target_dp
+% \box\scratchbox
% \csname \??framedright\p_framed_frame\framedparameter\c!rightframe \endcsname
% \egroup
% \nointerlineskip % new (needed for fences)
@@ -742,6 +718,26 @@
% \dp\scratchbox\d_framed_target_dp
% \box\scratchbox}
+\def\pack_framed_stroked_box_normal
+ {\setbox\scratchbox\vpack \bgroup
+ \csname \??framedtop\p_framed_frame\framedparameter\c!topframe \endcsname
+ \nointerlineskip % new (needed for fences)
+ \hbox \bgroup
+ \csname \??framedleft\p_framed_frame\framedparameter\c!leftframe \endcsname
+ \novrule
+ \s!width \d_framed_target_wd
+ \s!height\d_framed_target_ht
+ \s!depth \d_framed_target_dp
+ \csname \??framedright\p_framed_frame\framedparameter\c!rightframe \endcsname
+ \egroup
+ \nointerlineskip % new (needed for fences)
+ \csname \??framedbottom\p_framed_frame\framedparameter\c!bottomframe\endcsname
+ \egroup
+ \wd\scratchbox\d_framed_target_wd
+ \ht\scratchbox\d_framed_target_ht
+ \dp\scratchbox\d_framed_target_dp
+ \box\scratchbox}
+
\def\pack_framed_t_rule{\hrule\s!height\d_framed_linewidth\kern-\d_framed_linewidth}
\def\pack_framed_b_rule{\kern-\d_framed_linewidth\hrule\s!height\d_framed_linewidth}
\def\pack_framed_r_rule{\kern-\d_framed_linewidth\vrule\s!width\d_framed_linewidth}
diff --git a/tex/context/base/mkiv/status-files.pdf b/tex/context/base/mkiv/status-files.pdf
index 10a5fd251..59a62ce24 100644
--- a/tex/context/base/mkiv/status-files.pdf
+++ b/tex/context/base/mkiv/status-files.pdf
Binary files differ
diff --git a/tex/context/base/mkiv/status-lua.pdf b/tex/context/base/mkiv/status-lua.pdf
index bda7542f2..9064b3f05 100644
--- a/tex/context/base/mkiv/status-lua.pdf
+++ b/tex/context/base/mkiv/status-lua.pdf
Binary files differ
diff --git a/tex/context/base/mkiv/typo-del.mkiv b/tex/context/base/mkiv/typo-del.mkiv
index ebba94428..c27b54f84 100644
--- a/tex/context/base/mkiv/typo-del.mkiv
+++ b/tex/context/base/mkiv/typo-del.mkiv
@@ -297,7 +297,7 @@
[\c!location=\v!margin, % \v!text \v!paragraph
\c!spacebefore=,
\c!spaceafter=\delimitedtextparameter\c!spacebefore,
- \c!style=\v!normal,
+ \c!style=,
\c!color=,
\c!leftmargin=\zeropoint,
\c!rightmargin=\delimitedtextparameter\c!leftmargin,
@@ -650,6 +650,7 @@
\unexpanded\def\typo_delimited_par
{\groupedcommand
{\dostarttaggedchained\t!delimited\currentdelimitedtext\??delimitedtext % block?
+ \usedelimitedtextstyleandcolor\c!style\c!color
\typo_delimited_handle_left\c!left
\dostarttagged\t!delimitedcontent\empty}
{\dostoptagged
@@ -658,38 +659,6 @@
\dostoptagged
\typo_delimited_pop}}
-% \unexpanded\def\typo_delimited_txt
-% {\doifelse{\delimitedtextparameter\c!style}\v!normal
-% \typo_delimited_quoted
-% \typo_delimited_attributed}
-%
-% \def\typo_delimited_quoted_b
-% {\dostarttaggedchained\t!delimited\currentdelimitedtext\??delimitedtext
-% \typo_delimited_handle_left\c!left}
-%
-% \def\typo_delimited_quoted_e
-% {\typo_delimited_handle_right\c!right
-% \removelastskip
-% \dostoptagged
-% \typo_delimited_pop}
-%
-% \def\typo_delimited_attributed_b
-% {\dostarttaggedchained\t!delimited\currentdelimitedtext\??delimitedtext
-% \usedelimitedtextstyleandcolor\c!style\c!color}
-%
-% \def\typo_delimited_attributed_e
-% {\dostoptagged
-% \typo_delimited_pop}
-%
-% \def\typo_delimited_fontdriven_b
-% {\dostarttaggedchained\t!delimited\currentdelimitedtext\??delimitedtext
-% \languageparameter{\c!left\currentparentdelimitedtext}}% was: \currentdelimitedtext
-%
-% \def\typo_delimited_fontdriven_e
-% {\languageparameter{\c!right\currentparentdelimitedtext}% was: \currentdelimitedtext
-% \dostoptagged
-% \typo_delimited_pop}
-
\unexpanded\def\typo_delimited_txt
{\edef\p_left_right{\delimitedtextparameter\c!left\delimitedtextparameter\c!right}%
\ifx\p_left_right\empty
diff --git a/tex/context/modules/mkiv/x-set-11.mkiv b/tex/context/modules/mkiv/x-set-11.mkiv
index c5810db55..a75874191 100644
--- a/tex/context/modules/mkiv/x-set-11.mkiv
+++ b/tex/context/modules/mkiv/x-set-11.mkiv
@@ -35,279 +35,430 @@
% register, interaction
\startmessages dutch library: setup
- title: setup
- formula: formule
- number: getal
- list: lijst
- dimension: maat
- mark: markering
- reference: verwijzing
- command: commando
- file: file
- name: naam
- identifier: naam
- text: tekst
- section: sectie
- singular: naam enkelvoud
- plural: naam meervoud
- matrix: n*m
- see: zie
- inherits: erft van
- 1: de karakters < en > zijn globaal actief!
- 2: -- wordt verwerkt
- 3: -- is niet gedefinieerd
- 4: -- wordt nogmaals verwerkt
- optional: opt
- displaymath: formule
- index: ingang
- math: formule
- nothing: leeg
- file: file
- position: positie
- reference: verwijzing
- csname: naam
- destination: bestemming
- triplet: triplet
- word: woord
- content: tekst
- language: taal
+ title: setup
+ formula: formule
+ number: getal
+ list: lijst
+ dimension: maat
+ mark: markering
+ reference: verwijzing
+ command: commando
+ file: file
+ name: naam
+ identifier: naam
+ text: tekst
+ section: sectie
+ singular: naam enkelvoud
+ plural: naam meervoud
+ matrix: n*m
+ see: zie
+ inherits: erft van
+ 1: de karakters < en > zijn globaal actief!
+ 2: -- wordt verwerkt
+ 3: -- is niet gedefinieerd
+ 4: -- wordt nogmaals verwerkt
+ optional: opt
+ displaymath: formule
+ index: ingang
+ math: formule
+ nothing: leeg
+ file: file
+ position: positie
+ reference: verwijzing
+ csname: naam
+ destination: bestemming
+ triplet: triplet
+ word: woord
+ content: tekst
+ %
+ language: taal
+ processor: verwerker
+ style: letter
+ font: font
+ character: karakter
+ userdata: gebruikersdata
+ key: parameter
+ value: waarde
+ color: kleur
+ template: sjabloon
+ node: node
+ lpath: lpath
+ xmlsetup: xmlsetup
+ marking: markering
+ sectionblock: sectieblok
+ row: rij
+ column: kolom
+ url: url
+ noargument: \texescape...
+ oneargument: \texescape...\texthash1
+ twoarguments: \texescape...\texthash1\texthash2
+ threearguments: \texescape...\texthash1\texthash2\texthash3
\stopmessages
\startmessages english library: setup
- title: setup
- formula: formula
- number: number
- list: list
- dimension: dimension
- mark: mark
- reference: reference
- command: command
- file: file
- name: name
- identifier: identifier
- text: text
- section: section
- singular: singular name
- plural: plural name
- matrix: n*m
- see: see
- inherits: inherits from
- 1: the characters < and > are globally active!
- 2: -- is processed
- 3: -- is undefined
- 4: -- is processed again
- optional: opt
- displaymath: formula
- index: entry
- math: formula
- nothing: empty
- file: file
- position: position
- reference: reference
- csname: name
- destination: destination
- triplet: triplet
- word: word
- content: text
- language: language
+ title: setup
+ formula: formula
+ number: number
+ list: list
+ dimension: dimension
+ mark: mark
+ reference: reference
+ command: command
+ file: file
+ name: name
+ identifier: identifier
+ text: text
+ section: section
+ singular: singular name
+ plural: plural name
+ matrix: n*m
+ see: see
+ inherits: inherits from
+ 1: the characters < and > are globally active!
+ 2: -- is processed
+ 3: -- is undefined
+ 4: -- is processed again
+ optional: opt
+ displaymath: formula
+ index: entry
+ math: formula
+ nothing: empty
+ file: file
+ position: position
+ reference: reference
+ csname: name
+ destination: destination
+ triplet: triplet
+ word: word
+ content: text
+ %
+ language: language
+ processor: processor
+ style: style
+ font: font
+ character: character
+ userdata: userdata
+ key: key
+ value: value
+ color: color
+ template: template
+ node: node
+ lpath: lpath
+ xmlsetup: xmlsetup
+ marking: marking
+ sectionblock: sectionblock
+ row: row
+ column: column
+ url: url
+ noargument: \texescape...
+ oneargument: \texescape...\texthash1
+ twoarguments: \texescape...\texthash1\texthash2
+ threearguments: \texescape...\texthash1\texthash2\texthash3
\stopmessages
\startmessages german library: setup
- title: Setup
- formula: Formel
- number: Nummer
- list: Liste
- dimension: Dimension
- mark: Beschriftung
- reference: Referenz
- command: Befehl
- file: Datei
- name: Name
- identifier: Name
- text: Text
- section: Abschnitt
- singular: singular
- plural: plural
- matrix: n*m
- see: siehe
- inherits: inherits from
- 1: Die Zeichen < und > gelten global!
- 2: -- wird verarbeitet
- 3: -- ist undefiniert
- 4: -- ist mehrmals verarbeitet
- optional: opt
- displaymath: formula
- index: entry
- math: formula
- nothing: empty
- file: file
- position: position
- reference: reference
- csname: name
- destination: destination
- triplet: triplet
- word: word
- content: text
- language: sprache
+ title: Setup
+ formula: Formel
+ number: Nummer
+ list: Liste
+ dimension: Dimension
+ mark: Beschriftung
+ reference: Referenz
+ command: Befehl
+ file: Datei
+ name: Name
+ identifier: Name
+ text: Text
+ section: Abschnitt
+ singular: singular
+ plural: plural
+ matrix: n*m
+ see: siehe
+ inherits: inherits from
+ 1: Die Zeichen < und > gelten global!
+ 2: -- wird verarbeitet
+ 3: -- ist undefiniert
+ 4: -- ist mehrmals verarbeitet
+ optional: opt
+ displaymath: formula
+ index: entry
+ math: formula
+ nothing: empty
+ file: file
+ position: position
+ reference: reference
+ csname: name
+ destination: destination
+ triplet: triplet
+ word: word
+ content: text
+ %
+ language: sprache
+ processor: processor
+ style: style
+ font: font
+ character: character
+ userdata: userdata
+ key: key
+ value: value
+ color: color
+ template: template
+ node: node
+ lpath: lpath
+ xmlsetup: xmlsetup
+ marking: marking
+ sectionblock: sectionblock
+ row: row
+ column: column
+ url: url
+ noargument: \texescape...
+ oneargument: \texescape...\texthash1
+ twoarguments: \texescape...\texthash1\texthash2
+ threearguments: \texescape...\texthash1\texthash2\texthash3
\stopmessages
\startmessages czech library: setup
- title: setup
- formula: rovnice
- number: cislo
- list: seznam
- dimension: dimenze
- mark: znacka
- reference: reference
- command: prikaz
- file: soubor
- name: jmeno
- identifier: jmeno
- text: text
- section: sekce
- singular: jmeno v singularu
- plural: jmeno v pluralu
- matrix: n*m
- see: viz
- inherits: inherits from
- 1: znaky < a > jsou globalne aktivni!
- 2: -- je zpracovano
- 3: -- je nedefinovano
- 4: -- je zpracovano znovu
- optional: opt
- displaymath: formula
- index: entry
- math: formula
- nothing: empty
- file: file
- position: position
- reference: reference
- csname: name
- destination: destination
- triplet: triplet
- word: word
- content: text
- %
- language: language
+ title: setup
+ formula: rovnice
+ number: cislo
+ list: seznam
+ dimension: dimenze
+ mark: znacka
+ reference: reference
+ command: prikaz
+ file: soubor
+ name: jmeno
+ identifier: jmeno
+ text: text
+ section: sekce
+ singular: jmeno v singularu
+ plural: jmeno v pluralu
+ matrix: n*m
+ see: viz
+ inherits: inherits from
+ 1: znaky < a > jsou globalne aktivni!
+ 2: -- je zpracovano
+ 3: -- je nedefinovano
+ 4: -- je zpracovano znovu
+ optional: opt
+ displaymath: formula
+ index: entry
+ math: formula
+ nothing: empty
+ file: file
+ position: position
+ reference: reference
+ csname: name
+ destination: destination
+ triplet: triplet
+ word: word
+ content: text
+ %
+ language: language
+ processor: processor
+ style: style
+ font: font
+ character: character
+ userdata: userdata
+ key: key
+ value: value
+ color: color
+ template: template
+ node: node
+ lpath: lpath
+ xmlsetup: xmlsetup
+ marking: marking
+ sectionblock: sectionblock
+ row: row
+ column: column
+ url: url
+ noargument: \texescape...
+ oneargument: \texescape...\texthash1
+ twoarguments: \texescape...\texthash1\texthash2
+ threearguments: \texescape...\texthash1\texthash2\texthash3
\stopmessages
\startmessages italian library: setup
- title: setup
- formula: formula
- number: number
- list: list
- dimension: dimension
- mark: mark
- reference: reference
- command: command
- file: file
- name: name
- identifier: name
- text: text
- section: section
- singular: singular name
- plural: plural name
- matrix: n*m
- see: see
- inherits: inherits from
- 1: the characters < and > are globally active!
- 2: -- is processed
- 3: -- is undefined
- 4: -- is processed again
- optional: opt
- displaymath: formula
- index: entry
- math: formula
- nothing: empty
- file: file
- position: position
- reference: reference
- csname: name
- destination: destination
- triplet: triplet
- word: word
- content: text
- %
- language: language
+ title: setup
+ formula: formula
+ number: number
+ list: list
+ dimension: dimension
+ mark: mark
+ reference: reference
+ command: command
+ file: file
+ name: name
+ identifier: name
+ text: text
+ section: section
+ singular: singular name
+ plural: plural name
+ matrix: n*m
+ see: see
+ inherits: inherits from
+ 1: the characters < and > are globally active!
+ 2: -- is processed
+ 3: -- is undefined
+ 4: -- is processed again
+ optional: opt
+ displaymath: formula
+ index: entry
+ math: formula
+ nothing: empty
+ file: file
+ position: position
+ reference: reference
+ csname: name
+ destination: destination
+ triplet: triplet
+ word: word
+ content: text
+ %
+ language: language
+ processor: processor
+ style: style
+ font: font
+ character: character
+ userdata: userdata
+ key: key
+ value: value
+ color: color
+ template: template
+ node: node
+ lpath: lpath
+ xmlsetup: xmlsetup
+ marking: marking
+ sectionblock: sectionblock
+ row: row
+ column: column
+ url: url
+ noargument: \texescape...
+ oneargument: \texescape...\texthash1
+ twoarguments: \texescape...\texthash1\texthash2
+ threearguments: \texescape...\texthash1\texthash2\texthash3
\stopmessages
\startmessages romanian library: setup
- title: setari
- formula: formula
- number: numar
- list: lista
- dimension: dimensiune
- mark: marcaj
- reference: referinta
- command: comanda
- file: fisier
- name: nume
- identifier: nume
- text: text
- section: sectiune
- singular: nume singular
- plural: nume pluram
- matrix: n*m
- see: vezi
- inherits: inherits from
- 1: caracterele < si > sunt active global!
- 2: este procesat --
- 3: -- este nedefinit
- 4: -- este procesat din nou
- optional: opt
- displaymath: formula
- index: entry
- math: formula
- nothing: empty
- file: file
- position: position
- reference: reference
- csname: name
- destination: destination
- triplet: triplet
- word: word
- content: text
- language: language
+ title: setari
+ formula: formula
+ number: numar
+ list: lista
+ dimension: dimensiune
+ mark: marcaj
+ reference: referinta
+ command: comanda
+ file: fisier
+ name: nume
+ identifier: nume
+ text: text
+ section: sectiune
+ singular: nume singular
+ plural: nume pluram
+ matrix: n*m
+ see: vezi
+ inherits: inherits from
+ 1: caracterele < si > sunt active global!
+ 2: este procesat --
+ 3: -- este nedefinit
+ 4: -- este procesat din nou
+ optional: opt
+ displaymath: formula
+ index: entry
+ math: formula
+ nothing: empty
+ file: file
+ position: position
+ reference: reference
+ csname: name
+ destination: destination
+ triplet: triplet
+ word: word
+ content: text
+ %
+ language: language
+ processor: processor
+ style: style
+ font: font
+ character: character
+ userdata: userdata
+ key: key
+ value: value
+ color: color
+ template: template
+ node: node
+ lpath: lpath
+ xmlsetup: xmlsetup
+ marking: marking
+ sectionblock: sectionblock
+ row: row
+ column: column
+ url: url
+ noargument: \texescape...
+ oneargument: \texescape...\texthash1
+ twoarguments: \texescape...\texthash1\texthash2
+ threearguments: \texescape...\texthash1\texthash2\texthash3
\stopmessages
\startmessages french library: setup
- title: réglage
- formula: formule
- number: numéro
- list: liste
- dimension: dimension
- mark: marquage
- reference: reference
- command: commande
- file: fichier
- name: nom
- identifier: identificateur
- text: texte
- section: section
- singular: nom singulier
- plural: nom pluriel
- matrix: n*m
- see: vois
- inherits: herite de
- 1: les caractères < et > sont globalement actifs !
- 2: -- est traité
- 3: -- n'est pas défini
- 4: -- est traité de nouveau
- optional: opt
- displaymath: formule
- index: entrée
- math: formule
- nothing: vide
- file: fichier
- position: position
- reference: réference
- csname: nom
- destination: destination
- triplet: triplet
- word: mot
- content: texte
- %
- language: language
+ title: réglage
+ formula: formule
+ number: numéro
+ list: liste
+ dimension: dimension
+ mark: marquage
+ reference: reference
+ command: commande
+ file: fichier
+ name: nom
+ identifier: identificateur
+ text: texte
+ section: section
+ singular: nom singulier
+ plural: nom pluriel
+ matrix: n*m
+ see: vois
+ inherits: herite de
+ 1: les caractères < et > sont globalement actifs !
+ 2: -- est traité
+ 3: -- n'est pas défini
+ 4: -- est traité de nouveau
+ optional: opt
+ displaymath: formule
+ index: entrée
+ math: formule
+ nothing: vide
+ file: fichier
+ position: position
+ reference: réference
+ csname: nom
+ destination: destination
+ triplet: triplet
+ word: mot
+ content: texte
+ %
+ language: language
+ processor: processor
+ style: style
+ font: font
+ character: character
+ userdata: userdata
+ key: key
+ value: value
+ color: color
+ template: template
+ node: node
+ lpath: lpath
+ xmlsetup: xmlsetup
+ marking: marking
+ sectionblock: sectionblock
+ row: row
+ column: column
+ url: url
+ noargument: \texescape...
+ oneargument: \texescape...\texthash1
+ twoarguments: \texescape...\texthash1\texthash2
+ threearguments: \texescape...\texthash1\texthash2\texthash3
\stopmessages
\unprotect
@@ -713,7 +864,8 @@
\ignorespaces
\stopxmlsetups
-\xmlmapvalue{setups:method}{class}{:}
+%xmlmapvalue{setups:method}{class}{:}
+\xmlmapvalue{setups:method}{range}{:}
\xmlmapvalue{setups:method}{apply}{->}
\xmlmapvalue{setups:method}{none} {}
@@ -824,21 +976,120 @@
\fi
\hss}}
-\unexpanded\def\showSETUPassignment #1{\showSETUP{#1}{[.\lower.5ex\hbox{=}.]} {[..,.\lower.5ex\hbox{=}.,..]}}
-\unexpanded\def\showSETUPkeyword #1{\showSETUP{#1}{[...]} {[...,...]}}
-\unexpanded\def\showSETUPargument #1{\showSETUP{#1}{\leftargument..\rightargument} {\leftargument..,...,..\rightargument}}
-\unexpanded\def\showSETUPdisplaymath#1{\showSETUP{#1}{\$\$...\$\$} {\$\$...\$\$}}
-\unexpanded\def\showSETUPindex #1{\showSETUP{#1}{\leftargument...\rightargument} {\leftargument..+...+..\rightargument}}
-\unexpanded\def\showSETUPmath #1{\showSETUP{#1}{\$...\$} {\$...\$}}
-\unexpanded\def\showSETUPnothing #1{\showSETUP{#1}{...} {}}
-\unexpanded\def\showSETUPfile #1{\showSETUP{#1}{~...~} {}}
-\unexpanded\def\showSETUPposition #1{\showSETUP{#1}{(...)} {(...,...)}}
-\unexpanded\def\showSETUPreference #1{\showSETUP{#1}{[...]} {[...,...]}}
-\unexpanded\def\showSETUPcsname #1{\showSETUP{#1}{{\c!setup!command!{}}} {}}
-\unexpanded\def\showSETUPdestination#1{\showSETUP{#1}{[\leftargument..[ref]\rightargument]}{[..,\leftargument..[ref,..]\rightargument,..]}}
-\unexpanded\def\showSETUPtriplet #1{\showSETUP{#1}{[x:y:z=]} {[x:y:z=,..]}}
-\unexpanded\def\showSETUPword #1{\showSETUP{#1}{\leftargument...\rightargument} {\leftargument.. ... ..\rightargument}}
-\unexpanded\def\showSETUPcontent #1{\showSETUP{#1}{\leftargument...\rightargument} {\leftargument.. ... ..\rightargument}}
+\unexpanded\def\showSETUPassignment#1%
+ {\showSETUP{#1}
+ {[.\lower.5ex\hbox{=}.]}
+ {[..,.\lower.5ex\hbox{=}.,..]}}
+
+\unexpanded\def\showSETUPkeyword#1%
+ {\showSETUP{#1}
+ {[...]}
+ {[...,...]}}
+
+\unexpanded\def\showSETUPargument#1%
+ {\showSETUP{#1}
+ {\letterleftbrace..\letterrightbrace}
+ {\letterleftbrace..,...,..\letterrightbrace}}
+
+\unexpanded\def\showSETUPdisplaymath#1%
+ {\showSETUP{#1}
+ {\letterdollar\letterdollar...\letterdollar\letterdollar}
+ {\letterdollar\letterdollar...\$\$}}
+
+\unexpanded\def\showSETUPindex#1%
+ {\showSETUP{#1}
+ {\letterleftbrace...\letterrightbrace}
+ {\letterleftbrace..+...+..\letterrightbrace}}
+
+\unexpanded\def\showSETUPmath#1%
+ {\showSETUP{#1}
+ {\letterdollar...\letterdollar}
+ {\letterdollar...\letterdollar}}
+
+\unexpanded\def\showSETUPnothing#1%
+ {\showSETUP{#1}
+ {...}
+ {}}
+
+\unexpanded\def\showSETUPfile#1%
+ {\showSETUP{#1}
+ {~...~}
+ {}}
+
+\unexpanded\def\showSETUPposition#1%
+ {\showSETUP{#1}
+ {(...)}
+ {(...,...)}}
+
+\unexpanded\def\showSETUPtemplate#1
+ {\showSETUP{#1}
+ {[\letterbar...\letterbar]}
+ {[\letterbar...\letterbar...\letterbar]}}
+
+\unexpanded\def\showSETUPangles#1%
+ {\showSETUP{#1}
+ {<<...>>}
+ {<<...>>}}
+
+\unexpanded\def\showSETUPreference#1%
+ {\showSETUP{#1}
+ {[...]}
+ {[...,...]}}
+
+\unexpanded\def\showSETUPapply#1%
+ {\showSETUP{#1}
+ {[..=>..]}
+ {[..,..=>..,...]}}
+
+\unexpanded\def\showSETUPtwowords#1%
+ {\showSETUP{#1}
+ {[..+..]}
+ {[..+..]}}
+
+\unexpanded\def\showSETUPthreewords#1%
+ {\showSETUP{#1}
+ {[..+..+..]}
+ {[..+..+..]}}
+
+\unexpanded\def\showSETUPcsname#1%
+ {\showSETUP{#1}
+ {{\c!setup!command!{}}}
+ {}}
+
+\unexpanded\def\showSETUPdestination#1%
+ {\showSETUP{#1}
+ {[\letterleftbrace..[ref]\letterrightbrace]}
+ {[..,\letterleftbrace..[ref,..]\letterrightbrace,..]}}
+
+\unexpanded\def\showSETUPtriplet#1%
+ {\showSETUP{#1}
+ {[x:y:z=]}
+ {[x:y:z=,..]}}
+
+\unexpanded\def\showSETUPword#1%
+ {\showSETUP{#1}
+ {\letterleftbrace...\letterrightbrace}
+ {\letterleftbrace.. ... ..\letterrightbrace}}
+
+\unexpanded\def\showSETUPcontent#1%
+ {\showSETUP{#1}
+ {\letterleftbrace...\letterrightbrace}
+ {\letterleftbrace.. ... ..\letterrightbrace}}
+
+\unexpanded\def\showSETUPtext#1%
+ {\showSETUP{#1}
+ {...}
+ {.. ... ..}}
+
+\unexpanded\def\showSETUPto#1%
+ {\showSETUP{#1}
+ {\texescape to }
+ {\texescape to }}
+
+\unexpanded\def\showSETUPmacro#1%
+ {\showSETUP{#1}
+ {\texescape macro }
+ {\texescape macro }}
% A prelude to a rewrite and some more:
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index 7c6ae801b..2b82ed01a 100644
--- a/tex/generic/context/luatex/luatex-fonts-merged.lua
+++ b/tex/generic/context/luatex/luatex-fonts-merged.lua
@@ -1,6 +1,6 @@
-- merged file : c:/data/develop/context/sources/luatex-fonts-merged.lua
-- parent file : c:/data/develop/context/sources/luatex-fonts.lua
--- merge date : 01/17/16 18:49:30
+-- merge date : 01/18/16 22:21:50
do -- begin closure to overcome local limits and interference
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-24 00:53:55 +0000