From d7ccb42582f85acf30568913610ccf4d602023fb Mon Sep 17 00:00:00 2001 From: Taco Hoekwater Date: Wed, 1 Jun 2011 08:54:21 +0000 Subject: commit context 2011.05.18 git-svn-id: svn://tug.org/texlive/trunk@22719 c570f23f-e606-0410-a88d-b1316a301751 --- .../tex/context/fonts/antykwapoltawskiego.lfg | 245 +++++++++++++++++++++ Master/texmf-dist/tex/context/fonts/asana-math.lfg | 52 +++++ .../texmf-dist/tex/context/fonts/cambria-math.lfg | 26 +++ Master/texmf-dist/tex/context/fonts/demo.lfg | 52 +++++ Master/texmf-dist/tex/context/fonts/dingbats.lfg | 213 ++++++++++++++++++ Master/texmf-dist/tex/context/fonts/husayni.lfg | 36 ++- .../texmf-dist/tex/context/fonts/hvmath-math.lfg | 2 +- .../texmf-dist/tex/context/fonts/informal-math.lfg | 12 +- Master/texmf-dist/tex/context/fonts/lm-math.lfg | 51 ++++- .../texmf-dist/tex/context/fonts/lucida-math.lfg | 34 ++- Master/texmf-dist/tex/context/fonts/px-math.lfg | 6 + Master/texmf-dist/tex/context/fonts/tx-math.lfg | 4 + Master/texmf-dist/tex/context/fonts/xits-math.lfg | 25 +++ 13 files changed, 737 insertions(+), 21 deletions(-) create mode 100644 Master/texmf-dist/tex/context/fonts/antykwapoltawskiego.lfg create mode 100644 Master/texmf-dist/tex/context/fonts/asana-math.lfg create mode 100644 Master/texmf-dist/tex/context/fonts/cambria-math.lfg create mode 100644 Master/texmf-dist/tex/context/fonts/demo.lfg create mode 100644 Master/texmf-dist/tex/context/fonts/dingbats.lfg create mode 100644 Master/texmf-dist/tex/context/fonts/xits-math.lfg (limited to 'Master/texmf-dist/tex/context/fonts') diff --git a/Master/texmf-dist/tex/context/fonts/antykwapoltawskiego.lfg b/Master/texmf-dist/tex/context/fonts/antykwapoltawskiego.lfg new file mode 100644 index 00000000000..d5c902c6bf0 --- /dev/null +++ b/Master/texmf-dist/tex/context/fonts/antykwapoltawskiego.lfg @@ -0,0 +1,245 @@ +return { + name = "antykwapoltawskiego", + version = "1.00", + comment = "Goodies that complement Antykwa Poltawskiego, one of Mojca's favourites", + author = "Hans & Mojca", + copyright = "ConTeXt development team", + files = { + name = "antykwapoltawskiego", -- shared + list = { + ["AntPoltLtCond-Regular.otf"] = { + -- name = "antykwapoltawskiego", + weight = "light", + style = "regular", + width = "condensed", + }, + ["AntPoltLtCond-Italic.otf"] = { + weight = "light", + style = "italic", + width = "condensed", + }, + ["AntPoltCond-Regular.otf"] = { + weight = "normal", + style = "regular", + width = "condensed", + }, + ["AntPoltCond-Italic.otf"] = { + weight = "normal", + style = "italic", + width = "condensed", + }, + ["AntPoltLtCond-Bold.otf"] = { + weight = "medium", + style = "regular", + width = "condensed", + }, + ["AntPoltLtCond-BoldItalic.otf"] = { + weight = "medium", + style = "italic", + width = "condensed", + }, + ["AntPoltCond-Bold.otf"] = { + weight = "bold", + style = "regular", + width = "condensed", + }, + ["AntPoltCond-BoldItalic.otf"] = { + weight = "bold", + style = "italic", + width = "condensed", + }, + ["AntPoltLtSemiCond-Regular.otf"] = { + weight = "light", + style = "regular", + width = "semicondensed", + }, + ["AntPoltLtSemiCond-Italic.otf"] = { + weight = "light", + style = "italic", + width = "semicondensed", + }, + ["AntPoltSemiCond-Regular.otf"] = { + weight = "normal", + style = "regular", + width = "semicondensed", + }, + ["AntPoltSemiCond-Italic.otf"] = { + weight = "normal", + style = "italic", + width = "semicondensed", + }, + ["AntPoltLtSemiCond-Bold.otf"] = { + weight = "medium", + style = "regular", + width = "semicondensed", + }, + ["AntPoltLtSemiCond-BoldItalic.otf"] = { + weight = "medium", + style = "italic", + width = "semicondensed", + }, + ["AntPoltSemiCond-Bold.otf"] = { + weight = "bold", + style = "regular", + width = "semicondensed", + }, + ["AntPoltSemiCond-BoldItalic.otf"] = { + weight = "bold", + style = "italic", + width = "semicondensed", + }, + ["AntPoltLt-Regular.otf"] = { + weight = "light", + style = "regular", + width = "normal", + }, + ["AntPoltLt-Italic.otf"] = { + weight = "light", + style = "italic", + width = "normal", + }, + ["AntPolt-Regular.otf"] = { + weight = "normal", + style = "regular", + width = "normal", + }, + ["AntPolt-Italic.otf"] = { + weight = "normal", + style = "italic", + width = "normal", + }, + ["AntPoltLt-Bold.otf"] = { + weight = "medium", + style = "regular", + width = "normal", + }, + ["AntPoltLt-BoldItalic.otf"] = { + weight = "medium", + style = "italic", + width = "normal", + }, + ["AntPolt-Bold.otf"] = { + weight = "bold", + style = "regular", + width = "normal", + }, + ["AntPolt-BoldItalic.otf"] = { + weight = "bold", + style = "italic", + width = "normal", + }, + ["AntPoltLtSemiExpd-Regular.otf"] = { + weight = "light", + style = "regular", + width = "semiexpanded", + }, + ["AntPoltLtSemiExpd-Italic.otf"] = { + weight = "light", + style = "italic", + width = "semiexpanded", + }, + ["AntPoltSemiExpd-Regular.otf"] = { + weight = "normal", + style = "regular", + width = "semiexpanded", + }, + ["AntPoltSemiExpd-Italic.otf"] = { + weight = "normal", + style = "italic", + width = "semiexpanded", + }, + ["AntPoltLtSemiExpd-Bold.otf"] = { + weight = "medium", + style = "regular", + width = "semiexpanded", + }, + ["AntPoltLtSemiExpd-BoldItalic.otf"] = { + weight = "medium", + style = "italic", + width = "semiexpanded", + }, + ["AntPoltSemiExpd-Bold.otf"] = { + weight = "bold", + style = "regular", + width = "semiexpanded", + }, + ["AntPoltSemiExpd-BoldItalic.otf"] = { + weight = "bold", + style = "italic", + width = "semiexpanded", + }, + ["AntPoltLtExpd-Regular.otf"] = { + weight = "light", + style = "regular", + width = "expanded", + }, + ["AntPoltLtExpd-Italic.otf"] = { + weight = "light", + style = "italic", + width = "expanded", + }, + ["AntPoltExpd-Regular.otf"] = { + weight = "normal", + style = "regular", + width = "expanded", + }, + ["AntPoltExpd-Italic.otf"] = { + weight = "normal", + style = "italic", + width = "expanded", + }, + ["AntPoltLtExpd-Bold.otf"] = { + weight = "medium", + style = "regular", + width = "expanded", + }, + ["AntPoltLtExpd-BoldItalic.otf"] = { + weight = "medium", + style = "italic", + width = "expanded", + }, + ["AntPoltExpd-Bold.otf"] = { + weight = "bold", + style = "regular", + width = "expanded", + }, + ["AntPoltExpd-BoldItalic.otf"] = { + weight = "bold", + style = "italic", + width = "expanded", + }, + }, + }, + typefaces = { -- for Mojca (experiment, names might change) + ["antykwapoltawskiego-light"] = { + shortcut = "rm", + shape = "serif", + fontname = "antykwapoltawskiego", + normalweight = "light", + boldweight = "medium", + width = "normal", + size = "default", + features = "default", + }, + ["antykwapoltawskiego"] = { + shortcut = "rm", + shape = "serif", + fontname = "antykwapoltawskiego", + normalweight = "normal", + boldweight = "bold", + width = "normal", + size = "default", + features = "default", + }, + ["antykwapoltawskiego-condensed"] = { + shortcut = "rm", + shape = "serif", + fontname = "antykwapoltawskiego", + normalweight = "light", + boldweight = "medium", + width = "condensed", + size = "default", + features = "default", + }, + }, +} diff --git a/Master/texmf-dist/tex/context/fonts/asana-math.lfg b/Master/texmf-dist/tex/context/fonts/asana-math.lfg new file mode 100644 index 00000000000..f845ca4dee1 --- /dev/null +++ b/Master/texmf-dist/tex/context/fonts/asana-math.lfg @@ -0,0 +1,52 @@ +-- This patch code is moved from font-pat.lua to this goodies +-- files as it does not belong in the core code. + +local patches = fonts.handlers.otf.enhancers.patches + +local function patch(data,filename,threshold) + local m = data.metadata.math + if m then + local d = m.DisplayOperatorMinHeight or 0 + if d < threshold then + patches.report("DisplayOperatorMinHeight(%s -> %s)",d,threshold) + m.DisplayOperatorMinHeight = threshold + end + end +end + +patches.register("after","check math parameters","asana",function(data,filename) patch(data,filename,1350) end) + +local function less(value,target,original) return 0.25 * value end + +return { + name = "asana-math", + version = "1.00", + comment = "Goodies that complement asana.", + author = "Hans Hagen", + copyright = "ConTeXt development team", + mathematics = { + parameters = { + -- StackBottomDisplayStyleShiftDown = 0, + -- StackBottomShiftDown = 0, + -- StackDisplayStyleGapMin = 0, + -- StackGapMin = 0, + -- StackTopDisplayStyleShiftUp = 0, + -- StackTopShiftUp = 0, + -- StretchStackBottomShiftDown = 0, + -- StretchStackGapAboveMin = 0, + -- StretchStackGapBelowMin = 0, + -- StretchStackTopShiftUp = 0, + StackBottomDisplayStyleShiftDown = less, + StackBottomShiftDown = less, + StackDisplayStyleGapMin = less, + StackGapMin = less, + StackTopDisplayStyleShiftUp = less, + StackTopShiftUp = less, + StretchStackBottomShiftDown = less, + StretchStackGapAboveMin = less, + StretchStackGapBelowMin = less, + StretchStackTopShiftUp = less, + } + } +} + diff --git a/Master/texmf-dist/tex/context/fonts/cambria-math.lfg b/Master/texmf-dist/tex/context/fonts/cambria-math.lfg new file mode 100644 index 00000000000..3fd15d8a03d --- /dev/null +++ b/Master/texmf-dist/tex/context/fonts/cambria-math.lfg @@ -0,0 +1,26 @@ +-- This patch code is moved from font-pat.lua to this goodies +-- files as it does not belong in the core code. + +local patches = fonts.handlers.otf.enhancers.patches + +local function patch(data,filename,threshold) + local m = data.metadata.math + if m then + local d = m.DisplayOperatorMinHeight or 0 + if d < threshold then + patches.report("DisplayOperatorMinHeight(%s -> %s)",d,threshold) + m.DisplayOperatorMinHeight = threshold + end + end +end + +patches.register("after","check math parameters","cambria", function(data,filename) patch(data,filename,2800) end) +patches.register("after","check math parameters","cambmath",function(data,filename) patch(data,filename,2800) end) + +return { + name = "cambria-math", + version = "1.00", + comment = "Goodies that complement cambria.", + author = "Hans Hagen", + copyright = "ConTeXt development team", +} diff --git a/Master/texmf-dist/tex/context/fonts/demo.lfg b/Master/texmf-dist/tex/context/fonts/demo.lfg new file mode 100644 index 00000000000..6c7f6b62d39 --- /dev/null +++ b/Master/texmf-dist/tex/context/fonts/demo.lfg @@ -0,0 +1,52 @@ +local yes = "yes" + +local default = { + analyze = yes, + mode = "node", + language = "dflt", + script = "dflt", +} + +local smallcaps = { + smcp = yes, +} + +local function statistics(tfmdata) + commands.showfontparameters +end + +local function squeeze(tfmdata) + for k, v in next, tfmdata.characters do + v.height = 0.75 * (v.height or 0) + v.depth = 0.75 * (v.depth or 0) + end +end + +return { + name = "demo", + version = "1.00", + comment = "An example of goodies.", + author = "Hans Hagen", + featuresets = { + default = { + default, + }, + smallcaps = { + default, smallcaps, + }, + }, + colorschemes = { + default = { + [1] = { + "one", "three", "five", "seven", "nine", + }, + [2] = { + "two", "four", "six", "eight", "ten", + }, + } + }, + postprocessors = { + statistics = statistics, + squeeze = squeeze, + }, +} diff --git a/Master/texmf-dist/tex/context/fonts/dingbats.lfg b/Master/texmf-dist/tex/context/fonts/dingbats.lfg new file mode 100644 index 00000000000..eab069c7273 --- /dev/null +++ b/Master/texmf-dist/tex/context/fonts/dingbats.lfg @@ -0,0 +1,213 @@ +return { + name = "dingbats", + version = "1.00", + comment = "Goodies that complement dingbats (funny names).", + author = "Hans Hagen", + copyright = "ConTeXt development team", + remapping = { + tounicode = true, + unicodes = { + a1 = 0x2701, + a10 = 0x2721, + a100 = 0x275E, + a101 = 0x2761, + a102 = 0x2762, + a103 = 0x2763, + a104 = 0x2764, + a105 = 0x2710, + a106 = 0x2765, + a107 = 0x2766, + a108 = 0x2767, + a109 = 0x2660, + a11 = 0x261B, + a110 = 0x2665, + a111 = 0x2666, + a112 = 0x2663, + a117 = 0x2709, + a118 = 0x2708, + a119 = 0x2707, + a12 = 0x261E, + a120 = 0x2460, + a121 = 0x2461, + a122 = 0x2462, + a123 = 0x2463, + a124 = 0x2464, + a125 = 0x2465, + a126 = 0x2466, + a127 = 0x2467, + a128 = 0x2468, + a129 = 0x2469, + a13 = 0x270C, + a130 = 0x2776, + a131 = 0x2777, + a132 = 0x2778, + a133 = 0x2779, + a134 = 0x277A, + a135 = 0x277B, + a136 = 0x277C, + a137 = 0x277D, + a138 = 0x277E, + a139 = 0x277F, + a14 = 0x270D, + a140 = 0x2780, + a141 = 0x2781, + a142 = 0x2782, + a143 = 0x2783, + a144 = 0x2784, + a145 = 0x2785, + a146 = 0x2786, + a147 = 0x2787, + a148 = 0x2788, + a149 = 0x2789, + a15 = 0x270E, + a150 = 0x278A, + a151 = 0x278B, + a152 = 0x278C, + a153 = 0x278D, + a154 = 0x278E, + a155 = 0x278F, + a156 = 0x2790, + a157 = 0x2791, + a158 = 0x2792, + a159 = 0x2793, + a16 = 0x270F, + a160 = 0x2794, + a161 = 0x2192, + a162 = 0x27A3, + a163 = 0x2194, + a164 = 0x2195, + a165 = 0x2799, + a166 = 0x279B, + a167 = 0x279C, + a168 = 0x279D, + a169 = 0x279E, + a17 = 0x2711, + a170 = 0x279F, + a171 = 0x27A0, + a172 = 0x27A1, + a173 = 0x27A2, + a174 = 0x27A4, + a175 = 0x27A5, + a176 = 0x27A6, + a177 = 0x27A7, + a178 = 0x27A8, + a179 = 0x27A9, + a18 = 0x2712, + a180 = 0x27AB, + a181 = 0x27AD, + a182 = 0x27AF, + a183 = 0x27B2, + a184 = 0x27B3, + a185 = 0x27B5, + a186 = 0x27B8, + a187 = 0x27BA, + a188 = 0x27BB, + a189 = 0x27BC, + a19 = 0x2713, + a190 = 0x27BD, + a191 = 0x27BE, + a192 = 0x279A, + a193 = 0x27AA, + a194 = 0x27B6, + a195 = 0x27B9, + a196 = 0x2798, + a197 = 0x27B4, + a198 = 0x27B7, + a199 = 0x27AC, + a2 = 0x2702, + a20 = 0x2714, + a200 = 0x27AE, + a201 = 0x27B1, + a202 = 0x2703, + a203 = 0x2750, + a204 = 0x2752, + a205 = 0xF8DD, + a206 = 0xF8DF, + a21 = 0x2715, + a22 = 0x2716, + a23 = 0x2717, + a24 = 0x2718, + a25 = 0x2719, + a26 = 0x271A, + a27 = 0x271B, + a28 = 0x271C, + a29 = 0x2722, + a3 = 0x2704, + a30 = 0x2723, + a31 = 0x2724, + a32 = 0x2725, + a33 = 0x2726, + a34 = 0x2727, + a35 = 0x2605, + a36 = 0x2729, + a37 = 0x272A, + a38 = 0x272B, + a39 = 0x272C, + a4 = 0x260E, + a40 = 0x272D, + a41 = 0x272E, + a42 = 0x272F, + a43 = 0x2730, + a44 = 0x2731, + a45 = 0x2732, + a46 = 0x2733, + a47 = 0x2734, + a48 = 0x2735, + a49 = 0x2736, + a5 = 0x2706, + a50 = 0x2737, + a51 = 0x2738, + a52 = 0x2739, + a53 = 0x273A, + a54 = 0x273B, + a55 = 0x273C, + a56 = 0x273D, + a57 = 0x273E, + a58 = 0x273F, + a59 = 0x2740, + a6 = 0x271D, + a60 = 0x2741, + a61 = 0x2742, + a62 = 0x2743, + a63 = 0x2744, + a64 = 0x2745, + a65 = 0x2746, + a66 = 0x2747, + a67 = 0x2748, + a68 = 0x2749, + a69 = 0x274A, + a7 = 0x271E, + a70 = 0x274B, + a71 = 0x25CF, + a72 = 0x274D, + a73 = 0x25A0, + a74 = 0x274F, + a75 = 0x2751, + a76 = 0x25B2, + a77 = 0x25BC, + a78 = 0x25C6, + a79 = 0x2756, + a8 = 0x271F, + a81 = 0x25D7, + a82 = 0x2758, + a83 = 0x2759, + a84 = 0x275A, + a85 = 0xF8DE, + a86 = 0xF8E0, + a87 = 0xF8E1, + a88 = 0xF8E2, + a89 = 0xF8D7, + a9 = 0x2720, + a90 = 0xF8D8, + a91 = 0xF8DB, + a92 = 0xF8DC, + a93 = 0xF8D9, + a94 = 0xF8DA, + a95 = 0xF8E3, + a96 = 0xF8E4, + a97 = 0x275B, + a98 = 0x275C, + a99 = 0x275D, + }, + }, +} diff --git a/Master/texmf-dist/tex/context/fonts/husayni.lfg b/Master/texmf-dist/tex/context/fonts/husayni.lfg index 2cc4d6111e4..ff456f63ca3 100644 --- a/Master/texmf-dist/tex/context/fonts/husayni.lfg +++ b/Master/texmf-dist/tex/context/fonts/husayni.lfg @@ -1,4 +1,4 @@ -local yes = "yes", "node" +local yes = "yes" local basics = { analyze = yes, @@ -74,8 +74,12 @@ return { }, solutions = { -- here we have references to featuresets, so we use strings! experimental = { - less = { "shrink" }, - more = { "minimal_stretching", "medium_stretching", "maximal_stretching", "wide_all" }, + less = { + "shrink" + }, + more = { + "minimal_stretching", "medium_stretching", "maximal_stretching", "wide_all" + }, }, }, stylistics = { @@ -159,16 +163,34 @@ return { colorschemes = { default = { [1] = { - "Onedotabove", "Onedotbelow", "Twodotsabove", "Twodotsbelow", "Threedotsabove", "Twodotsabove.vrt", "Twodotsbelow.vrt", "Twodotsabove.KBA", "Threedotsabove.KBA", "Threedotsbelowinv", "Hamzahabove", "Hamzahbelow", "MaaddahHamzah.identity", "Waslah","Hamzah.initial_medial", + "Onedotabove", "Onedotbelow", "Twodotsabove", "Twodotsbelow", "Threedotsabove", "Twodotsabove.vrt", + "Twodotsbelow.vrt", "Twodotsabove.KBA", "Threedotsabove.KBA", "Threedotsbelowinv", "Hamzahabove", + "Hamzahbelow", "MaaddahHamzah.identity", "Waslah", "Hamzah.initial_medial", }, [2] = { - "Fathah", "Dammah", "Kasrah", "FathahVertical", "DammahInverted", "KasrahVertical", "FathahVertical.alt1", "KasrahVertical.alt1", "FathahTanwiin", "DammahTanwiin", "KasrahTanwiin", "Shaddah", "Sukuun", "MaaddahHamzah", "Jazm", "Maaddah", "DammahTanwiin_alt2", "DammahTanwiin_alt1", "FathahTanwiin_alt1", "KasrahTanwiin_alt1", "Fathah.mkmk", "Dammah.mkmk", "Kasrah.mkmk", "FathahVertical.mkmk", "DammahInverted.mkmk", "KasrahVertical.mkmk", "FathahTanwiin.mkmk", "DammahTanwiin.mkmk", "KasrahTanwiin.mkmk", "DammahTanwiin_alt1.mkmk", "Waawsmall", "Yaasmall", "FathahVertical.alt2", "Waawsmall.isol", "Yaasmall.isol", "FathahVertical.isol", "Hamzah","Shaddah.lillaah","FathahVertical.alt1_mkmk","Sifr.empty","Maaddah.small","FathahVertical.alt2","Waawsmall.isol","Yaasmall.isol","FathahTanwiin.alt1_mkmk","KasrahTanwiin.alt1_mkmk", + "Fathah", "Dammah", "Kasrah", "FathahVertical", "DammahInverted", "KasrahVertical", + "FathahVertical.alt1", "KasrahVertical.alt1", "FathahTanwiin", "DammahTanwiin", "KasrahTanwiin", + "Shaddah", "Sukuun", "MaaddahHamzah", "Jazm", "Maaddah", "DammahTanwiin_alt2", "DammahTanwiin_alt1", + "FathahTanwiin_alt1", "KasrahTanwiin_alt1", "Fathah.mkmk", "Dammah.mkmk", "Kasrah.mkmk", + "FathahVertical.mkmk", "DammahInverted.mkmk", "KasrahVertical.mkmk", "FathahTanwiin.mkmk", + "DammahTanwiin.mkmk", "KasrahTanwiin.mkmk", "DammahTanwiin_alt1.mkmk", "Waawsmall", "Yaasmall", + "FathahVertical.alt2", "Waawsmall.isol", "Yaasmall.isol", "FathahVertical.isol", "Hamzah", + "Shaddah.lillaah", "FathahVertical.alt1_mkmk", "Sifr.empty", "Maaddah.small", "FathahVertical.alt2", + "Waawsmall.isol", "Yaasmall.isol", "FathahTanwiin.alt1_mkmk", "KasrahTanwiin.alt1_mkmk", }, [3] = { - "Ttaa.waqf", "SsLY.waqf", "QLY.waqf", "Miim.waqf", "LA.waqf", "Jiim.waqf", "Threedotsabove.waqf", "Siin.waqf", "Ssaad.waqf", "Qaaf.waqf", "SsL.waqf", "QF.waqf", "SKTH.waqf", "WQFH.waqf", "Kaaf.waqf", "Ayn.ruku", "Miim.nuun_high", "Siin.Ssaad", "Nuunsmall", "emptydot_low", "emptydot_high", "Sifr.fill", "Miim.nuun_low", "Nuun.tanwiin", + "Ttaa.waqf", "SsLY.waqf", "QLY.waqf", "Miim.waqf", "LA.waqf", "Jiim.waqf", "Threedotsabove.waqf", + "Siin.waqf", "Ssaad.waqf", "Qaaf.waqf", "SsL.waqf", "QF.waqf", "SKTH.waqf", "WQFH.waqf", + "Kaaf.waqf", "Ayn.ruku", "Miim.nuun_high", "Siin.Ssaad", "Nuunsmall", "emptydot_low", + "emptydot_high", "Sifr.fill", "Miim.nuun_low", "Nuun.tanwiin", }, [4] = { - "ZeroArabic.ayah", "OneArabic.ayah", "TwoArabic.ayah", "ThreeArabic.ayah", "FourArabic.ayah", "FiveArabic.ayah", "SixArabic.ayah", "SevenArabic.ayah", "EightArabic.ayah", "NineArabic.ayah", "FourFarsi.ayah", "FiveFarsi.ayah", "SixFarsi.ayah", "FourFarsi.urdu_ayah", "SevenFarsi.urdu_ayah","ZeroArabic.ayah_small","OneArabic.ayah_small","TwoArabic.ayah_small","ThreeArabic.ayah_small","FourArabic.ayah.001","FiveArabic.ayah_small","SixArabic.ayah_small","SevenArabic.ayah_small","EightArabic.ayah_small","NineArabic.ayah_small", + "ZeroArabic.ayah", "OneArabic.ayah", "TwoArabic.ayah", "ThreeArabic.ayah", "FourArabic.ayah", + "FiveArabic.ayah", "SixArabic.ayah", "SevenArabic.ayah", "EightArabic.ayah", "NineArabic.ayah", + "FourFarsi.ayah", "FiveFarsi.ayah", "SixFarsi.ayah", "FourFarsi.urdu_ayah", "SevenFarsi.urdu_ayah", + "ZeroArabic.ayah_small", "OneArabic.ayah_small", "TwoArabic.ayah_small", "ThreeArabic.ayah_small", + "FourArabic.ayah.001", "FiveArabic.ayah_small", "SixArabic.ayah_small", "SevenArabic.ayah_small", + "EightArabic.ayah_small", "NineArabic.ayah_small", }, [5] = { "Ayah", "Ayah.alt1", "Ayah.alt2", "Ayah.alt3", "Ayah2", diff --git a/Master/texmf-dist/tex/context/fonts/hvmath-math.lfg b/Master/texmf-dist/tex/context/fonts/hvmath-math.lfg index a7ec1ce89b8..0eba3db23f6 100644 --- a/Master/texmf-dist/tex/context/fonts/hvmath-math.lfg +++ b/Master/texmf-dist/tex/context/fonts/hvmath-math.lfg @@ -6,7 +6,7 @@ return { copyright = "ConTeXt development team", mathematics = { mapfiles = { - -- todo + "hvm-pem.map", }, virtuals = { ["hvmath-math"] = { diff --git a/Master/texmf-dist/tex/context/fonts/informal-math.lfg b/Master/texmf-dist/tex/context/fonts/informal-math.lfg index 67fb73b392f..a1f461740e1 100644 --- a/Master/texmf-dist/tex/context/fonts/informal-math.lfg +++ b/Master/texmf-dist/tex/context/fonts/informal-math.lfg @@ -9,13 +9,13 @@ return { "original-micropress-informal.map", }, virtuals = { - ["hvmath-math"] = { + ["informal-math"] = { { name = "file:ifrg.afm", features = "virtualmath", main = true }, - { name = "ifrm10cm.tfm", vector="tex-mr" }, - { name = "ifmi10", vector = "tex-mi", skewchar=0x7F }, - { name = "ifmi10.tfm", vector = "tex-it", skewchar=0x7F }, - { name = "ifsy10.tfm", vector = "tex-sy", skewchar=0x30, parameters = true }, - { name = "ifex10.tfm", vector = "tex-ex", extension = true }, + { name = "file:ifrm10cm.tfm", vector="tex-mr" }, + { name = "file:ifmi10.tfm", vector = "tex-mi", skewchar=0x7F }, + { name = "file:ifmi10.tfm", vector = "tex-it", skewchar=0x7F }, + { name = "file:ifsy10.tfm", vector = "tex-sy", skewchar=0x30, parameters = true }, + { name = "file:ifex10.tfm", vector = "tex-ex", extension = true }, } } } diff --git a/Master/texmf-dist/tex/context/fonts/lm-math.lfg b/Master/texmf-dist/tex/context/fonts/lm-math.lfg index 361b5bb86ab..43de0c51ef1 100644 --- a/Master/texmf-dist/tex/context/fonts/lm-math.lfg +++ b/Master/texmf-dist/tex/context/fonts/lm-math.lfg @@ -1,3 +1,34 @@ +-- This patch code is moved from font-pat.lua to this goodies +-- files as it does not belomg in the core code. + +local patches = fonts.handlers.otf.enhancers.patches + +local function patch(data,filename) + local uni_to_ind = data.map.map + if not uni_to_ind[0x391] then + -- beware, this is a hack, features for latin often don't apply to greek + -- but lm has not much features anyway (and only greek for math) + patches.report("adding 13 greek capitals") + uni_to_ind[0x391] = uni_to_ind[0x41] + uni_to_ind[0x392] = uni_to_ind[0x42] + uni_to_ind[0x395] = uni_to_ind[0x45] + uni_to_ind[0x397] = uni_to_ind[0x48] + uni_to_ind[0x399] = uni_to_ind[0x49] + uni_to_ind[0x39A] = uni_to_ind[0x4B] + uni_to_ind[0x39C] = uni_to_ind[0x4D] + uni_to_ind[0x39D] = uni_to_ind[0x4E] + uni_to_ind[0x39F] = uni_to_ind[0x4F] + uni_to_ind[0x3A1] = uni_to_ind[0x52] + uni_to_ind[0x3A4] = uni_to_ind[0x54] + uni_to_ind[0x3A7] = uni_to_ind[0x58] + uni_to_ind[0x396] = uni_to_ind[0x5A] + end +end + +patches.register("after","prepare glyphs","^lmroman", patch) +patches.register("after","prepare glyphs","^lmsans", patch) +patches.register("after","prepare glyphs","^lmtypewriter",patch) + -- rm-lmr5 : LMMathRoman5-Regular -- rm-lmbx5 : LMMathRoman5-Bold ] -- lmbsy5 : LMMathSymbols5-BoldItalic @@ -14,6 +45,7 @@ local five = { { name = "lmex10.tfm", vector = "tex-ex", extension = true } , { name = "msam5.tfm", vector = "tex-ma" }, { name = "msbm5.tfm", vector = "tex-mb" }, + { name = "stmary10.afm", vector = "tex-mc" }, -- { name = "rm-lmbx5.tfm", vector = "tex-bf" } , { name = "lmroman5-bold", vector = "tex-bf" } , { name = "lmmib5.tfm", vector = "tex-bi", skewchar=0x7F } , @@ -36,6 +68,7 @@ local six = { { name = "lmex10.tfm", vector = "tex-ex", extension = true } , { name = "msam5.tfm", vector = "tex-ma" }, { name = "msbm5.tfm", vector = "tex-mb" }, + { name = "stmary10.afm", vector = "tex-mc" }, -- { name = "rm-lmbx6.tfm", vector = "tex-bf" } , { name = "lmroman6-bold.otf", vector = "tex-bf" } , { name = "lmmib5.tfm", vector = "tex-bi", skewchar=0x7F } , @@ -61,6 +94,7 @@ local seven = { { name = "lmex10.tfm", vector = "tex-ex", extension = true } , { name = "msam7.tfm", vector = "tex-ma" }, { name = "msbm7.tfm", vector = "tex-mb" }, + { name = "stmary10.afm", vector = "tex-mc" }, -- { name = "rm-lmbx7.tfm", vector = "tex-bf" } , { name = "lmroman7-bold.otf", vector = "tex-bf" } , { name = "lmmib7.tfm", vector = "tex-bi", skewchar=0x7F } , @@ -84,6 +118,7 @@ local eight = { { name = "lmex10.tfm", vector = "tex-ex", extension = true } , { name = "msam7.tfm", vector = "tex-ma" }, { name = "msbm7.tfm", vector = "tex-mb" }, + { name = "stmary10.afm", vector = "tex-mc" }, -- { name = "rm-lmbx8.tfm", vector = "tex-bf" } , { name = "lmroman8-bold.otf", vector = "tex-bf" } , { name = "lmmib7.tfm", vector = "tex-bi", skewchar=0x7F } , @@ -107,6 +142,7 @@ local nine = { { name = "lmex10.tfm", vector = "tex-ex", extension = true } , { name = "msam10.tfm", vector = "tex-ma" }, { name = "msbm10.tfm", vector = "tex-mb" }, + { name = "stmary10.afm", vector = "tex-mc" }, -- { name = "rm-lmbx9.tfm", vector = "tex-bf" } , { name = "lmroman9-bold.otf", vector = "tex-bf" } , { name = "lmmib10.tfm", vector = "tex-bi", skewchar=0x7F } , @@ -133,6 +169,7 @@ local ten = { { name = "lmex10.tfm", vector = "tex-ex", extension = true } , { name = "msam10.tfm", vector = "tex-ma" }, { name = "msbm10.tfm", vector = "tex-mb" }, + { name = "stmary10.afm", vector = "tex-mc" }, -- { name = "rm-lmbx10.tfm", vector = "tex-bf" } , { name = "lmroman10-bold.otf", vector = "tex-bf" } , { name = "lmmib10.tfm", vector = "tex-bi", skewchar=0x7F } , @@ -152,6 +189,7 @@ local ten_bold = { -- copied from roman: { name = "msam10.tfm", vector = "tex-ma" }, { name = "msbm10.tfm", vector = "tex-mb" }, + { name = "stmary10.afm", vector = "tex-mc" }, -- { name = "rm-lmbx10.tfm", vector = "tex-bf" } , { name = "lmroman10-bold.otf", vector = "tex-bf" } , { name = "lmmib10.tfm", vector = "tex-bi", skewchar=0x7F } , @@ -174,6 +212,7 @@ local twelve = { { name = "lmex10.tfm", vector = "tex-ex", extension = true } , { name = "msam10.tfm", vector = "tex-ma" }, { name = "msbm10.tfm", vector = "tex-mb" }, + { name = "stmary10.afm", vector = "tex-mc" }, -- { name = "rm-lmbx12.tfm", vector = "tex-bf" } , { name = "lmroman12-bold.otf", vector = "tex-bf" } , { name = "lmmib10.tfm", vector = "tex-bi", skewchar=0x7F } , @@ -194,6 +233,7 @@ local seventeen = { { name = "lmex10.tfm", vector = "tex-ex", extension = true } , { name = "msam10.tfm", vector = "tex-ma" }, { name = "msbm10.tfm", vector = "tex-mb" }, + { name = "stmary10.afm", vector = "tex-mc" }, -- { name = "rm-lmbx12.tfm", vector = "tex-bf" } , { name = "lmroman12-bold.otf", vector = "tex-bf" } , { name = "lmmib10.tfm", vector = "tex-bi", skewchar=0x7F } , @@ -225,6 +265,15 @@ return { ["lmroman10-boldmath"] = ten_bold, ["lmroman12-math"] = twelve, ["lmroman17-math"] = seventeen, - } + }, + variables = { + joinrelfactor = 3, -- default anyway + }, + parameters = { -- test values + -- FactorA = 123.456, + -- FactorB = false, + -- FactorC = function(value,target,original) return 7.89 * target.factor end, + -- FactorD = "Hi There!", + }, } } diff --git a/Master/texmf-dist/tex/context/fonts/lucida-math.lfg b/Master/texmf-dist/tex/context/fonts/lucida-math.lfg index 83c3c272d65..443f52acea2 100644 --- a/Master/texmf-dist/tex/context/fonts/lucida-math.lfg +++ b/Master/texmf-dist/tex/context/fonts/lucida-math.lfg @@ -1,4 +1,6 @@ -fonts.enc.math["lbr-ma"] = { +local mathencodings = fonts.encodings.math + +mathencodings["lbr-ma"] = { [0x025CB] = 0x00, -- circle [0x025CF] = 0x01, -- blackcircle [0x025A1] = 0x02, -- square @@ -188,7 +190,7 @@ fonts.enc.math["lbr-ma"] = { [0x022AF] = 0xFB, -- nVDash } -fonts.enc.math["lbr-mb"] = { +mathencodings["lbr-mb"] = { [0x00393] = 0x00, -- Gamma [0x00394] = 0x01, -- Delta [0x00398] = 0x02, -- Theta @@ -248,7 +250,14 @@ fonts.enc.math["lbr-mb"] = { [0x1D718] = 0x9B, -- varkappa } -fonts.enc.math["lbr-sy"] = { + +mathencodings["lbr-sy"] = { + + -- [0x022C5] = 0x01, -- cdot, + + [0x0002B] = 0x82, -- plus + [0x0003D] = 0x83, -- equal + [0x021CB] = 0x8D, -- leftrightharpoons [0x021CC] = 0x8E, -- rightleftharpoons [0x02214] = 0x89, -- dotplus @@ -293,13 +302,18 @@ fonts.enc.math["lbr-sy"] = { [0x025CA] = 0x05, -- lozenge } -fonts.enc.math["lbr-sy"] = table.merged(fonts.enc.math["tex-sy"],fonts.enc.math["lbr-sy"]) + +mathencodings["lbr-sy"] = table.merged(mathencodings["tex-sy"],mathencodings["lbr-sy"]) + +mathencodings["lbr-fraktur"] = { } + +fonts.handlers.vf.math.setletters(mathencodings, "lbr-fraktur", 0x1D504, 0x1D51E) return { name = "lucida-math", version = "1.00", comment = "Goodies that complement lucida math.", - author = "Aditya, Hans, Mojca", + author = "Aditya, Hans, Mojca with help from Zhichu Chen", copyright = "ConTeXt development team", mathematics = { mapfiles = { @@ -314,7 +328,15 @@ return { { name = "hlcrv.tfm", vector = "tex-ex", extension = true }, { name = "hlcra.tfm", vector = "lbr-ma" }, { name = "hlcrm.tfm", vector = "lbr-mb" }, - } + { name = "file:lbd.afm", vector = "tex-bf" }, + { name = "file:lbdi.afm", vector = "tex-bi" } , + { name = "file:lsr.afm", vector = "tex-ss" }, + { name = "file:lstr.afm", vector = "tex-tt" }, + { name = "file:lbl.afm", vector = "lbr-fraktur" }, -- more complete + }, + }, + variables = { + joinrelfactor = 4, -- default is 3 } } } diff --git a/Master/texmf-dist/tex/context/fonts/px-math.lfg b/Master/texmf-dist/tex/context/fonts/px-math.lfg index b261f07013a..1d18bad361a 100644 --- a/Master/texmf-dist/tex/context/fonts/px-math.lfg +++ b/Master/texmf-dist/tex/context/fonts/px-math.lfg @@ -18,7 +18,13 @@ return { { name = "pxex.tfm", vector = "tex-ex", extension = true } , { name = "pxsya.tfm", vector = "tex-ma" }, { name = "pxsyb.tfm", vector = "tex-mb" }, + { name = "texgyrepagella-bold.otf", vector = "tex-bf" } , + { name = "texgyrepagella-bolditalic.otf", vector = "tex-bi" } , + { name = "lmsans10-regular.otf", vector = "tex-ss", optional=true }, + { name = "lmmono10-regular.otf", vector = "tex-tt", optional=true }, }, } } } + + diff --git a/Master/texmf-dist/tex/context/fonts/tx-math.lfg b/Master/texmf-dist/tex/context/fonts/tx-math.lfg index f1d5327733e..8423aaaf4ab 100644 --- a/Master/texmf-dist/tex/context/fonts/tx-math.lfg +++ b/Master/texmf-dist/tex/context/fonts/tx-math.lfg @@ -18,6 +18,10 @@ return { { name = "txex.tfm", vector = "tex-ex", extension = true } , { name = "txsya.tfm", vector = "tex-ma" }, { name = "txsyb.tfm", vector = "tex-mb" }, + { name = "texgyretermes-bold.otf", vector = "tex-bf", skewchar=0x7F } , + { name = "texgyretermes-bolditalic.otf", vector = "tex-bi" } , + { name = "lmsans10-regular.otf", vector = "tex-ss", optional=true }, + { name = "lmmono10-regular.otf", vector = "tex-tt", optional=true }, } } } diff --git a/Master/texmf-dist/tex/context/fonts/xits-math.lfg b/Master/texmf-dist/tex/context/fonts/xits-math.lfg new file mode 100644 index 00000000000..a97a7599d9b --- /dev/null +++ b/Master/texmf-dist/tex/context/fonts/xits-math.lfg @@ -0,0 +1,25 @@ +-- \setupbodyfont[xits] +-- +-- \starttext +-- $ABC$ $\cal ABC$ $\mathalternate{cal}\cal ABC$ +-- \stoptext + +return { + name = "xits-math", + version = "1.00", + comment = "Goodies that complement xits (by Khaled Hosny).", + author = "Hans Hagen", + copyright = "ConTeXt development team", + mathematics = { + alternates = { + cal = { feature = 'ss01', value = 1, comment = "Mathematical Calligraphic Alphabet" }, + greekssup = { feature = 'ss02', value = 1, comment = "Mathematical Greek Sans Serif Alphabet" }, + greekssit = { feature = 'ss03', value = 1, comment = "Mathematical Italic Sans Serif Digits" }, + monobfnum = { feature = 'ss04', value = 1, comment = "Mathematical Bold Monospace Digits" }, + mathbbbf = { feature = 'ss05', value = 1, comment = "Mathematical Bold Double-Struck Alphabet" }, + mathbbit = { feature = 'ss06', value = 1, comment = "Mathematical Italic Double-Struck Alphabet" }, + mathbbbi = { feature = 'ss07', value = 1, comment = "Mathematical Bold Italic Double-Struck Alphabet" }, + upint = { feature = 'ss08', value = 1, comment = "Upright Integrals" }, + } + } +} -- cgit v1.2.3