summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHans Hagen <pragma@wxs.nl>2013-10-30 14:53:00 +0100
committerHans Hagen <pragma@wxs.nl>2013-10-30 14:53:00 +0100
commit89d5acc7605729685c60598cf42e4d209cc291ee (patch)
tree1a3fef8e7cde9705fc3553ccc1971b3c55a77f84
parent73dd1c51aff08a045a08271cf51bacd2d07c802c (diff)
downloadcontext-89d5acc7605729685c60598cf42e4d209cc291ee.tar.gz
beta 2013.10.30 14:53
-rw-r--r--tex/context/base/cont-new.mkiv2
-rw-r--r--tex/context/base/context-version.pdfbin4106 -> 4114 bytes
-rw-r--r--tex/context/base/context.mkiv2
-rw-r--r--tex/context/base/math-fbk.lua50
-rw-r--r--tex/context/base/status-files.pdfbin24577 -> 24553 bytes
-rw-r--r--tex/context/base/status-lua.pdfbin224895 -> 224873 bytes
-rw-r--r--tex/generic/context/luatex/luatex-fonts-merged.lua2
7 files changed, 30 insertions, 26 deletions
diff --git a/tex/context/base/cont-new.mkiv b/tex/context/base/cont-new.mkiv
index fe2418d7e..97ec79b19 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.10.30 13:30}
+\newcontextversion{2013.10.30 14:53}
%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 204b0d1d6..55d179059 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 eaff168ec..63ecdf11f 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.10.30 13:30}
+\edef\contextversion{2013.10.30 14:53}
\edef\contextkind {beta}
%D For those who want to use this:
diff --git a/tex/context/base/math-fbk.lua b/tex/context/base/math-fbk.lua
index fe4cd1929..bd9a1d315 100644
--- a/tex/context/base/math-fbk.lua
+++ b/tex/context/base/math-fbk.lua
@@ -20,6 +20,7 @@ local virtualcharacters = { }
local identifiers = fonts.hashes.identifiers
local lastmathids = fonts.hashes.lastmathids
+local tounicode16 = fonts.mappings.tounicode16
-- we need a trick (todo): if we define scriptscript, script and text in
-- that order we could use their id's .. i.e. we could always add a font
@@ -503,29 +504,32 @@ virtualcharacters[0xFE935] = function(data) return smashed(data,0x02035,true) en
virtualcharacters[0xFE936] = function(data) return smashed(data,0x02036,true) end
virtualcharacters[0xFE937] = function(data) return smashed(data,0x02037,true) end
--- actuarian
+-- actuarian (beware: xits has an ugly one)
-virtualcharacters[0x020E7] = function(data)
+addextra(0xFE940, { category = "mn", description="SMALL ANNUITY SYMBOL", unicodeslot=0xFE940, mathclass="topaccent", mathname="smallactuarial" })
+
+local function actuarian(data)
local characters = data.target.characters
- -- if characters[0x020E7] then
- -- -- we cannot assume that the character is useable
- -- else
- local parameters = data.target.parameters
- local basechar = characters[0x0078] -- x (0x0058 X)
- local linewidth = parameters.xheight / 10
- local basewidth = basechar.width
- local baseheight = basechar.height
- return {
- -- compromise: lm has large hooks e.g. \actuarial{a}
- commands = {
- { "right", 2 * linewidth },
- { "down", - baseheight - 3 * linewidth },
- { "rule", linewidth, basewidth + 4 * linewidth },
- { "right", -linewidth },
- { "down", baseheight + 4 * linewidth },
- { "rule", baseheight + 5 * linewidth, linewidth },
- },
- width = basewidth + 4 * linewidth,
- }
- -- end
+ local parameters = data.target.parameters
+ local basechar = characters[0x0078] -- x (0x0058 X)
+ local linewidth = parameters.xheight / 10
+ local basewidth = basechar.width
+ local baseheight = basechar.height
+ return {
+ -- todo: add alttext
+ -- compromise: lm has large hooks e.g. \actuarial{a}
+ width = basewidth + 4 * linewidth,
+ tounicode = tounicode16(0x20E7),
+ commands = {
+ { "right", 2 * linewidth },
+ { "down", - baseheight - 3 * linewidth },
+ { "rule", linewidth, basewidth + 4 * linewidth },
+ { "right", -linewidth },
+ { "down", baseheight + 4 * linewidth },
+ { "rule", baseheight + 5 * linewidth, linewidth },
+ },
+ }
end
+
+virtualcharacters[0x020E7] = actuarian -- checked
+virtualcharacters[0xFE940] = actuarian -- unchecked
diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf
index 86c2ca88a..06e533277 100644
--- a/tex/context/base/status-files.pdf
+++ b/tex/context/base/status-files.pdf
Binary files differ
diff --git a/tex/context/base/status-lua.pdf b/tex/context/base/status-lua.pdf
index 931f19bde..f887ece7c 100644
--- a/tex/context/base/status-lua.pdf
+++ b/tex/context/base/status-lua.pdf
Binary files differ
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index 05ddf222d..8cf0e02be 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 : 10/30/13 13:30:14
+-- merge date : 10/30/13 14:53:50
do -- begin closure to overcome local limits and interference