summaryrefslogtreecommitdiff
path: root/tex
diff options
context:
space:
mode:
Diffstat (limited to 'tex')
-rw-r--r--tex/context/base/context-version.pdfbin4114 -> 4109 bytes
-rw-r--r--tex/context/base/file-syn.lua12
-rw-r--r--tex/context/base/font-pre.mkiv10
-rw-r--r--tex/context/base/m-graph.mkiv74
-rw-r--r--tex/context/base/meta-tex.lua68
-rw-r--r--tex/context/base/meta-tex.mkiv2
-rw-r--r--tex/context/base/status-files.pdfbin24553 -> 24550 bytes
-rw-r--r--tex/context/base/status-lua.pdfbin224873 -> 224966 bytes
-rw-r--r--tex/context/base/type-imp-mathdesign.mkiv56
-rw-r--r--tex/context/base/type-set.mkiv22
-rw-r--r--tex/context/base/typo-cap.lua2
-rw-r--r--tex/context/base/typo-tal.mkiv22
-rw-r--r--tex/context/fonts/charter-math.lfg28
-rw-r--r--tex/context/fonts/garamond-math.lfg28
-rw-r--r--tex/context/fonts/hanbatanglvt.lfg6
-rw-r--r--tex/context/fonts/mdbch-math.lfg37
-rw-r--r--tex/context/fonts/mdici-math.lfg37
-rw-r--r--tex/context/fonts/mdpgd-math.lfg37
-rw-r--r--tex/context/fonts/mdpus-math.lfg37
-rw-r--r--tex/context/fonts/mdput-math.lfg37
-rw-r--r--tex/context/fonts/mdugm-math.lfg37
-rw-r--r--tex/context/fonts/utopia-math.lfg28
-rw-r--r--tex/generic/context/luatex/luatex-basics-nod.lua2
-rw-r--r--tex/generic/context/luatex/luatex-fonts-merged.lua6
-rw-r--r--tex/generic/context/luatex/luatex-fonts-syn.lua2
25 files changed, 406 insertions, 184 deletions
diff --git a/tex/context/base/context-version.pdf b/tex/context/base/context-version.pdf
index 55d179059..7eb11112d 100644
--- a/tex/context/base/context-version.pdf
+++ b/tex/context/base/context-version.pdf
Binary files differ
diff --git a/tex/context/base/file-syn.lua b/tex/context/base/file-syn.lua
index 8d913bb37..c1f9a5f48 100644
--- a/tex/context/base/file-syn.lua
+++ b/tex/context/base/file-syn.lua
@@ -32,11 +32,15 @@ function commands.truefilename(name)
end
function commands.definefilesynonym(name,realname)
- local synonym = filesynonyms[name]
- if synonym then
- interfaces.showmessage("files",1,{ name or "?", realname or "?", synonym or "?" })
+ local names = settings_to_array(name)
+ for i=1,#names do
+ local name = names[i]
+ local synonym = filesynonyms[name]
+ if synonym then
+ interfaces.showmessage("files",1,{ name or "?", realname or "?", synonym or "?" })
+ end
+ filesynonyms[name] = realname
end
- filesynonyms[name] = realname
end
function commands.definefilefallback(name,alternatives)
diff --git a/tex/context/base/font-pre.mkiv b/tex/context/base/font-pre.mkiv
index 7d892ad37..4f44c6f00 100644
--- a/tex/context/base/font-pre.mkiv
+++ b/tex/context/base/font-pre.mkiv
@@ -62,6 +62,10 @@
[tnum=yes,
lnum=no]
+\definefontfeature
+ [oldstylenumbers]
+ [onum=yes]
+
% \definefontfeature
% [newstyle]
% [onum=no]
@@ -165,6 +169,12 @@
calt=yes,
kern=yes]
+\definefontfeature
+ [jamoforms]
+ [ljmo=yes,
+ tjmo=yes,
+ vjmo=yes]
+
% symbols:
\definefontfeature
diff --git a/tex/context/base/m-graph.mkiv b/tex/context/base/m-graph.mkiv
index f8114561c..978b20eeb 100644
--- a/tex/context/base/m-graph.mkiv
+++ b/tex/context/base/m-graph.mkiv
@@ -17,76 +17,6 @@
\unprotect
-\startluacode
- local format, gsub, find, match = string.format, string.gsub, string.find, string.match
-
- local simplify = true
-
- -- local function strip(n,e)
- -- -- get rid of e(0)
- -- -- get rid of e(+*)
- -- e = gsub(e,"^+","")
- -- -- remove leading zeros
- -- e = gsub(e,"^([+-]*)0+(%d)","%1%2")
- -- if not simplify then
- -- -- take it as it is
- -- elseif n == "1" then
- -- return format("10^{%s}",e)
- -- end
- -- return format("%s\\times10^{%s}",n,e)
- -- end
- --
- -- function metapost.format_n(fmt,...)
- -- fmt = gsub(fmt,"@","%%")
- -- local initial, hasformat, final = match(fmt,"^(.-)(%%.-[%a])(.-)$")
- -- if hasformat then
- -- str = format(fmt,...)
- -- str = gsub(str,"(.-)e(.-)$",strip)
- -- str = format("%s\\mathematics{%s}%s",initial,str,final)
- -- elseif not find(fmt,"%%") then
- -- str = format("%"..fmt,...)
- -- str = gsub(str,"(.-)e(.-)$",strip)
- -- str = format("\\mathematics{%s}",str)
- -- end
- -- context(str)
- -- end
-
- -- todo: proper lpeg
-
- local function strip(n,e)
- -- get rid of e(0)
- -- get rid of e(+*)
- e = gsub(e,"^+","")
- -- remove leading zeros
- e = gsub(e,"^([+-]*)0+(%d)","%1%2")
- if not simplify then
- -- take it as it is
- elseif n == "1" then
- return format("\\mathematics{10^{%s}}",e)
- end
- return format("\\mathematics{%s\\times10^{%s}}",n,e)
- end
-
- function metapost.format_n(fmt,...)
- fmt = gsub(fmt,"@","%%")
- if find(fmt,"%%") then
- str = format(fmt,...)
- else -- yes or no
- str = format("%"..fmt,...)
- end
- str = gsub(str,"([%-%+]-[%.%d]+)e([%-%+]-[%.%d]+)",strip)
- context(str)
- end
-
- function metapost.format_v(fmt,str)
- metapost.format_n(fmt,metapost.untagvariable(str,false))
- end
-\stopluacode
-
-\unexpanded\def\MPgraphformat#1#2{\ctxlua{metapost.format_v("#1","#2")}}
-
-% We could also delegate parsing using lower level plugins.
-
\defineMPinstance
[graph]
[\s!format=metafun,
@@ -121,6 +51,8 @@
label(format("@i,@f",(1.23,4.56)),(0cm,-3.5cm)) ;
\stopMPpage
+\stoptext
+
% \startMPpage[instance=graph]
% draw begingraph(3in,2in);
% gdraw "t:/metapost/grphdata/agepop91.d";
@@ -179,5 +111,3 @@
% autogrid(otick.bot,otick.rt);
% endgraph;
% \stopMPpage
-
-\stoptext
diff --git a/tex/context/base/meta-tex.lua b/tex/context/base/meta-tex.lua
index c29498ad1..94815495d 100644
--- a/tex/context/base/meta-tex.lua
+++ b/tex/context/base/meta-tex.lua
@@ -6,7 +6,9 @@ if not modules then modules = { } end modules ['meta-tex'] = {
license = "see context related readme files"
}
---~ local P, C, lpegmatch = lpeg.P, lpeg.C, lpeg.match
+local format, gsub, find, match = string.format, string.gsub, string.find, string.match
+
+local P, C, Cs, lpegmatch = lpeg.P, lpeg.C, lpeg.Cs, lpeg.match
-- local left = P("[")
-- local right = P("]")
@@ -29,10 +31,70 @@ if not modules then modules = { } end modules ['meta-tex'] = {
-- end
-- end
-local P, Cs, lpegmatch = lpeg.P, lpeg.Cs, lpeg.match
-
local pattern = Cs((P([[\"]]) + P([["]])/"\\quotedbl{}" + P(1))^0) -- or \char
function metapost.escaped(str)
context(lpegmatch(pattern,str))
end
+
+local simplify = true
+
+-- local function strip(n,e)
+-- -- get rid of e(0)
+-- -- get rid of e(+*)
+-- e = gsub(e,"^+","")
+-- -- remove leading zeros
+-- e = gsub(e,"^([+-]*)0+(%d)","%1%2")
+-- if not simplify then
+-- -- take it as it is
+-- elseif n == "1" then
+-- return format("10^{%s}",e)
+-- end
+-- return format("%s\\times10^{%s}",n,e)
+-- end
+--
+-- function metapost.format_n(fmt,...)
+-- fmt = gsub(fmt,"@","%%")
+-- local initial, hasformat, final = match(fmt,"^(.-)(%%.-[%a])(.-)$")
+-- if hasformat then
+-- str = format(fmt,...)
+-- str = gsub(str,"(.-)e(.-)$",strip)
+-- str = format("%s\\mathematics{%s}%s",initial,str,final)
+-- elseif not find(fmt,"%%") then
+-- str = format("%"..fmt,...)
+-- str = gsub(str,"(.-)e(.-)$",strip)
+-- str = format("\\mathematics{%s}",str)
+-- end
+-- context(str)
+-- end
+
+-- todo: proper lpeg
+
+local function strip(n,e)
+ -- get rid of e(0)
+ -- get rid of e(+*)
+ e = gsub(e,"^+","")
+ -- remove leading zeros
+ e = gsub(e,"^([+-]*)0+(%d)","%1%2")
+ if not simplify then
+ -- take it as it is
+ elseif n == "1" then
+ return format("\\mathematics{10^{%s}}",e)
+ end
+ return format("\\mathematics{%s\\times10^{%s}}",n,e)
+end
+
+function metapost.format_n(fmt,...)
+ fmt = gsub(fmt,"@","%%")
+ if find(fmt,"%%") then
+ str = format(fmt,...)
+ else -- yes or no
+ str = format("%"..fmt,...)
+ end
+ str = gsub(str,"([%-%+]-[%.%d]+)e([%-%+]-[%.%d]+)",strip)
+ context(str)
+end
+
+function metapost.format_v(fmt,str)
+ metapost.format_n(fmt,metapost.untagvariable(str,false))
+end
diff --git a/tex/context/base/meta-tex.mkiv b/tex/context/base/meta-tex.mkiv
index 4defd260c..9392e3fc9 100644
--- a/tex/context/base/meta-tex.mkiv
+++ b/tex/context/base/meta-tex.mkiv
@@ -138,4 +138,6 @@
%
% {\showstruts\useMPgraphic{testgraphic}}
+\unexpanded\def\MPgraphformat#1#2{\ctxlua{metapost.format_v("#1","#2")}}
+
\protect \endinput
diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf
index 06e533277..05cfa59c1 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 f887ece7c..09d41b7da 100644
--- a/tex/context/base/status-lua.pdf
+++ b/tex/context/base/status-lua.pdf
Binary files differ
diff --git a/tex/context/base/type-imp-mathdesign.mkiv b/tex/context/base/type-imp-mathdesign.mkiv
index 39ec3843f..0f7f5cafd 100644
--- a/tex/context/base/type-imp-mathdesign.mkiv
+++ b/tex/context/base/type-imp-mathdesign.mkiv
@@ -1,9 +1,9 @@
%D \module
%D [ file=type-imp-mathdesign,
-%D version=2007.07.30,
+%D version=2013.10.31,
%D title=\CONTEXT\ Typescript Macros,
%D subtitle=Mathdesign,
-%D author=Hans Hagen,
+%D author=Hans Hagen \& Wolfgang Schuster,
%D date=\currentdate,
%D copyright={PRAGMA ADE \& \CONTEXT\ Development Team}]
%C
@@ -13,20 +13,52 @@
\starttypescriptcollection [mathdesign]
- \starttypescript [\s!math] [charter,mathdesignch] [\s!all]
- \loadfontgoodies[charter-math]
- \definefontsynonym[\s!MathRoman][chartermath@charter-math]
+ % Bitstream Charter
+
+ \starttypescript [\s!math] [mdbch,mathdesignch,mathdesigncharter] [\s!all]
+ \loadfontgoodies[mdbch-math]
+ \definefontsynonym [\s!MathRoman] [mdbchrm@mdbch-rm]
+ \definefontsynonym [\s!MathRomanBold] [mdbchbf@mdbch-bf]
\stoptypescript
- \starttypescript [\s!math] [garamond,mathdesigngm] [\s!all]
- \loadfontgoodies[garamond-math]
- \definefontsynonym[\s!MathRoman][garamondmath@garamond-math]
+ % URW Garamond
+
+ \starttypescript [\s!math] [mdugm,mathdesigngm,mathdesigngaramond] [\s!all]
+ \loadfontgoodies[mdugm-math]
+ \definefontsynonym [\s!MathRoman] [mdugmrm@mdugm-rm]
+ \definefontsynonym [\s!MathRomanBold] [mdugmbf@mdugm-bf]
\stoptypescript
- \starttypescript [\s!math] [utopia,mathdesignut] [\s!all]
- \loadfontgoodies[utopia-math]
- \definefontsynonym[\s!MathRoman][utopiamath@utopia-math]
+ % Adobe Utopia
+
+ \starttypescript [\s!math] [mdput,mathdesignut,mathdesignutopia] [\s!all]
+ \loadfontgoodies[mdput-math]
+ \definefontsynonym [\s!MathRoman] [mdputrm@mdput-rm]
+ \definefontsynonym [\s!MathRomanBold] [mdputbf@mdput-bf]
\stoptypescript
-\stoptypescriptcollection
+ % Charter ITC Std
+
+ \starttypescript [\s!math] [mdici,mathdesignci] [\s!all]
+ \loadfontgoodies[mdici-math]
+ \definefontsynonym [\s!MathRoman] [mdicirm@mdici-rm]
+ \definefontsynonym [\s!MathRomanBold] [mdicibf@mdici-bf]
+ \stoptypescript
+
+ % Adobe Garamond Pro
+ \starttypescript [\s!math] [mdpgd,mathdesigngd] [\s!all]
+ \loadfontgoodies[mdpgd-math]
+ \definefontsynonym [\s!MathRoman] [mdpgdrm@mdpgd-rm]
+ \definefontsynonym [\s!MathRomanBold] [mdpgdbf@mdpgd-bf]
+ \stoptypescript
+
+ % Adobe Utopia Std
+
+ \starttypescript [\s!math] [mdpus,mathdesignus] [\s!all]
+ \loadfontgoodies[mdpus-math]
+ \definefontsynonym [\s!MathRoman] [mdpusrm@mdpus-rm]
+ \definefontsynonym [\s!MathRomanBold] [mdpusbf@mdpus-bf]
+ \stoptypescript
+
+\stoptypescriptcollection
diff --git a/tex/context/base/type-set.mkiv b/tex/context/base/type-set.mkiv
index 43e561722..b07944afe 100644
--- a/tex/context/base/type-set.mkiv
+++ b/tex/context/base/type-set.mkiv
@@ -98,7 +98,25 @@
\definefilesynonym [type-imp-eulernovum.mkiv] [type-imp-euler.mkiv]
\definefilesynonym [type-imp-eulernova.mkiv] [type-imp-euler.mkiv]
-\definefilesynonym [type-imp-euler-with-pagella] [type-imp-euler.mkiv]
-\definefilesynonym [type-imp-pagella-with-euler] [type-imp-euler.mkiv]
+\definefilesynonym [type-imp-euler-with-pagella.mkiv] [type-imp-euler.mkiv]
+\definefilesynonym [type-imp-pagella-with-euler.mkiv] [type-imp-euler.mkiv]
+
+\definefilesynonym [type-imp-mdbch.mkiv] [type-imp-mathdesign.mkiv]
+\definefilesynonym [type-imp-mdugm.mkiv] [type-imp-mathdesign.mkiv]
+\definefilesynonym [type-imp-mdput.mkiv] [type-imp-mathdesign.mkiv]
+\definefilesynonym [type-imp-mdici.mkiv] [type-imp-mathdesign.mkiv]
+\definefilesynonym [type-imp-mdpgd.mkiv] [type-imp-mathdesign.mkiv]
+\definefilesynonym [type-imp-mdpus.mkiv] [type-imp-mathdesign.mkiv]
+
+\definefilesynonym [type-imp-mathdesignch.mkiv] [type-imp-mathdesign.mkiv]
+\definefilesynonym [type-imp-mathdesigngm.mkiv] [type-imp-mathdesign.mkiv]
+\definefilesynonym [type-imp-mathdesignut.mkiv] [type-imp-mathdesign.mkiv]
+\definefilesynonym [type-imp-mathdesignci.mkiv] [type-imp-mathdesign.mkiv]
+\definefilesynonym [type-imp-mathdesigngd.mkiv] [type-imp-mathdesign.mkiv]
+\definefilesynonym [type-imp-mathdesignus.mkiv] [type-imp-mathdesign.mkiv]
+
+\definefilesynonym [type-imp-mathdesigncharter.mkiv] [type-imp-mathdesign.mkiv]
+\definefilesynonym [type-imp-mathdesigngaramond.mkiv] [type-imp-mathdesign.mkiv]
+\definefilesynonym [type-imp-mathdesignutopia.mkiv] [type-imp-mathdesign.mkiv]
\protect \endinput
diff --git a/tex/context/base/typo-cap.lua b/tex/context/base/typo-cap.lua
index 2988d5474..0fc1a3093 100644
--- a/tex/context/base/typo-cap.lua
+++ b/tex/context/base/typo-cap.lua
@@ -115,7 +115,7 @@ local function helper(start,attr,lastfont,n,codes,special,once,keepother)
local previd = start.prev.id
if previd ~= glyph_code and previd ~= disc_code then
fnt = lfa
- setfield(start,"font",lfa)
+ start.font = lfa
end
end
end
diff --git a/tex/context/base/typo-tal.mkiv b/tex/context/base/typo-tal.mkiv
index fb3955aec..85643a5f9 100644
--- a/tex/context/base/typo-tal.mkiv
+++ b/tex/context/base/typo-tal.mkiv
@@ -111,6 +111,28 @@
%D We need fonts to provide tabular digits that is, the digits need to have the same
%D width.
+%D
+%D \startbuffer
+%D \startbuffer[demo]
+%D \switchtobodyfont[pagella]
+%D \setupTABLE[column][1][alignmentcharacter=.,aligncharacter=yes]
+%D \bTABLE
+%D \bTR \bTD 11.111 \eTD \bTD 11.111 \eTD \eTR
+%D \bTR \bTD 2.2 \eTD \bTD 2.2 \eTD \eTR
+%D \bTR \bTD 444.444 \eTD \bTD 444.444 \eTD \eTR
+%D \eTABLE
+%D \stopbuffer
+%D
+%D \start inlinenumbers: \crlf \addfeature[inlinenumbers] \getbuffer \stop
+%D \start tabularnumbers: \crlf \addfeature[tabularnumbers] \getbuffer \stop
+%D \start oldstylenumbers:\crlf \addfeature[oldstylenumbers] \getbuffer \stop
+%D \stopbuffer
+%D
+%D \enabledirectives[typesetters.characteralign.autofont]
+%D \typebuffer \blank \getbuffer \blank
+%D \disabledirectives[typesetters.characteralign.autofont]
+%D \typebuffer \blank \getbuffer \blank
+%D \enabledirectives[typesetters.characteralign.autofont]
\definefontfeature
[system:tabnum]
diff --git a/tex/context/fonts/charter-math.lfg b/tex/context/fonts/charter-math.lfg
deleted file mode 100644
index 9d061d1e0..000000000
--- a/tex/context/fonts/charter-math.lfg
+++ /dev/null
@@ -1,28 +0,0 @@
-return {
- name = "charter-math",
- version = "1.00",
- comment = "Goodies that complement charter math.",
- author = "Hans, Mojca, Aditya",
- copyright = "ConTeXt development team",
- mathematics = {
- mapfiles = {
- "mdbch.map",
- "mkiv-base.map",
- },
- virtuals = {
- ["charter-math"] = {
- -- { name = "file:bchr8a", features = "virtualmath", main = true },
- { name = "file:bchri8a", features = "virtualmath", main = true },
- -- { name = "md-chr7m.tfm", vector = "tex-mr" },
- { name = "md-chri7m.tfm", vector = "tex-mi", skewchar=0x7F },
- { name = "md-chri7m.tfm", vector = "tex-it", skewchar=0x7F },
- { name = "md-chr7y.tfm", vector = "tex-sy", skewchar=0x30, parameters = true },
- { name = "md-chr7v.tfm", vector = "tex-ex", extension = true },
- -- { name = "md-chbma.tfm", vector = "tex-ma" },
- -- { name = "md-chbmb.tfm", vector = "tex-mb" },
- { name = "msam10.tfm", vector = "tex-ma" },
- { name = "msbm10.tfm", vector = "tex-mb" },
- }
- }
- }
-}
diff --git a/tex/context/fonts/garamond-math.lfg b/tex/context/fonts/garamond-math.lfg
deleted file mode 100644
index a082f8a9d..000000000
--- a/tex/context/fonts/garamond-math.lfg
+++ /dev/null
@@ -1,28 +0,0 @@
-return {
- name = "garamond-math",
- version = "1.00",
- comment = "Goodies that complement garamond math.",
- author = "Hans, Mojca, Aditya",
- copyright = "ConTeXt development team",
- mathematics = {
- mapfiles = {
- "mdugm.map",
- "mkiv-base.map",
- },
- virtuals = {
- ["garamond-math"] = {
- -- { name = "file:ugmr8a", features = "virtualmath", main = true },
- { name = "file:ugmri8a", features = "virtualmath", main = true },
- -- { name = "md-gmr7m.tfm", vector = "tex-mr" },
- { name = "md-gmri7m.tfm", vector = "tex-mi", skewchar=0x7F },
- { name = "md-gmri7m.tfm", vector = "tex-it", skewchar=0x7F },
- { name = "md-gmr7y.tfm", vector = "tex-sy", skewchar=0x30, parameters = true },
- { name = "md-gmr7v.tfm", vector = "tex-ex", extension = true },
- -- { name = "md-gmmma.tfm", vector = "tex-ma" },
- -- { name = "md-gmmmb.tfm", vector = "tex-mb" },
- { name = "msam10.tfm", vector = "tex-ma" },
- { name = "msbm10.tfm", vector = "tex-mb" },
- }
- }
- }
-}
diff --git a/tex/context/fonts/hanbatanglvt.lfg b/tex/context/fonts/hanbatanglvt.lfg
index 0e3eaf5ed..333743348 100644
--- a/tex/context/fonts/hanbatanglvt.lfg
+++ b/tex/context/fonts/hanbatanglvt.lfg
@@ -22,9 +22,9 @@ return {
author = "Hans Hagen",
colorschemes = {
default = {
- range(0x01100,0x0115F), -- jamo_initial
- range(0x01160,0x011A7), -- jamo_medial
- range(0x011A8,0x011FF), -- jamo_final
+ range(0x01100,0x0115F), -- jamo_initial (r/c)
+ range(0x01160,0x011A7), -- jamo_medial (g/m)
+ range(0x011A8,0x011FF), -- jamo_final (b/y)
}
}
}
diff --git a/tex/context/fonts/mdbch-math.lfg b/tex/context/fonts/mdbch-math.lfg
new file mode 100644
index 000000000..c66a3575a
--- /dev/null
+++ b/tex/context/fonts/mdbch-math.lfg
@@ -0,0 +1,37 @@
+return {
+ name = "mdbch-math",
+ version = "1.00",
+ comment = "Math fonts that complement ITC Charter.",
+ author = "Hans, Mojca, Aditya",
+ copyright = "ConTeXt development team",
+ mathematics = {
+ mapfiles = {
+ "mdbch.map",
+ "mkiv-base.map",
+ },
+ virtuals = {
+ ["mdbch-rm"] = {
+ { name = "file:bchr8a", features = "virtualmath", main = true },
+ { name = "mdbchr7m", vector = "tex-mr", skewchar=0x7F },
+ { name = "mdbchri7m", vector = "tex-mi", skewchar=0x7F },
+ { name = "mdbchri7m", vector = "tex-it", skewchar=0x7F },
+ { name = "mdbchb7m", vector = "tex-bf", skewchar=0x7F },
+ { name = "mdbchbi7m", vector = "tex-bi", skewchar=0x7F },
+ { name = "mdbchr7y", vector = "tex-sy", skewchar=0x30, parameters = true },
+ { name = "mdbchr7v", vector = "tex-ex", extension = true },
+ { name = "mdbchrma", vector = "tex-ma" },
+ { name = "mdbchrmb", vector = "tex-mb" },
+ },
+ ["mdbch-bf"] = {
+ { name = "file:bchb8a", features = "virtualmath", main = true },
+ { name = "mdbchb7m", vector = "tex-mr", skewchar=0x7F },
+ { name = "mdbchbi7m", vector = "tex-mi", skewchar=0x7F },
+ { name = "mdbchbi7m", vector = "tex-it", skewchar=0x7F },
+ { name = "mdbchb7y", vector = "tex-sy", skewchar=0x30, parameters = true },
+ { name = "mdbchb7v", vector = "tex-ex", extension = true },
+ { name = "mdbchbma", vector = "tex-ma" },
+ { name = "mdbchbmb", vector = "tex-mb" },
+ }
+ }
+ }
+}
diff --git a/tex/context/fonts/mdici-math.lfg b/tex/context/fonts/mdici-math.lfg
new file mode 100644
index 000000000..84833c407
--- /dev/null
+++ b/tex/context/fonts/mdici-math.lfg
@@ -0,0 +1,37 @@
+return {
+ name = "mdici-math",
+ version = "1.00",
+ comment = "Math fonts that complement Charter ITC Std.",
+ author = "Hans, Mojca, Aditya",
+ copyright = "ConTeXt development team",
+ mathematics = {
+ mapfiles = {
+ "mdici.map",
+ "mkiv-base.map",
+ },
+ virtuals = {
+ ["mdici-rm"] = {
+ { name = "file:bchr8a", features = "virtualmath", main = true },
+ { name = "mdicir7m", vector = "tex-mr", skewchar=0x7F },
+ { name = "mdiciri7m", vector = "tex-mi", skewchar=0x7F },
+ { name = "mdiciri7m", vector = "tex-it", skewchar=0x7F },
+ { name = "mdicib7m", vector = "tex-bf", skewchar=0x7F },
+ { name = "mdicibi7m", vector = "tex-bi", skewchar=0x7F },
+ { name = "mdicir7y", vector = "tex-sy", skewchar=0x30, parameters = true },
+ { name = "mdicir7v", vector = "tex-ex", extension = true },
+ { name = "mdicirma", vector = "tex-ma" },
+ { name = "mdicirmb", vector = "tex-mb" },
+ },
+ ["mdici-bf"] = {
+ { name = "file:bchb8a", features = "virtualmath", main = true },
+ { name = "mdicib7m", vector = "tex-mr", skewchar=0x7F },
+ { name = "mdicibi7m", vector = "tex-mi", skewchar=0x7F },
+ { name = "mdicibi7m", vector = "tex-it", skewchar=0x7F },
+ { name = "mdicib7y", vector = "tex-sy", skewchar=0x30, parameters = true },
+ { name = "mdicib7v", vector = "tex-ex", extension = true },
+ { name = "mdicibma", vector = "tex-ma" },
+ { name = "mdicibmb", vector = "tex-mb" },
+ }
+ }
+ }
+}
diff --git a/tex/context/fonts/mdpgd-math.lfg b/tex/context/fonts/mdpgd-math.lfg
new file mode 100644
index 000000000..b7863b46e
--- /dev/null
+++ b/tex/context/fonts/mdpgd-math.lfg
@@ -0,0 +1,37 @@
+return {
+ name = "mdpgd-math",
+ version = "1.00",
+ comment = "Math fonts that complement Adobe Garamond Pro.",
+ author = "Hans, Mojca, Aditya",
+ copyright = "ConTeXt development team",
+ mathematics = {
+ mapfiles = {
+ "mdpgd.map",
+ "mkiv-base.map",
+ },
+ virtuals = {
+ ["mdpgd-rm"] = {
+ { name = "file:ugmr8a", features = "virtualmath", main = true },
+ { name = "mdpgdr7m", vector = "tex-mr", skewchar=0x7F },
+ { name = "mdpgdri7m", vector = "tex-mi", skewchar=0x7F },
+ { name = "mdpgdri7m", vector = "tex-it", skewchar=0x7F },
+ { name = "mdpgds7m", vector = "tex-bf", skewchar=0x7F },
+ { name = "mdpgdsi7m", vector = "tex-bi", skewchar=0x7F },
+ { name = "mdpgdr7y", vector = "tex-sy", skewchar=0x30, parameters = true },
+ { name = "mdpgdr7v", vector = "tex-ex", extension = true },
+ { name = "mdpgdrma", vector = "tex-ma" },
+ { name = "mdpgdrmb", vector = "tex-mb" },
+ },
+ ["mdpgd-bf"] = {
+ { name = "file:ugmm8a", features = "virtualmath", main = true },
+ { name = "mdpgds7m", vector = "tex-mr", skewchar=0x7F },
+ { name = "mdpgdsi7m", vector = "tex-mi", skewchar=0x7F },
+ { name = "mdpgdsi7m", vector = "tex-it", skewchar=0x7F },
+ { name = "mdpgds7y", vector = "tex-sy", skewchar=0x30, parameters = true },
+ { name = "mdpgds7v", vector = "tex-ex", extension = true },
+ { name = "mdpgdsma", vector = "tex-ma" },
+ { name = "mdpgdsmb", vector = "tex-mb" },
+ }
+ }
+ }
+}
diff --git a/tex/context/fonts/mdpus-math.lfg b/tex/context/fonts/mdpus-math.lfg
new file mode 100644
index 000000000..95d51de14
--- /dev/null
+++ b/tex/context/fonts/mdpus-math.lfg
@@ -0,0 +1,37 @@
+return {
+ name = "mdpus-math",
+ version = "1.00",
+ comment = "Math fonts that complement Adobe Utopia Std.",
+ author = "Hans, Mojca, Aditya",
+ copyright = "ConTeXt development team",
+ mathematics = {
+ mapfiles = {
+ "mdpus.map",
+ "mkiv-base.map",
+ },
+ virtuals = {
+ ["mdpus-rm"] = {
+ { name = "file:putr8a", features = "virtualmath", main = true },
+ { name = "mdpusr7m", vector = "tex-mr", skewchar=0x7F },
+ { name = "mdpusri7m", vector = "tex-mi", skewchar=0x7F },
+ { name = "mdpusri7m", vector = "tex-it", skewchar=0x7F },
+ { name = "mdpuss7m", vector = "tex-bf", skewchar=0x7F },
+ { name = "mdpussi7m", vector = "tex-bi", skewchar=0x7F },
+ { name = "mdpusr7y", vector = "tex-sy", skewchar=0x30, parameters = true },
+ { name = "mdpusr7v", vector = "tex-ex", extension = true },
+ { name = "mdpusrma", vector = "tex-ma" },
+ { name = "mdpusrmb", vector = "tex-mb" },
+ },
+ ["mdpus-bf"] = {
+ { name = "file:putb8a", features = "virtualmath", main = true },
+ { name = "mdpuss7m", vector = "tex-mr", skewchar=0x7F },
+ { name = "mdpussi7m", vector = "tex-mi", skewchar=0x7F },
+ { name = "mdpussi7m", vector = "tex-it", skewchar=0x7F },
+ { name = "mdpuss7y", vector = "tex-sy", skewchar=0x30, parameters = true },
+ { name = "mdpuss7v", vector = "tex-ex", extension = true },
+ { name = "mdpussma", vector = "tex-ma" },
+ { name = "mdpussmb", vector = "tex-mb" },
+ }
+ }
+ }
+}
diff --git a/tex/context/fonts/mdput-math.lfg b/tex/context/fonts/mdput-math.lfg
new file mode 100644
index 000000000..8f7b01833
--- /dev/null
+++ b/tex/context/fonts/mdput-math.lfg
@@ -0,0 +1,37 @@
+return {
+ name = "mdput-math",
+ version = "1.00",
+ comment = "Math fonts that complement Adobe Utopia.",
+ author = "Hans, Mojca, Aditya",
+ copyright = "ConTeXt development team",
+ mathematics = {
+ mapfiles = {
+ "mdput.map",
+ "mkiv-base.map",
+ },
+ virtuals = {
+ ["mdput-rm"] = {
+ { name = "file:putr8a", features = "virtualmath", main = true },
+ { name = "mdugmr7m", vector = "tex-mr", skewchar=0x7F },
+ { name = "mdugmri7m", vector = "tex-mi", skewchar=0x7F },
+ { name = "mdugmri7m", vector = "tex-it", skewchar=0x7F },
+ { name = "mdugmm7m", vector = "tex-bf", skewchar=0x7F },
+ { name = "mdugmmi7m", vector = "tex-bi", skewchar=0x7F },
+ { name = "mdugmr7y", vector = "tex-sy", skewchar=0x30, parameters = true },
+ { name = "mdugmr7v", vector = "tex-ex", extension = true },
+ { name = "mdugmrma", vector = "tex-ma" },
+ { name = "mdugmrmb", vector = "tex-mb" },
+ },
+ ["mdput-bf"] = {
+ { name = "file:putb8a", features = "virtualmath", main = true },
+ { name = "mdugmm7m", vector = "tex-mr", skewchar=0x7F },
+ { name = "mdugmmi7m", vector = "tex-mi", skewchar=0x7F },
+ { name = "mdugmmi7m", vector = "tex-it", skewchar=0x7F },
+ { name = "mdugmm7y", vector = "tex-sy", skewchar=0x30, parameters = true },
+ { name = "mdugmm7v", vector = "tex-ex", extension = true },
+ { name = "mdugmmma", vector = "tex-ma" },
+ { name = "mdugmmmb", vector = "tex-mb" },
+ }
+ }
+ }
+}
diff --git a/tex/context/fonts/mdugm-math.lfg b/tex/context/fonts/mdugm-math.lfg
new file mode 100644
index 000000000..7e99c4b85
--- /dev/null
+++ b/tex/context/fonts/mdugm-math.lfg
@@ -0,0 +1,37 @@
+return {
+ name = "mdugm-math",
+ version = "1.00",
+ comment = "Math fonts that complement URW Garamond.",
+ author = "Hans, Mojca, Aditya",
+ copyright = "ConTeXt development team",
+ mathematics = {
+ mapfiles = {
+ "mdugm.map",
+ "mkiv-base.map",
+ },
+ virtuals = {
+ ["mdugm-rm"] = {
+ { name = "file:ugmr8a", features = "virtualmath", main = true },
+ { name = "mdputr7m", vector = "tex-mr", skewchar=0x7F },
+ { name = "mdputri7m", vector = "tex-mi", skewchar=0x7F },
+ { name = "mdputri7m", vector = "tex-it", skewchar=0x7F },
+ { name = "mdputb7m", vector = "tex-bf", skewchar=0x7F },
+ { name = "mdputbi7m", vector = "tex-bi", skewchar=0x7F },
+ { name = "mdputr7y", vector = "tex-sy", skewchar=0x30, parameters = true },
+ { name = "mdputr7v", vector = "tex-ex", extension = true },
+ { name = "mdputrma", vector = "tex-ma" },
+ { name = "mdputrmb", vector = "tex-mb" },
+ },
+ ["mdugm-bf"] = {
+ { name = "file:ugmm8a", features = "virtualmath", main = true },
+ { name = "mdputb7m", vector = "tex-mr", skewchar=0x7F },
+ { name = "mdputbi7m", vector = "tex-mi", skewchar=0x7F },
+ { name = "mdputbi7m", vector = "tex-it", skewchar=0x7F },
+ { name = "mdputb7y", vector = "tex-sy", skewchar=0x30, parameters = true },
+ { name = "mdputb7v", vector = "tex-ex", extension = true },
+ { name = "mdputbma", vector = "tex-ma" },
+ { name = "mdputbmb", vector = "tex-mb" },
+ }
+ }
+ }
+}
diff --git a/tex/context/fonts/utopia-math.lfg b/tex/context/fonts/utopia-math.lfg
deleted file mode 100644
index 4074aa886..000000000
--- a/tex/context/fonts/utopia-math.lfg
+++ /dev/null
@@ -1,28 +0,0 @@
-return {
- name = "utopia-math",
- version = "1.00",
- comment = "Goodies that complement utopia math.",
- author = "Hans, Mojca, Aditya",
- copyright = "ConTeXt development team",
- mathematics = {
- mapfiles = {
- "mdput.map",
- "mkiv-base.map",
- },
- virtuals = {
- ["utopia-math"] = {
- -- { name = "file:putr8a", features = "virtualmath", main = true },
- { name = "file:putri8a", features = "virtualmath", main = true },
- -- { name = "md-utr7m.tfm", vector = "tex-mr" },
- { name = "md-utri7m.tfm", vector = "tex-mi", skewchar=0x7F },
- { name = "md-utri7m.tfm", vector = "tex-it", skewchar=0x7F },
- { name = "md-utr7y.tfm", vector = "tex-sy", skewchar=0x30, parameters = true },
- { name = "md-utr7v.tfm", vector = "tex-ex", extension = true },
- -- { name = "md-utbma.tfm", vector = "tex-ma" },
- -- { name = "md-utbmb.tfm", vector = "tex-mb" },
- { name = "msam10.tfm", vector = "tex-ma" },
- { name = "msbm10.tfm", vector = "tex-mb" },
- }
- }
- }
-}
diff --git a/tex/generic/context/luatex/luatex-basics-nod.lua b/tex/generic/context/luatex/luatex-basics-nod.lua
index 50a1e8627..50af40193 100644
--- a/tex/generic/context/luatex/luatex-basics-nod.lua
+++ b/tex/generic/context/luatex/luatex-basics-nod.lua
@@ -54,11 +54,13 @@ nodes.handlers = { }
local nodecodes = { } for k,v in next, node.types () do nodecodes[string.gsub(v,"_","")] = k end
local whatcodes = { } for k,v in next, node.whatsits() do whatcodes[string.gsub(v,"_","")] = k end
local glyphcodes = { [0] = "character", "glyph", "ligature", "ghost", "left", "right" }
+local disccodes = { [0] = "discretionary","explicit", "automatic", "regular", "first", "second" }
nodes.nodecodes = nodecodes
nodes.whatcodes = whatcodes
nodes.whatsitcodes = whatcodes
nodes.glyphcodes = glyphcodes
+nodes.disccodes = disccodes
local free_node = node.free
local remove_node = node.remove
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index 8cf0e02be..41ed20fdc 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 14:53:50
+-- merge date : 11/01/13 12:20:30
do -- begin closure to overcome local limits and interference
@@ -3400,10 +3400,12 @@ nodes.handlers={}
local nodecodes={} for k,v in next,node.types () do nodecodes[string.gsub(v,"_","")]=k end
local whatcodes={} for k,v in next,node.whatsits() do whatcodes[string.gsub(v,"_","")]=k end
local glyphcodes={ [0]="character","glyph","ligature","ghost","left","right" }
+local disccodes={ [0]="discretionary","explicit","automatic","regular","first","second" }
nodes.nodecodes=nodecodes
nodes.whatcodes=whatcodes
nodes.whatsitcodes=whatcodes
nodes.glyphcodes=glyphcodes
+nodes.disccodes=disccodes
local free_node=node.free
local remove_node=node.remove
local new_node=node.new
@@ -5075,7 +5077,7 @@ function fonts.names.getfilename(askedname,suffix)
return ""
end
function fonts.names.ignoredfile(filename)
- return true
+ return false
end
end -- closure
diff --git a/tex/generic/context/luatex/luatex-fonts-syn.lua b/tex/generic/context/luatex/luatex-fonts-syn.lua
index 60dd2c063..f03d558bf 100644
--- a/tex/generic/context/luatex/luatex-fonts-syn.lua
+++ b/tex/generic/context/luatex/luatex-fonts-syn.lua
@@ -102,5 +102,5 @@ function fonts.names.getfilename(askedname,suffix) -- only supported in mkiv
end
function fonts.names.ignoredfile(filename) -- only supported in mkiv
- return true -- will be overloaded
+ return false -- will be overloaded
end