diff options
Diffstat (limited to 'Master/texmf-dist/tex/context')
66 files changed, 2629 insertions, 688 deletions
diff --git a/Master/texmf-dist/tex/context/fonts/mkiv/antykwa-math.lfg b/Master/texmf-dist/tex/context/fonts/mkiv/antykwa-math.lfg index abdc20a7e79..b0f401d62e1 100644 --- a/Master/texmf-dist/tex/context/fonts/mkiv/antykwa-math.lfg +++ b/Master/texmf-dist/tex/context/fonts/mkiv/antykwa-math.lfg @@ -155,6 +155,9 @@ if common then set = { "ignorekerndimensions" } }, -- we have dp > ht fences { + tweak = "wipecues", + }, + { tweak = "fixprimes", factor = 1.0, -- accent base height fake = 0.9, -- replace multiples with this width proportion @@ -167,6 +170,9 @@ if common then tweak = "addfourier", }, { + tweak = "addcomposites", + }, + { tweak = "keepbases", -- list = { 0x302 } list = "default" diff --git a/Master/texmf-dist/tex/context/fonts/mkiv/bonum-math.lfg b/Master/texmf-dist/tex/context/fonts/mkiv/bonum-math.lfg index c46e6c3494b..a92cdfb5275 100644 --- a/Master/texmf-dist/tex/context/fonts/mkiv/bonum-math.lfg +++ b/Master/texmf-dist/tex/context/fonts/mkiv/bonum-math.lfg @@ -41,27 +41,30 @@ return { tweak = "addmirrors", }, { + tweak = "addcomposites", + }, + { tweak = "replacealphabets", list = { { source = { first = 0x003B1 }, -- upright alpha - filename = "texgyrebonummath-companion.otf", + filename = "texgyrebonummathcompanion-regular.otf", }, { source = { first = 0x1D6FC }, -- italic alpha - filename = "texgyrebonummath-companion.otf", + filename = "texgyrebonummathcompanion-regular.otf", }, { source = { first = 0x1D6C2 }, -- bold upright alpha - filename = "texgyrebonummath-companion.otf", + filename = "texgyrebonummathcompanion-regular.otf", }, { source = { first = 0x1D736 }, -- bold italic alpha - filename = "texgyrebonummath-companion.otf", + filename = "texgyrebonummathcompanion-regular.otf", }, { source = { first = 0x02980 }, -- triplebar - filename = "TeXGyreBonumMath-Companion.otf", + filename = "texgyrebonummathcompanion-regular.otf", }, }, }, @@ -81,6 +84,9 @@ return { tweak = "checkaccents", }, { + tweak = "wipecues", + }, + { -- We need to check these, are the tweaks necessary or not? tweak = "dimensions", list = { diff --git a/Master/texmf-dist/tex/context/fonts/mkiv/cambria-math.lfg b/Master/texmf-dist/tex/context/fonts/mkiv/cambria-math.lfg index 04538443204..26c445aff53 100644 --- a/Master/texmf-dist/tex/context/fonts/mkiv/cambria-math.lfg +++ b/Master/texmf-dist/tex/context/fonts/mkiv/cambria-math.lfg @@ -23,6 +23,9 @@ return { { tweak = "addmirrors", }, + { + tweak = "addcomposites", + }, presets.scripttocalligraphic { }, presets.rsfstoscript { rscale = 0.97 }, presets.rsfsuprighttoscript { rscale = 0.97 }, diff --git a/Master/texmf-dist/tex/context/fonts/mkiv/common-math-jmn.lfg b/Master/texmf-dist/tex/context/fonts/mkiv/common-math-jmn.lfg index 1df814b2fda..a3a69ba48cb 100644 --- a/Master/texmf-dist/tex/context/fonts/mkiv/common-math-jmn.lfg +++ b/Master/texmf-dist/tex/context/fonts/mkiv/common-math-jmn.lfg @@ -180,11 +180,11 @@ return { builders.extension(main,0x27F9,dfl,dfm,dar,ffactor,mfactor,lfactor) builders.extension(main,0x27FA,dal,dfm,dar,ffactor,mfactor,lfactor) - local tfactor = antykwa and -0.8 or -1.1 -- move up check MS - local bfactor = antykwa and 0.1 or 0.2 + -- local tfactor = antykwa and -0.8 or -1.1 -- move up check MS + -- local bfactor = antykwa and 0.1 or 0.2 -local tfactor = antykwa and -0.6 or -.6 -- move up check MS -local bfactor = antykwa and 0.1 or 0.2 + local tfactor = antykwa and -0.6 or -.6 -- move up check MS + local bfactor = antykwa and 0.1 or 0.2 local left = characters[0x27F5] local right = characters[0x27F6] diff --git a/Master/texmf-dist/tex/context/fonts/mkiv/common-math.lfg b/Master/texmf-dist/tex/context/fonts/mkiv/common-math.lfg index c7347413d7b..d491e7b8018 100644 --- a/Master/texmf-dist/tex/context/fonts/mkiv/common-math.lfg +++ b/Master/texmf-dist/tex/context/fonts/mkiv/common-math.lfg @@ -91,13 +91,13 @@ return { { source = "uppercasescript", target = "uppercasescript", - filename = "ralphsmithsformalscript-companion.otf", + filename = "ralphsmithsformalscriptcompanion-regular.otf", rscale = parameters.rscale, }, { source = "uppercaseboldscript", target = "uppercaseboldscript", - filename = "ralphsmithsformalscript-companion.otf", + filename = "ralphsmithsformalscriptcompanion-regular.otf", rscale = parameters.rscale, }, }, @@ -111,14 +111,14 @@ return { { source = "uppercasescript", target = "uppercasescript", - filename = "ralphsmithsformalscript-companion.otf", + filename = "ralphsmithsformalscriptcompanion-regular.otf", rscale = parameters.rscale, feature = "ss01", }, { source = "uppercaseboldscript", target = "uppercaseboldscript", - filename = "ralphsmithsformalscript-companion.otf", + filename = "ralphsmithsformalscriptcompanion-regular.otf", rscale = parameters.rscale, feature = "ss01", }, @@ -147,19 +147,19 @@ return { { source = "arabicmathematicalalphabeticsymbols", target = "arabicmathematicalalphabeticsymbols", - filename = "xitsmath-companion.otf", + filename = "xitsmathcompanion-regular.otf", rscale = parameters.rscale, }, { source = "digitsarabicindic", target = "digitsarabicindic", - filename = "xitsmath-companion.otf", + filename = "xitsmathcompanion-regular.otf", rscale = parameters.rscale, }, { source = "digitsextendedarabicindic", target = "digitsextendedarabicindic", - filename = "xitsmath-companion.otf", + filename = "xitsmathcompanion-regular.otf", rscale = parameters.rscale, }, }, diff --git a/Master/texmf-dist/tex/context/fonts/mkiv/concrete-math.lfg b/Master/texmf-dist/tex/context/fonts/mkiv/concrete-math.lfg index 7765c66b178..acad224b1e2 100644 --- a/Master/texmf-dist/tex/context/fonts/mkiv/concrete-math.lfg +++ b/Master/texmf-dist/tex/context/fonts/mkiv/concrete-math.lfg @@ -40,6 +40,9 @@ return { presets.moveintegrals { factor = 1.5 }, presets.wipeitalics { }, { + tweak = "addcomposites", + }, + { tweak = "checkaccents", }, { @@ -88,6 +91,9 @@ return { tweak = "flattenaccents", }, { + tweak = "accentdimensions", + }, + { tweak = "radicaldegreeanchors", list = { ["0x221A.parts.bottom"] = { location = "left", hfactor = .0, vfactor = 1.075 }, diff --git a/Master/texmf-dist/tex/context/fonts/mkiv/dejavu-math.lfg b/Master/texmf-dist/tex/context/fonts/mkiv/dejavu-math.lfg index 8e2a9b86695..fef5ba02ef8 100644 --- a/Master/texmf-dist/tex/context/fonts/mkiv/dejavu-math.lfg +++ b/Master/texmf-dist/tex/context/fonts/mkiv/dejavu-math.lfg @@ -42,6 +42,9 @@ return { { tweak = "addmirrors", }, + { + tweak = "addcomposites", + }, presets.scripttocalligraphic { }, presets.rsfstoscript { rscale = 1.02 }, presets.rsfsuprighttoscript { rscale = 1.02 }, @@ -62,6 +65,9 @@ return { tweak = "checkaccents", }, { + tweak = "wipecues", + }, + { tweak = "kerns", list = { [0x1D453] = { bottomright = -.2 }, diff --git a/Master/texmf-dist/tex/context/fonts/mkiv/ebgaramond-math.lfg b/Master/texmf-dist/tex/context/fonts/mkiv/ebgaramond-math.lfg index 85c27db7ffc..7124499eaf5 100644 --- a/Master/texmf-dist/tex/context/fonts/mkiv/ebgaramond-math.lfg +++ b/Master/texmf-dist/tex/context/fonts/mkiv/ebgaramond-math.lfg @@ -42,6 +42,9 @@ return { { tweak = "addmirrors", }, + { + tweak = "addcomposites", + }, presets.scripttocalligraphic { }, presets.rsfstoscript { rscale = 0.95 }, presets.rsfsuprighttoscript { rscale = 0.95 }, diff --git a/Master/texmf-dist/tex/context/fonts/mkiv/erewhon-math.lfg b/Master/texmf-dist/tex/context/fonts/mkiv/erewhon-math.lfg index 7e9001e2cba..c53b345ae77 100644 --- a/Master/texmf-dist/tex/context/fonts/mkiv/erewhon-math.lfg +++ b/Master/texmf-dist/tex/context/fonts/mkiv/erewhon-math.lfg @@ -38,11 +38,15 @@ return { tweak = "addmirrors", }, { - tweak = "dimensions", - list = { - ["0x222B.variants.*"] = { axis = .15 }, - }, - }, + tweak = "addcomposites", + }, + -- { + -- tweak = "dimensions", + -- comment = "no longer needed", + -- list = { + -- ["0x222B.variants.*"] = { axis = .15 }, + -- }, + -- }, { tweak = "fixintegrals", }, diff --git a/Master/texmf-dist/tex/context/fonts/mkiv/euler-math.lfg b/Master/texmf-dist/tex/context/fonts/mkiv/euler-math.lfg index 58dbad767ea..6d29c062c30 100644 --- a/Master/texmf-dist/tex/context/fonts/mkiv/euler-math.lfg +++ b/Master/texmf-dist/tex/context/fonts/mkiv/euler-math.lfg @@ -78,6 +78,9 @@ return { { tweak = "addmirrors", }, + { + tweak = "addcomposites", + }, presets.scripttocalligraphic { }, presets.rsfstoscript { }, presets.rsfsuprighttoscript { }, diff --git a/Master/texmf-dist/tex/context/fonts/mkiv/generic-math.lfg b/Master/texmf-dist/tex/context/fonts/mkiv/generic-math.lfg index 2a55504da53..bbdd3be5457 100644 --- a/Master/texmf-dist/tex/context/fonts/mkiv/generic-math.lfg +++ b/Master/texmf-dist/tex/context/fonts/mkiv/generic-math.lfg @@ -16,8 +16,8 @@ return { PrimeBaselineDropMax = "SuperscriptBaselineDropMax", PrimeShiftUpCramped = "SuperscriptShiftUpCramped", PrimeSpaceAfter = 0, - PrimeWidthPercent = 50, SpaceBeforeScript = "SpaceAfterScript", + SpaceBetweenScript = "SpaceAfterScript", NoLimitSupFactor = 0, NoLimitSubFactor = 0, AccentTopShiftUp = 0, @@ -51,6 +51,9 @@ return { { tweak = "simplifykerns", }, + { + tweak = "addcomposites", + }, presets.moveitalics { correct = true }, { diff --git a/Master/texmf-dist/tex/context/fonts/mkiv/gfsneohellenic-math.lfg b/Master/texmf-dist/tex/context/fonts/mkiv/gfsneohellenic-math.lfg index 7525462e960..10d617d9bf7 100644 --- a/Master/texmf-dist/tex/context/fonts/mkiv/gfsneohellenic-math.lfg +++ b/Master/texmf-dist/tex/context/fonts/mkiv/gfsneohellenic-math.lfg @@ -44,6 +44,12 @@ return { tweak = "checkaccents", }, { + tweak = "wipecues", + }, + { + tweak = "addcomposites", + }, + { tweak = "kerns", list = { ["0x7D.parts.top"] = { topright = -0.25 }, -- right brace top diff --git a/Master/texmf-dist/tex/context/fonts/mkiv/iwona-math.lfg b/Master/texmf-dist/tex/context/fonts/mkiv/iwona-math.lfg index 76131ad8ef7..e00e1b5ac1c 100644 --- a/Master/texmf-dist/tex/context/fonts/mkiv/iwona-math.lfg +++ b/Master/texmf-dist/tex/context/fonts/mkiv/iwona-math.lfg @@ -91,6 +91,9 @@ if common then set = { "ignorekerndimensions" } }, -- we have dp > ht fences { + tweak = "wipecues", + }, + { tweak = "fixprimes", factor = 1.0, -- accent base height fake = 0.9, -- replace multiples with this width proportion @@ -99,6 +102,9 @@ if common then tweak = "addfourier", }, { + tweak = "addcomposites", + }, + { tweak = "addequals", force = true, }, diff --git a/Master/texmf-dist/tex/context/fonts/mkiv/koeielettersot.lfg b/Master/texmf-dist/tex/context/fonts/mkiv/koeielettersot.lfg new file mode 100644 index 00000000000..74bf2dd4966 --- /dev/null +++ b/Master/texmf-dist/tex/context/fonts/mkiv/koeielettersot.lfg @@ -0,0 +1,16 @@ +return { + name = "koeielettersot", + version = "1.00", + comment = "Goodies that complement koeielettersot", + author = "Hans Hagen", + copyright = "ConTeXt development team", + mathematics = { + rules = { + ["radical.extender"] = "radical.extender", + ["radical.end"] = "radical.end", + ["hrule.begin"] = "rule.begin", + ["hrule.extender"] = "rule.ex", + ["hrule.end"] = "rule.end", + } + } +} diff --git a/Master/texmf-dist/tex/context/fonts/mkiv/kpfonts-math.lfg b/Master/texmf-dist/tex/context/fonts/mkiv/kpfonts-math.lfg index 1286bcf7873..92ee2304e6f 100644 --- a/Master/texmf-dist/tex/context/fonts/mkiv/kpfonts-math.lfg +++ b/Master/texmf-dist/tex/context/fonts/mkiv/kpfonts-math.lfg @@ -28,7 +28,7 @@ return { aftercopying = { { tweak = "version", - expected = "Version 0.40", + expected = "Version 0.61", }, { tweak = "checkaccents", @@ -66,6 +66,9 @@ return { tweak = "addmirrors", }, { + tweak = "addcomposites", + }, + { -- kpfonts have calligraphic at private slots tweak = "replacealphabets", list = { diff --git a/Master/texmf-dist/tex/context/fonts/mkiv/kpfonts-text.lfg b/Master/texmf-dist/tex/context/fonts/mkiv/kpfonts-text.lfg index 6a14bec54f6..cad01c52dbf 100644 --- a/Master/texmf-dist/tex/context/fonts/mkiv/kpfonts-text.lfg +++ b/Master/texmf-dist/tex/context/fonts/mkiv/kpfonts-text.lfg @@ -9,7 +9,12 @@ return { name = "kern", -- adds to kerns type = "kern", fonts = { + "KpRoman-Light", "KpRoman-Regular", + "KpRoman-Semibold", + "KpRoman-Bold", + "KpSans-Regular", + "KpSans-Bold", }, data = { ["f"] = { @@ -24,8 +29,12 @@ return { name = "kern", -- adds to kerns type = "kern", fonts = { + "KpRoman-LightItalic", "KpRoman-Italic", "KpRoman-SemiboldItalic", + "KpRoman-BoldItalic", + "KpSans-Italic", + "KpSans-BoldItalic", }, data = { ["f"] = { diff --git a/Master/texmf-dist/tex/context/fonts/mkiv/kurier-math.lfg b/Master/texmf-dist/tex/context/fonts/mkiv/kurier-math.lfg index 96154194ab3..bfec7305927 100644 --- a/Master/texmf-dist/tex/context/fonts/mkiv/kurier-math.lfg +++ b/Master/texmf-dist/tex/context/fonts/mkiv/kurier-math.lfg @@ -91,6 +91,9 @@ if common then set = { "ignorekerndimensions" } }, -- we have dp > ht fences { + tweak = "wipecues", + }, + { tweak = "fixprimes", factor = 1.0, -- accent base height fake = 0.9, -- replace multiples with this width proportion diff --git a/Master/texmf-dist/tex/context/fonts/mkiv/libertinus-math.lfg b/Master/texmf-dist/tex/context/fonts/mkiv/libertinus-math.lfg index e605ca6ff6f..78e7af2db5a 100644 --- a/Master/texmf-dist/tex/context/fonts/mkiv/libertinus-math.lfg +++ b/Master/texmf-dist/tex/context/fonts/mkiv/libertinus-math.lfg @@ -41,13 +41,7 @@ return { { tweak = "addmirrors", }, - -- we have a weird middle integral piece - { - tweak = "dimensions", - list = { - [0x23AE] = { xoffset = -.19 }, - }, - }, + -- We add extensiblesd when they are not there. { tweak = "fixintegrals", }, @@ -92,6 +86,19 @@ return { -- and then need to tweak the width (which is auto set because it was zero with a large -- accent anchor offset). First we copy and fix. { + tweak = "dimensions", + list = { + [0x302] = { width = 0 }, --hat + [0x303] = { width = 0 }, --tilde + -- The middle pice is shifted compared to the larger pieces. + -- And the integral stick out down left. + -- We fix the width and shift. + [0x2320] = { width = 1.2, xoffset = 0.191 }, + [0x23AE] = { width = 1.2, }, -- bug + [0x2321] = { width = 1.2, xoffset = 0.191 }, + }, + }, + { tweak = "extendaccents", }, { diff --git a/Master/texmf-dist/tex/context/fonts/mkiv/lucida-math.lfg b/Master/texmf-dist/tex/context/fonts/mkiv/lucida-math.lfg new file mode 100644 index 00000000000..3669ef3768b --- /dev/null +++ b/Master/texmf-dist/tex/context/fonts/mkiv/lucida-math.lfg @@ -0,0 +1,309 @@ +local common = fonts.goodies.load("common-math.lfg") +local presets = common.mathematics.tweaks.presets + +local integral_variants = { bottomright = -0.20 } +----- integral_top = { topright = 0.05 } +local integral_bottom = { bottomright = -0.45 } + +return { + name = "lucida-opentype-math", + version = "1.00", + comment = "Goodies that complement lucida opentype.", + author = "Hans Hagen & Mikael Sundqvist", + copyright = "ConTeXt development team", + mathematics = { + parameters = { + FractionRuleThickness = 55, + -- AccentBaseDepth = 250, + FlattenedAccentBaseHeight = 710,-- slightly too large in the font + DelimiterPercent = 85, + DelimiterShortfall = 400, + DelimiterDisplayPercent = 90, -- MS + DelimiterDisplayShortfall = 400, + SuperscriptBottomMaxWithSubscript = 325, + PrimeShiftUp = "1.3*SuperscriptShiftUp", + PrimeShiftUpCramped = "1.3*SuperscriptShiftUp", + PrimeBaselineDropMax = "0.5*SuperscriptBaselineDropMax", + RadicalDisplayStyleVerticalGap = "RadicalVerticalGap", --172, 50 +-- RadicalKernBeforeExtensible = 100, +-- RadicalKernAfterExtensible = 100, + }, + scales = { + scriptxscale = 1025, + scriptyscale = 975, + scriptscriptxscale = 1050, + scriptscriptyscale = 950, + scriptweight = 20, + scriptscriptweight = 40, + }, + tweaks = { + -- beforepassing = { + -- { + -- tweak = "scales", + -- scriptxscale = 1100, + -- scriptyscale = 900, + -- scriptscriptxscale = 1100, + -- scriptscriptyscale = 900, + -- }, + -- }, + aftercopying = { + { + tweak = "version", + expected = "Version 1.901", + }, + { + tweak = "fixoldschool", + version = "Version 1.802", + }, + { + tweak = "parameters", + feature = "boldmath", + list = { + RadicalRuleThickness = 60, + -- RadicalRuleThickness = "1.09*RadicalRuleThickness", + -- FractionRuleThickness = 65, + -- OverRuleThickness = 65, + -- UnderRuleThickness = 65, + } + }, + { + tweak = "addmirrors", + }, + presets.smalldigits { factor = 0.90 }, + presets.scripttocalligraphic { }, + presets.rsfstoscript { rscale = 1 }, + presets.rsfsuprighttoscript { rscale = 1 }, + presets.moderntocalligraphic { rscale = 1 }, + presets.eulertocalligraphic { rscale = 1 }, + presets.xitsarabic { rscale = 1.05 }, + presets.fallbacks { }, + presets.moveitalics { correct = true }, + presets.moveitalics { correct = true, letters = true }, + presets.moveintegrals { factor = 1.5 }, + presets.wipeitalics { }, + { + tweak = "replacealphabets", + filename = "lucidabrightot.otf", + keep = true, + list = { + { source = "latinsupplement" }, + -- { source = "latinextendeda" }, + -- { source = "latinextendedadditional" }, + -- { source = "latinextendedb" }, + -- { source = "latinextendedc" }, + -- { source = "latinextendedd" }, + -- { source = "latinextendede" }, + -- { source = "latinextendedf" }, + -- { source = "latinextendedg" }, + }, + }, + { + tweak = "replacealphabets", + list = { + { + source = "uppercasescript", + target = "uppercasecalligraphic", + feature = "ss04", + }, + { + source = "lowercasescript", + target = "lowercasecalligraphic", + feature = "ss04", + }, + { + source = "uppercaseboldscript", + target = "uppercaseboldcalligraphic", + feature = "ss04", + }, + -- No lowercase bold calligraphic/script in font + }, + }, + { + tweak = "dimensions", + version = "Version 1.802", + list = { + -- The < and > are slightly too small. We scale them by 867/795 + ["0x003C"] = { scale = 1.09057, width = 1.09057, height = 1.09057 }, + ["0x003E"] = { scale = 1.09057, width = 1.09057, height = 1.09057 }, + }, + }, + { + tweak = "dimensions", + version = "Version 1.802", + list = { + -- these we fix here. Remove when we have new version of Lucida + ["0x23DC.parts.1"] = { xoffset = -0.075, height = 0.4, yoffset = -0.6 }, + ["0x23DC.parts.2"] = { height = 0.4, yoffset = -0.6 }, + ["0x23DC.parts.3"] = { xoffset = 0.075, height = 0.4, yoffset = -0.6 }, + ["0x23DD.parts.1"] = { xoffset = -0.075, depth = 0.8, yoffset = 0.2 }, + ["0x23DD.parts.2"] = { depth = 0.8, yoffset = 0.2 }, + ["0x23DD.parts.3"] = { xoffset = 0.075, depth = 0.8, yoffset = 0.2 }, + ["0x7C.variants.3"] = { squeeze = 0.90, height = 0.90, depth = 0.90 }, + ["0x7C.variants.4"] = { squeeze = 0.80, height = 0.80, depth = 0.80 }, + }, + }, + -- Accents are a mess. We migrate the extensibles from the combiners to the base accent + -- and then need to tweak the width (which is auto set because it was zero with a large + -- accent anchor offset). First we copy and fix. + { + tweak = "checkaccents", + }, + { + tweak = "extendaccents", + }, + { + tweak = "flattenaccents", + }, + { + tweak = "fixaccents", + }, +{ + tweak = "keepbases", + list = { 0x302 } +}, + { + tweak = "radicaldegreeanchors", + list = { + ["0x221A.variants.3"] = { location = "left", hfactor = 0, vfactor = .55 }, + ["0x221A.variants.4"] = { location = "left", hfactor = 0, vfactor = .50 }, + ["0x221A.parts.bottom"] = { location = "left", hfactor = 0, vfactor = .85 }, + } + }, + -- First we set the dimensions of the initial accent which started out as zero but we want + -- a proper width. Not in lucida + -- Then we deal with all offsets and heights in one go. So we treat the initial accent + -- as well as the variants here. Not in lucida. + -- We now copy these to the not wide slots so that we can set these to stretch as well, + -- if only because it is less confusing and more consistent. + { + tweak = "copyaccents", + }, + -- So far for the accents. + { + tweak = "fixslashes", + }, + { + tweak = "addbreve", + }, + { + tweak = "kerns", + list = { + [0x002F] = { topleft = -0.2, bottomright = -0.2 }, + ["0x007D.parts.top"] = { topright = -0.15 }, -- right brace top + ["0x007D.parts.bottom"] = { bottomright = -0.15 }, -- right brace bottom + ["0x007D.variants.*"] = { topright = -0.15, bottomright = -0.15 }, -- right brace variants + ["0x0029.parts.top"] = { topright = -0.25 }, -- right parenthesis top + ["0x0029.parts.bottom"] = { bottomright = -0.25 }, -- right parenthesis bottom + ["0x0029.variants.*"] = { topright = -0.2, bottomright = -0.2 }, -- right parenthesis variants + ["0x221A.parts.top"] = { topright = 0.2 }, -- right radical top + ["0x221A.parts.bottom"] = { bottomright = 0.2 }, -- right radical bottom + ["0x221A.variants.*"] = { topright = 0.2, bottomright = 0.2 }, -- right radical variants + [0x27E9] = { topright = -0.2, bottomright = -0.2 }, -- angle + ["0x27E9.variants.*"] = { topright = -0.3, bottomright = -0.3 }, + [0x27EB] = { topright = -0.2, bottomright = -0.2 }, + ["0x27EB.variants.*"] = { topright = -0.3, bottomright = -0.3 }, + }, + }, + { + tweak = "fixprimes", + factor = 0.7, -- accent base height + fake = 0.65, -- replace multiples with this width proportion + }, + { + tweak = "checkspacing", + }, + { + tweak = "addscripts", + }, + { + tweak = "accentdimensions", + }, + { + tweak = "addrules", + }, + { + tweak = "replacerules", + minus = { + leftoffset = .12, + rightoffset = .12, + }, + fraction = { + height = .2, + yoffset = .825, + }, + radical = { + height = .13, + yoffset = .825, + leftoffset = .124, + rightoffset = .124, + yscale = .940, + }, +radical = { + height = .140, + yoffset = .610, + yscale = .720, + leftoffset = .124, + rightoffset = .124, +}, + stacker = { + height = .2, + yoffset = .825, + }, + }, + { + tweak = "addactuarian", + }, + { + tweak = "addfourier", + variant = 1, + }, + { + tweak = "addprimed", + }, + { + tweak = "addarrows", + left = 0.1, + right = 0.1, + slack = 0.20, + list = { + [0x21A9] = false, + [0x21AA] = false, + [0x2190] = false, + [0x2192] = false, + [0x219E] = false, + [0x21A0] = false, + } + }, + -- fix a bug (todo: version) + { + tweak = "sortvariants", + list = { 0x23DE }, + orientation = "horizontal", + }, + -- this is the mkiv section + { + tweak = "emulatelmtx", + feature = "emulatelmtx", + comment = "this is for mkiv", + }, + }, + }, + alternates = { + textitalic = { feature = 'ss01', value = 1, comment = "Mathematical Alternative Lowercase Italic" }, + arrow = { feature = 'ss02', value = 1, comment = "Mathematical Alternative Smaller Arrows" }, + operator = { feature = 'ss03', value = 1, comment = "Mathematical Alternative Smaller Operators" }, + calligraphic = { feature = 'ss04', value = 1, comment = "Mathematical Alternative Calligraphic Characters" }, + zero = { feature = 'ss05', value = 1, comment = "Mathematical Alternative Zero" }, + multipledots = { feature = 'ss06', value = 1, comment = "Mathematical Alternative Multiple Dots" }, + ldots = { feature = 'ss07', value = 1, comment = "Mathematical Alternative Ellipsis" }, + }, + bigslots = { + 1, 2, 3, 4 + }, + -- + -- experimental fixes for mkiv: + -- + dimensions = dimensions, + kerns = kerns, + }, +} diff --git a/Master/texmf-dist/tex/context/fonts/mkiv/lucida-text.lfg b/Master/texmf-dist/tex/context/fonts/mkiv/lucida-text.lfg new file mode 100644 index 00000000000..cd32aee2b3c --- /dev/null +++ b/Master/texmf-dist/tex/context/fonts/mkiv/lucida-text.lfg @@ -0,0 +1,69 @@ +return { + name = "lucida-text", + version = "1.00", + comment = "Goodies that complement lucida.", + author = "Mikael Sundqvist & Hans Hagen", + copyright = "ConTeXt development team", + extensions = { + { + name = "kern", -- adds to kerns + type = "kern", + fonts = { + "LucidaBrightOT", + }, + data = { + ["f"] = { + [")"] = 70, + ["}"] = 70, + ["]"] = 70, + ["\\"] = 100, + }, + } + }, + { + name = "kern", -- adds to kerns + type = "kern", + fonts = { + "LucidaBrightOT-Demibold", + }, + data = { + ["f"] = { + [")"] = 70, + ["}"] = 70, + ["]"] = 70, + ["\\"] = 100, + }, + } + }, + { + name = "kern", + type = "kern", + fonts = { + "LucidaBrightOT-Italic", + }, + data = { + ["f"] = { + [")"] = 70, + ["}"] = 20, + ["]"] = 70, + ["\\"] = 100, + }, + } + }, + { + name = "kern", + type = "kern", + fonts = { + "LucidaBrightOT-DemiboldItalic", + }, + data = { + ["f"] = { + [")"] = 70, + ["}"] = 40, + ["]"] = 70, + ["\\"] = 100, + }, + } + }, + } +} diff --git a/Master/texmf-dist/tex/context/fonts/mkiv/lucida-typeone-math.lfg b/Master/texmf-dist/tex/context/fonts/mkiv/lucida-typeone-math.lfg new file mode 100644 index 00000000000..82ba589cd48 --- /dev/null +++ b/Master/texmf-dist/tex/context/fonts/mkiv/lucida-typeone-math.lfg @@ -0,0 +1,348 @@ +local mathencodings = fonts.encodings.math + +mathencodings["lbr-ma"] = { + [0x025CB] = 0x00, -- circle + [0x025CF] = 0x01, -- blackcircle + [0x025A1] = 0x02, -- square + [0x025A0] = 0x03, -- blacksquare + [0x025B3] = 0x04, -- triangleup + [0x025B2] = 0x05, -- blacktriangleup + [0x025BD] = 0x06, -- triangledown + [0x025BC] = 0x07, -- blacktriangledown + [0x02B28] = 0x08, -- lozenge + [0x02B27] = 0x09, -- blacklozenge + [0x02B29] = 0x0A, -- blackdiamond + [0x02571] = 0x0B, -- upright + [0x02572] = 0x0C, -- downright + [0x022E4] = 0x0D, -- squareimageofnoteq + [0x022E5] = 0x0E, -- squareoriginalofnoteq + [0x02A4F] = 0x0F, -- dblsquareunion + [0x02A4E] = 0x10, -- dblsquareintersection + [0x02A64] = 0x11, -- zdomainantirestriction + [0x02A65] = 0x12, -- zrangeantirestriction + [0x022EE] = 0x13, -- verticalellipsis + [0x022EF] = 0x14, -- ellipsis + [0x022F0] = 0x15, -- uprightellipsis + [0x022F1] = 0x16, -- downrightellipsis + [0x022D5] = 0x17, -- equalparallel + + [0x0225B] = 0x1A, -- stareq + [0x00127] = 0x1B, -- hbar + [0x022F6] = 0x1C, -- barelementof + [0x02209] = 0x1D, -- notelementof + [0x022FD] = 0x1E, -- barcontains + [0x0220C] = 0x1F, -- notcontain + [0x02204] = 0x20, -- nexists + [0x02194] = 0x21, -- leftrightarrow + [0x02195] = 0x22, -- updownarrow + [0x0219E] = 0x23, -- leftleftarrow + [0x0219F] = 0x24, -- upuparrow + [0x021A0] = 0x25, -- rightrightarrow +-- [0x00026] = 0x26, -- amperand + [0x021A1] = 0x27, -- downdownarrow + [0x021A2] = 0x28, -- leftarrowtail + [0x021A3] = 0x29, -- rightarrowtail + [0x021A4] = 0x2A, -- leftarrowbar + [0x021A6] = 0x2B, -- rightarrowbar + [0x021A5] = 0x2C, -- uparrowbar +-- [0x02212] = 0x2D, -- minus +-- [0x0002D] = 0x2D, -- minus + [0x021A7] = 0x2E, -- downarrowbar + [0x021E4] = 0x2F, -- barleftarrow + [0x021E5] = 0x30, -- barrightarrow + + [0x021E0] = 0x38, -- dashleftarrow + [0x021E1] = 0x39, -- dashuparrow + [0x021E2] = 0x3A, -- dashrightarrow + [0x021E3] = 0x3B, -- dashdownarrow + [0x021A9] = 0x3C, -- hookleftarrow +-- [0x0003D] = 0x3D, -- equalto + [0x021AA] = 0x3E, -- hookrightarrow + [0x021AB] = 0x3F, -- looparrowleft + [0x021AC] = 0x40, -- looparrowright + [0x1D538] = 0x41, -- A (blackboard A) + [0x1D539] = 0x42, -- B + [0x02102] = 0x43, -- C + [0x1D53B] = 0x44, -- D + [0x1D53C] = 0x45, -- E + [0x1D53D] = 0x46, -- F + [0x1D53E] = 0x47, -- G + [0x0210D] = 0x48, -- H + [0x1D540] = 0x49, -- I + [0x1D541] = 0x4A, -- J + [0x1D542] = 0x4B, -- K + [0x1D543] = 0x4C, -- L + [0x1D544] = 0x4D, -- M + [0x02115] = 0x4E, -- N + [0x1D546] = 0x4F, -- O + [0x02119] = 0x50, -- P + [0x0211A] = 0x51, -- Q + [0x0211D] = 0x52, -- R + [0x1D54A] = 0x53, -- S + [0x1D54B] = 0x54, -- T + [0x1D54C] = 0x55, -- U + [0x1D54D] = 0x56, -- V + [0x1D54E] = 0x57, -- W + [0x1D54F] = 0x58, -- X + [0x1D550] = 0x59, -- Y + [0x02124] = 0x5A, -- Z (blackboard Z) + [0x0231C] = 0x5B, -- ulcorner + [0x0231D] = 0x5C, -- urcorner + [0x0231E] = 0x5D, -- llcorner + [0x0231F] = 0x5E, -- lrcorner + [0x02225] = 0x5F, -- parallel, Vert, lVert, rVert, arrowvert + [0x021D5] = 0x60, -- Updownarrow + [0x021D4] = 0x61, -- Leftrightarrow + [0x021D6] = 0x62, -- Upleftarrow + [0x021D7] = 0x63, -- Uprightarrow + [0x021D9] = 0x64, -- Downleftarrow + [0x021D8] = 0x65, -- Downrightarrow + [0x021CD] = 0x66, -- nLeftarrow + [0x021CE] = 0x67, -- nLeftrightarrow + [0x021CF] = 0x68, -- nRightarrow +-- [0x021CE] = 0x69, -- nLeftrightarrow -- what's the difference between this and 0x0067[0x021CE] + [0x021DA] = 0x6A, -- Lleftarrow + [0x1D55C] = 0x6B, -- k \Bbbk (blackboard k) + [0x021DB] = 0x6C, -- Rrightarrow + [0x021C4] = 0x6D, -- rlarrow + [0x021C6] = 0x6E, -- lrarrow + [0x021C5] = 0x6F, -- udarrow +-- [0x021C5] = 0x70, -- duarrow + [0x021C7] = 0x71, -- llarrow + [0x021C8] = 0x72, -- uuarrow + [0x021C9] = 0x73, -- rrarrow + [0x021CA] = 0x74, -- ddarrow + [0x021BE] = 0x75, -- rupharpoon + [0x021BF] = 0x76, -- lupharpoon + [0x021C2] = 0x77, -- rdownharpoon + [0x021C3] = 0x78, -- ldownharpoon + [0x021CB] = 0x79, -- lrharpoon + [0x021CC] = 0x7A, -- rlharpoon + [0x021B0] = 0x7B, -- upthenleftarrow +-- [0x00000] = 0x7C, -- part + [0x021B1] = 0x7D, -- upthenrightarrow +-- [0x00000] = 0x7E, -- part + [0x02276] = 0x7F, -- ltgt + [0x021B2] = 0x81, -- downthenleftarrow + [0x021B3] = 0x82, -- downthenrightarrow + [0x02B0E] = 0x83, -- rightthendownarrow + [0x02B10] = 0x84, -- leftthendownarrow + [0x02B0F] = 0x85, -- rightthenuparrow + [0x02B11] = 0x86, -- leftthenuparrow + [0x021B6] = 0x87, -- leftarcarrow + [0x021B7] = 0x88, -- rightarcarrow + [0x0293D] = 0x89, -- leftarcarrowplus + [0x0293C] = 0x8A, -- rightarcarrowminus + [0x021BA] = 0x8B, -- anticlockwise + [0x021BB] = 0x8C, -- clockwise + + [0x02260] = 0x94, -- noteq + [0x02262] = 0x95, -- notidentical + [0x02241] = 0x96, -- nottilde + [0x02244] = 0x97, -- notasymptoticallyequal + [0x02249] = 0x98, -- notalmostequal + [0x02247] = 0x99, -- notapproximatelyeq + [0x0226E] = 0x9A, -- nless + [0x0226F] = 0x9B, -- ngtr + [0x02270] = 0x9C, -- nleq + [0x02271] = 0x9D, -- ngeq + [0x022E6] = 0x9E, -- lnsim + [0x022E7] = 0x9F, -- gnsim + [0x02605] = 0xAB, -- black star + [0x02713] = 0xAC, -- check + [0x02277] = 0xC5, -- gtlt + [0x02284] = 0xC6, -- nsubsetof + [0x02285] = 0xC7, -- nsupsetof + [0x02288] = 0xC8, -- nsubseteq + [0x02289] = 0xC9, -- nsupseteq + + [0x0228A] = 0xCC, -- subsetneq + [0x0228B] = 0xCD, -- supsetneq + +-- [0x0228A] = 0xD0, -- subsetneq +-- [0x0228B] = 0xD1, -- supsetneq + + [0x02270] = 0xD6, -- nleq + [0x02271] = 0xD7, -- ngeq + + [0x02268] = 0xDC, -- lneqq + [0x02269] = 0xDD, -- gneqq + + [0x022E6] = 0xE0, -- lnsim + [0x02219] = 0xE1, -- bullet + [0x022E7] = 0xE2, -- gnsim + + [0x02280] = 0xE5, -- nprec + [0x02281] = 0xE6, -- nsucc + + [0x022E8] = 0xEB, -- precnsim + [0x022E9] = 0xEC, -- succnsim + + [0x022EA] = 0xEF, -- nnormalsub + [0x022EB] = 0xF0, -- ncontainnormalsub + [0x022EC] = 0xF1, -- nnormalsubeq + [0x022ED] = 0xF2, -- ncontainnormalsubeq + + [0x02226] = 0xF7, -- nparallel + [0x022AC] = 0xF8, -- nvdash + [0x022AE] = 0xF9, -- nVdash + [0x022AD] = 0xFA, -- nvDash + [0x022AF] = 0xFB, -- nVDash +} + +mathencodings["lbr-mb"] = { + [0x00393] = 0x00, -- Gamma + [0x00394] = 0x01, -- Delta + [0x00398] = 0x02, -- Theta + [0x0039B] = 0x03, -- Lambda + [0x0039E] = 0x04, -- Xi + [0x003A0] = 0x05, -- Pi + [0x003A3] = 0x06, -- Sigma + [0x003A5] = 0x07, -- Upsilon + [0x003A6] = 0x08, -- Phi + [0x003A8] = 0x09, -- Psi + [0x003A9] = 0x0A, -- Omega + [0x0210F] = 0x9D, -- hslash + [0x02127] = 0x92, -- mho + [0x02132] = 0x90, -- Finv + [0x02136] = 0x95, -- beth + [0x02137] = 0x96, -- gimel + [0x02138] = 0x97, -- daleth + [0x02141] = 0x91, -- Game + [0x02201] = 0x94, -- complement + [0x0226C] = 0xF2, -- between + [0x0227C] = 0xE4, -- preccurlyeq + [0x0227D] = 0xE5, -- succcurlyeq + [0x0229D] = 0xCC, -- circleddash + [0x022A8] = 0xD6, -- vDash + [0x022AA] = 0xD3, -- Vvdash + [0x022B8] = 0xC7, -- multimap + [0x022BB] = 0xD2, -- veebar + [0x022C7] = 0xF7, -- divideontimes + [0x022C9] = 0xCF, -- ltimes + [0x022CA] = 0xCE, -- rtimes + [0x022CB] = 0xD0, -- leftthreetimes + [0x022CC] = 0xD1, -- rightthreetimes + [0x022D6] = 0xDC, -- lessdot + [0x022D7] = 0xDD, -- gtrdot + [0x022D8] = 0xDE, -- lll + [0x022D9] = 0xDF, -- ggg + [0x022DA] = 0xE8, -- lesseqgtr + [0x022DB] = 0xE9, -- gtreqless + [0x022DE] = 0xE6, -- curlyeqprec + [0x022DF] = 0xE7, -- curlyeqsucc + [0x024C7] = 0xC9, -- circledR + [0x024C8] = 0xCA, -- circledS + [0x025B6] = 0xF1, -- blacktriangleright + [0x025B8] = 0xF0, -- blacktriangleleft + [0x02720] = 0xCB, -- maltese + [0x02A7D] = 0xE0, -- leqslant + [0x02A7E] = 0xE1, -- geqslant + [0x02A85] = 0xDA, -- lessapprox + [0x02A86] = 0xDB, -- gtrapprox + [0x02A8B] = 0xEA, -- lesseqqgtr + [0x02A8C] = 0xEB, -- gtreqqless + [0x02A95] = 0xE2, -- eqslantless + [0x02A96] = 0xE3, -- eqslantgtr + [0x02AB7] = 0xEC, -- precapprox + [0x02AB8] = 0xED, -- succapprox + [0x02AC5] = 0xEE, -- subseteqq + [0x02AC6] = 0xEF, -- supseteqq + [0x12035] = 0xC8, -- backprime + [0x1D718] = 0x9B, -- varkappa +} + + +mathencodings["lbr-sy"] = { + + -- [0x022C5] = 0x01, -- cdot, + + [0x0002B] = 0x82, -- plus + [0x0003D] = 0x83, -- equal + + [0x021CB] = 0x8D, -- leftrightharpoons + [0x021CC] = 0x8E, -- rightleftharpoons + [0x02214] = 0x89, -- dotplus + [0x02220] = 0x8B, -- angle + [0x02221] = 0x8C, -- measuredangle + [0x02222] = 0x8D, -- sphericalangle + [0x02234] = 0x90, -- therefore + [0x02235] = 0x91, -- because + [0x0223D] = 0x24, -- backsim + [0x02242] = 0x99, -- eqsim + [0x02245] = 0x9B, -- cong + [0x0224A] = 0x9D, -- approxeq + [0x0224E] = 0xC7, -- Bumpeq + [0x02252] = 0xCB, -- fallingdotseq + [0x02253] = 0xCC, -- risingdotseq + [0x02256] = 0xCF, -- eqcirc + [0x02257] = 0xD0, -- circeq + [0x0225C] = 0xD5, -- triangleq + [0x02266] = 0xDA, -- leqq + [0x02267] = 0xDB, -- geqq + [0x02272] = 0xDC, -- lesssim + [0x02273] = 0xDD, -- gtrsim + [0x02276] = 0xDE, -- lessgtr + [0x02277] = 0xDF, -- gtrless + [0x0227E] = 0xE0, -- precsim + [0x0227F] = 0xE1, -- succsim + [0x0228F] = 0xE4, -- sqsubset + [0x02290] = 0xE5, -- sqsupset + [0x0229A] = 0xE6, -- circledcirc + [0x0229B] = 0xE7, -- circledast + [0x0229E] = 0xEA, -- boxplus + [0x0229F] = 0xEB, -- boxminus + [0x022A0] = 0xEC, -- boxtimes + [0x022A1] = 0xED, -- boxdot + [0x022A7] = 0xEE, -- models + [0x022A9] = 0xF0, -- Vdash + [0x022BC] = 0xF6, -- barwedge + [0x022CE] = 0x85, -- curlyvee + [0x022CF] = 0x84, -- curlywedge + [0x022D0] = 0xF8, -- Subset + [0x022D1] = 0xF9, -- Supset + [0x02300] = 0x53, -- varnothing + [0x025CA] = 0x05, -- lozenge +} + + +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 with help from Zhichu Chen", + copyright = "ConTeXt development team", + mathematics = { + mapfiles = { + "lucida.map", + }, + virtuals = { + ["lucida-math"] = { + { name = "file:lbr.afm", features = "virtualmath", main = true }, + { name = "hlcrim.tfm", vector = "tex-mi", skewchar=0x7F }, + { name = "hlcrim.tfm", vector = "tex-it", skewchar=0x7F }, + { name = "hlcry.tfm", vector = "lbr-sy", skewchar=0x30, parameters = true }, + { name = "hlcrv.tfm", vector = "tex-ex", extension = true }, + { name = "hlcra.tfm", vector = "lbr-ma" }, + { name = "hlcrm.tfm", vector = "lbr-mb" }, + -- { name = "hlcrim.tfm", vector = "lbr-mb" }, -- LucidaNewMath-Italic <-> AltItalic + -- { name = "hlcdim.tfm", vector = "lbr-mb" }, -- LucidaNewMath-DemiItalic <-> AltDemiItalic + -- { name = "hlcrima.tfm", vector = "lbr-mb" }, -- LucidaNewMath-AltItalic <-> Italic + { 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/mkiv/minion-math.lfg b/Master/texmf-dist/tex/context/fonts/mkiv/minion-math.lfg index 535d5b88307..a8255ddff3d 100644 --- a/Master/texmf-dist/tex/context/fonts/mkiv/minion-math.lfg +++ b/Master/texmf-dist/tex/context/fonts/mkiv/minion-math.lfg @@ -45,6 +45,9 @@ return { { tweak = "addmirrors", }, + { + tweak = "addcomposites", + }, presets.rsfstoscript { rscale = 0.97 }, presets.rsfsuprighttoscript { rscale = 0.97 }, presets.moderntocalligraphic { rscale = 0.97 }, diff --git a/Master/texmf-dist/tex/context/fonts/mkiv/modern-math.lfg b/Master/texmf-dist/tex/context/fonts/mkiv/modern-math.lfg index 6f1ab45871a..6547c72d265 100644 --- a/Master/texmf-dist/tex/context/fonts/mkiv/modern-math.lfg +++ b/Master/texmf-dist/tex/context/fonts/mkiv/modern-math.lfg @@ -51,7 +51,7 @@ return { list = { { -- source = { first = 0x02980 }, -- triplebar - filename = "LatinModernMath-Companion.otf", + filename = "latinmodernmathcompanion-regular.otf", feature = "ss01", unicodes = { 0x00028, -- left parenthesis @@ -70,7 +70,7 @@ return { }, { -- source = { first = 0x02980 }, -- triplebar - filename = "LatinModernMath-Companion.otf", + filename = "latinmodernmathcompanion-regular.otf", feature = "ss02", unicodes = { 0x0007B, -- left brace @@ -78,7 +78,7 @@ return { }, }, { - filename = "LatinModernMath-Companion.otf", + filename = "latinmodernmathcompanion-regular.otf", feature = "ss03", unicodes = { 0x0221A, -- radical @@ -86,7 +86,7 @@ return { }, { -- source = { first = 0x02980 }, -- triplebar - filename = "LatinModernMath-Companion.otf", + filename = "latinmodernmathcompanion-regular.otf", unicodes = { 0x0002F, -- solidus -- 0x00028, -- left parenthesis @@ -118,6 +118,9 @@ return { { tweak = "addmirrors", --bidi }, + { + tweak = "addcomposites", + }, presets.scripttocalligraphic { }, presets.rsfstoscript { }, presets.rsfsuprighttoscript { }, @@ -134,7 +137,7 @@ return { tweak = "checkaccents", }, { - tweak = "wipeweirdones", + tweak = "wipecues", }, { tweak = "dimensions", diff --git a/Master/texmf-dist/tex/context/fonts/mkiv/newcomputermodern-math.lfg b/Master/texmf-dist/tex/context/fonts/mkiv/newcomputermodern-math.lfg index 6f253524648..720cd7c2826 100644 --- a/Master/texmf-dist/tex/context/fonts/mkiv/newcomputermodern-math.lfg +++ b/Master/texmf-dist/tex/context/fonts/mkiv/newcomputermodern-math.lfg @@ -111,9 +111,15 @@ return { presets.wipeanchors { }, presets.wipeitalics { }, { + tweak = "addcomposites", + }, + { tweak = "checkaccents", }, { + tweak = "wipecues", + }, + { tweak = "kerns", list = { [0x0002F] = { topleft = -0.2, bottomright = -0.2 }, -- solidus @@ -187,199 +193,199 @@ return { dimensions = dimensions, kerns = kerns, }, - filenames = { - ["latinmodern-math-regular.otf"] = { - "latinmodern-math.otf", -- the beta - "lmmath-regular.otf", - "latinmodernmath-regular.otf", - "lmmath-regular.otf", - "lmodernmath-regular.otf", - "lmodern-math.otf", - }, - }, - designsizes = { - ["LMMathRoman-Regular"] = { - ["4pt"] = "LMMath5-Regular@lmroman5-math", - ["5pt"] = "LMMath5-Regular@lmroman5-math", - ["6pt"] = "LMMath6-Regular@lmroman6-math", - ["7pt"] = "LMMath7-Regular@lmroman7-math", - ["8pt"] = "LMMath8-Regular@lmroman8-math", - ["9pt"] = "LMMath9-Regular@lmroman9-math", - ["10pt"] = "LMMath10-Regular@lmroman10-math", - ["11pt"] = "LMMath10-Regular@lmroman10-math", - ["12pt"] = "LMMath12-Regular@lmroman12-math", - default = "LMMath10-Regular@lmroman10-math" - }, - ["LMMathRoman-Bold"] = { -- not yet ready - ["4pt"] = "LMMath5-Regular@lmroman5-math", - ["5pt"] = "LMMath5-Regular@lmroman5-math", - ["6pt"] = "LMMath6-Regular@lmroman6-math", - ["7pt"] = "LMMath7-Regular@lmroman7-math", - ["8pt"] = "LMMath8-Regular@lmroman8-math", - ["9pt"] = "LMMath9-Regular@lmroman9-math", - ["10pt"] = "LMMath10-Regular@lmroman10-math", - ["11pt"] = "LMMath10-Regular@lmroman10-math", - ["12pt"] = "LMMath12-Regular@lmroman12-math", - default = "LMMath10-Regular@lmroman10-math" - }, - ["LMRoman-Regular"] = { - ["4pt"] = "file:lmroman5-regular", - ["5pt"] = "file:lmroman5-regular", - ["6pt"] = "file:lmroman6-regular", - ["7pt"] = "file:lmroman7-regular", - ["8pt"] = "file:lmroman8-regular", - ["9pt"] = "file:lmroman9-regular", - ["10pt"] = "file:lmroman10-regular", - ["11pt"] = "file:lmroman10-regular", - ["12pt"] = "file:lmroman12-regular", - default = "file:lmroman10-regular", - }, - ["LMRoman-Bold"] = { - ["4pt"] = "file:lmroman5-bold", - ["5pt"] = "file:lmroman5-bold", - ["6pt"] = "file:lmroman6-bold", - ["7pt"] = "file:lmroman7-bold", - ["8pt"] = "file:lmroman8-bold", - ["9pt"] = "file:lmroman9-bold", - ["10pt"] = "file:lmroman10-bold", - ["11pt"] = "file:lmroman10-bold", - ["12pt"] = "file:lmroman12-bold", - default = "file:lmroman10-bold", - }, - ["LMRoman-Demi"] = { - default = "file:lmromandemi10-regular", - }, - ["LMRoman-Italic"] = { - ["4pt"] = "file:lmroman7-italic", - ["5pt"] = "file:lmroman7-italic", - ["6pt"] = "file:lmroman7-italic", - ["7pt"] = "file:lmroman7-italic", - ["8pt"] = "file:lmroman8-italic", - ["9pt"] = "file:lmroman9-italic", - ["10pt"] = "file:lmroman10-italic", - ["11pt"] = "file:lmroman10-italic", - ["12pt"] = "file:lmroman12-italic", - default = "file:lmroman10-italic", - }, - ["LMRoman-Oblique"] = { - ["4pt"] = "file:lmromanslant8-regular", - ["5pt"] = "file:lmromanslant8-regular", - ["6pt"] = "file:lmromanslant8-regular", - ["7pt"] = "file:lmromanslant8-regular", - ["8pt"] = "file:lmromanslant8-regular", - ["9pt"] = "file:lmromanslant9-regular", - ["10pt"] = "file:lmromanslant10-regular", - ["11pt"] = "file:lmromanslant10-regular", - ["12pt"] = "file:lmromanslant12-regular", - default = "file:lmromanslant10-regular", - }, - ["LMRoman-BoldItalic"] = { - default = "file:lmroman10-bolditalic", - }, - ["LMRoman-BoldOblique"] = { - default = "file:lmromanslant10-bold", - }, - ["LMRoman-DemiOblique"] = { - default = "file:lmromandemi10-oblique", - }, - ["LMRoman-CapsRegular"] = { - default = "file:lmromancaps10-regular", - }, - ["LMRoman-CapsOblique"] = { - default = "file:lmromancaps10-oblique", - }, - ["LMRoman-Dunhill"] = { - default = "file:lmromandunh10-regular", - }, - ["LMRoman-DunhillOblique"] = { - default = "file:lmromandunh10-oblique", - }, - ["LMRoman-Unslanted"] = { - default = "file:lmromanunsl10-regular", - }, - ["LMSans-Regular"] = { - ["8pt"] = "file:lmsans8-regular", - ["9pt"] = "file:lmsans9-regular", - ["10pt"] = "file:lmsans10-regular", - ["11pt"] = "file:lmsans10-regular", - ["12pt"] = "file:lmsans12-regular", - default = "file:lmsans10-regular", - }, - ["LMSans-Oblique"] = { - ["8pt"] = "file:lmsans8-oblique", - ["9pt"] = "file:lmsans9-oblique", - ["10pt"] = "file:lmsans10-oblique", - ["11pt"] = "file:lmsans10-oblique", - ["12pt"] = "file:lmsans12-oblique", - default = "file:lmsans10-oblique", - }, - ["LMSans-Bold"] = { - default = "file:lmsans10-bold", - }, - ["LMSans-BoldOblique"] = { - default = "file:lmsans10-boldoblique", - }, - ["LMSans-DemiCondensed"] = { - default = "file:lmsansdemicond10-regular", - }, - ["LMSans-DemiCondensedOblique"] = { - default = "file:lmsansdemicond10-oblique", - }, - ["LMTypewriter-Regular"] = { - ["8pt"] = "file:lmmono8-regular", - ["9pt"] = "file:lmmono9-regular", - ["10pt"] = "file:lmmono10-regular", - ["11pt"] = "file:lmmono10-regular", - ["12pt"] = "file:lmmono12-regular", - default = "file:lmmono10-regular", - }, - ["LMTypewriter-Light"] = { - default = "file:lmmonolt10-regular", - }, - ["LMTypewriter-Dark"] = { - default = "file:lmmonolt10-bold", - }, - ["LMTypewriter-Italic"] = { - default = "file:lmmono10-italic", - }, - ["LMTypewriter-LightOblique"] = { - default = "file:lmmonolt10-oblique", - }, - ["LMTypewriter-Oblique"] = { - default = "file:lmmonoslant10-regular", - }, - ["LMTypewriter-DarkOblique"] = { - default = "file:lmmonolt10-boldoblique", - }, - ["LMTypewriter-LightCondensed"] = { - default = "file:lmmonoltcond10-regular", - }, - ["LMTypewriter-LightCondensedOblique"] = { - default = "file:lmmonoltcond10-oblique", - }, - ["LMTypewriterVarWd-Regular"] = { - default = "file:lmmonoproplt10-regular", - }, - ["LMTypewriterVarWd-Oblique"] = { - default = "file:lmmonoproplt10-oblique", - }, - ["LMTypewriterVarWd-Light"] = { - default = "file:lmmonoprop10-regular", - }, - ["LMTypewriterVarWd-LightOblique"] = { - default = "file:lmmonoprop10-oblique", - }, - ["LMTypewriterVarWd-Dark"] = { - default = "file:lmmonoproplt10-bold", - }, - ["LMTypewriterVarWd-DarkOblique"] = { - default = "file:lmmonoproplt10-boldoblique", - }, - ["LMTypewriter-CapsRegular"] = { - default = "file:lmmonocaps10-regular", - }, - ["LMTypewriter-CapsOblique"] = { - default = "file:lmmonocaps10-oblique", - }, - } +-- filenames = { +-- ["latinmodern-math-regular.otf"] = { +-- "latinmodern-math.otf", -- the beta +-- "lmmath-regular.otf", +-- "latinmodernmath-regular.otf", +-- "lmmath-regular.otf", +-- "lmodernmath-regular.otf", +-- "lmodern-math.otf", +-- }, +-- }, +-- designsizes = { +-- ["LMMathRoman-Regular"] = { +-- ["4pt"] = "LMMath5-Regular@lmroman5-math", +-- ["5pt"] = "LMMath5-Regular@lmroman5-math", +-- ["6pt"] = "LMMath6-Regular@lmroman6-math", +-- ["7pt"] = "LMMath7-Regular@lmroman7-math", +-- ["8pt"] = "LMMath8-Regular@lmroman8-math", +-- ["9pt"] = "LMMath9-Regular@lmroman9-math", +-- ["10pt"] = "LMMath10-Regular@lmroman10-math", +-- ["11pt"] = "LMMath10-Regular@lmroman10-math", +-- ["12pt"] = "LMMath12-Regular@lmroman12-math", +-- default = "LMMath10-Regular@lmroman10-math" +-- }, +-- ["LMMathRoman-Bold"] = { -- not yet ready +-- ["4pt"] = "LMMath5-Regular@lmroman5-math", +-- ["5pt"] = "LMMath5-Regular@lmroman5-math", +-- ["6pt"] = "LMMath6-Regular@lmroman6-math", +-- ["7pt"] = "LMMath7-Regular@lmroman7-math", +-- ["8pt"] = "LMMath8-Regular@lmroman8-math", +-- ["9pt"] = "LMMath9-Regular@lmroman9-math", +-- ["10pt"] = "LMMath10-Regular@lmroman10-math", +-- ["11pt"] = "LMMath10-Regular@lmroman10-math", +-- ["12pt"] = "LMMath12-Regular@lmroman12-math", +-- default = "LMMath10-Regular@lmroman10-math" +-- }, +-- ["LMRoman-Regular"] = { +-- ["4pt"] = "file:lmroman5-regular", +-- ["5pt"] = "file:lmroman5-regular", +-- ["6pt"] = "file:lmroman6-regular", +-- ["7pt"] = "file:lmroman7-regular", +-- ["8pt"] = "file:lmroman8-regular", +-- ["9pt"] = "file:lmroman9-regular", +-- ["10pt"] = "file:lmroman10-regular", +-- ["11pt"] = "file:lmroman10-regular", +-- ["12pt"] = "file:lmroman12-regular", +-- default = "file:lmroman10-regular", +-- }, +-- ["LMRoman-Bold"] = { +-- ["4pt"] = "file:lmroman5-bold", +-- ["5pt"] = "file:lmroman5-bold", +-- ["6pt"] = "file:lmroman6-bold", +-- ["7pt"] = "file:lmroman7-bold", +-- ["8pt"] = "file:lmroman8-bold", +-- ["9pt"] = "file:lmroman9-bold", +-- ["10pt"] = "file:lmroman10-bold", +-- ["11pt"] = "file:lmroman10-bold", +-- ["12pt"] = "file:lmroman12-bold", +-- default = "file:lmroman10-bold", +-- }, +-- ["LMRoman-Demi"] = { +-- default = "file:lmromandemi10-regular", +-- }, +-- ["LMRoman-Italic"] = { +-- ["4pt"] = "file:lmroman7-italic", +-- ["5pt"] = "file:lmroman7-italic", +-- ["6pt"] = "file:lmroman7-italic", +-- ["7pt"] = "file:lmroman7-italic", +-- ["8pt"] = "file:lmroman8-italic", +-- ["9pt"] = "file:lmroman9-italic", +-- ["10pt"] = "file:lmroman10-italic", +-- ["11pt"] = "file:lmroman10-italic", +-- ["12pt"] = "file:lmroman12-italic", +-- default = "file:lmroman10-italic", +-- }, +-- ["LMRoman-Oblique"] = { +-- ["4pt"] = "file:lmromanslant8-regular", +-- ["5pt"] = "file:lmromanslant8-regular", +-- ["6pt"] = "file:lmromanslant8-regular", +-- ["7pt"] = "file:lmromanslant8-regular", +-- ["8pt"] = "file:lmromanslant8-regular", +-- ["9pt"] = "file:lmromanslant9-regular", +-- ["10pt"] = "file:lmromanslant10-regular", +-- ["11pt"] = "file:lmromanslant10-regular", +-- ["12pt"] = "file:lmromanslant12-regular", +-- default = "file:lmromanslant10-regular", +-- }, +-- ["LMRoman-BoldItalic"] = { +-- default = "file:lmroman10-bolditalic", +-- }, +-- ["LMRoman-BoldOblique"] = { +-- default = "file:lmromanslant10-bold", +-- }, +-- ["LMRoman-DemiOblique"] = { +-- default = "file:lmromandemi10-oblique", +-- }, +-- ["LMRoman-CapsRegular"] = { +-- default = "file:lmromancaps10-regular", +-- }, +-- ["LMRoman-CapsOblique"] = { +-- default = "file:lmromancaps10-oblique", +-- }, +-- ["LMRoman-Dunhill"] = { +-- default = "file:lmromandunh10-regular", +-- }, +-- ["LMRoman-DunhillOblique"] = { +-- default = "file:lmromandunh10-oblique", +-- }, +-- ["LMRoman-Unslanted"] = { +-- default = "file:lmromanunsl10-regular", +-- }, +-- ["LMSans-Regular"] = { +-- ["8pt"] = "file:lmsans8-regular", +-- ["9pt"] = "file:lmsans9-regular", +-- ["10pt"] = "file:lmsans10-regular", +-- ["11pt"] = "file:lmsans10-regular", +-- ["12pt"] = "file:lmsans12-regular", +-- default = "file:lmsans10-regular", +-- }, +-- ["LMSans-Oblique"] = { +-- ["8pt"] = "file:lmsans8-oblique", +-- ["9pt"] = "file:lmsans9-oblique", +-- ["10pt"] = "file:lmsans10-oblique", +-- ["11pt"] = "file:lmsans10-oblique", +-- ["12pt"] = "file:lmsans12-oblique", +-- default = "file:lmsans10-oblique", +-- }, +-- ["LMSans-Bold"] = { +-- default = "file:lmsans10-bold", +-- }, +-- ["LMSans-BoldOblique"] = { +-- default = "file:lmsans10-boldoblique", +-- }, +-- ["LMSans-DemiCondensed"] = { +-- default = "file:lmsansdemicond10-regular", +-- }, +-- ["LMSans-DemiCondensedOblique"] = { +-- default = "file:lmsansdemicond10-oblique", +-- }, +-- ["LMTypewriter-Regular"] = { +-- ["8pt"] = "file:lmmono8-regular", +-- ["9pt"] = "file:lmmono9-regular", +-- ["10pt"] = "file:lmmono10-regular", +-- ["11pt"] = "file:lmmono10-regular", +-- ["12pt"] = "file:lmmono12-regular", +-- default = "file:lmmono10-regular", +-- }, +-- ["LMTypewriter-Light"] = { +-- default = "file:lmmonolt10-regular", +-- }, +-- ["LMTypewriter-Dark"] = { +-- default = "file:lmmonolt10-bold", +-- }, +-- ["LMTypewriter-Italic"] = { +-- default = "file:lmmono10-italic", +-- }, +-- ["LMTypewriter-LightOblique"] = { +-- default = "file:lmmonolt10-oblique", +-- }, +-- ["LMTypewriter-Oblique"] = { +-- default = "file:lmmonoslant10-regular", +-- }, +-- ["LMTypewriter-DarkOblique"] = { +-- default = "file:lmmonolt10-boldoblique", +-- }, +-- ["LMTypewriter-LightCondensed"] = { +-- default = "file:lmmonoltcond10-regular", +-- }, +-- ["LMTypewriter-LightCondensedOblique"] = { +-- default = "file:lmmonoltcond10-oblique", +-- }, +-- ["LMTypewriterVarWd-Regular"] = { +-- default = "file:lmmonoproplt10-regular", +-- }, +-- ["LMTypewriterVarWd-Oblique"] = { +-- default = "file:lmmonoproplt10-oblique", +-- }, +-- ["LMTypewriterVarWd-Light"] = { +-- default = "file:lmmonoprop10-regular", +-- }, +-- ["LMTypewriterVarWd-LightOblique"] = { +-- default = "file:lmmonoprop10-oblique", +-- }, +-- ["LMTypewriterVarWd-Dark"] = { +-- default = "file:lmmonoproplt10-bold", +-- }, +-- ["LMTypewriterVarWd-DarkOblique"] = { +-- default = "file:lmmonoproplt10-boldoblique", +-- }, +-- ["LMTypewriter-CapsRegular"] = { +-- default = "file:lmmonocaps10-regular", +-- }, +-- ["LMTypewriter-CapsOblique"] = { +-- default = "file:lmmonocaps10-oblique", +-- }, +-- } } diff --git a/Master/texmf-dist/tex/context/fonts/mkiv/pagella-math.lfg b/Master/texmf-dist/tex/context/fonts/mkiv/pagella-math.lfg index 1de0cfa95ec..6448d9a9587 100644 --- a/Master/texmf-dist/tex/context/fonts/mkiv/pagella-math.lfg +++ b/Master/texmf-dist/tex/context/fonts/mkiv/pagella-math.lfg @@ -14,7 +14,7 @@ return { mathematics = { parameters = { AccentTopShiftUp = 10, - FlattenedAccentTopShiftUp = 10, + FlattenedAccentTopShiftUp = 20, AccentBaseDepth = 80, DelimiterPercent = 85, DelimiterShortfall = 400, @@ -79,6 +79,9 @@ return { tweak = "addmirrors", }, { + tweak = "addcomposites", + }, + { tweak = "fixoldschool", feature = "euleroverpagella", }, @@ -87,7 +90,7 @@ return { list = { { source = { first = 0x02980 }, -- triplebar - filename = "TeXGyrePagellaMath-Companion.otf", + filename = "texgyrepagellamathcompanion-regular.otf", }, }, }, @@ -107,7 +110,7 @@ return { tweak = "checkaccents", }, { - tweak = "wipeweirdones", + tweak = "wipecues", }, { tweak = "parameters", diff --git a/Master/texmf-dist/tex/context/fonts/mkiv/schola-math.lfg b/Master/texmf-dist/tex/context/fonts/mkiv/schola-math.lfg index 5bca0e19b7c..c32685c0282 100644 --- a/Master/texmf-dist/tex/context/fonts/mkiv/schola-math.lfg +++ b/Master/texmf-dist/tex/context/fonts/mkiv/schola-math.lfg @@ -35,6 +35,9 @@ return { { tweak = "addmirrors", }, + { + tweak = "addcomposites", + }, presets.scripttocalligraphic { }, presets.rsfstoscript { }, presets.rsfsuprighttoscript { }, @@ -50,6 +53,9 @@ return { tweak = "checkaccents", }, { + tweak = "wipecues", + }, + { tweak = "kerns", list = { [0x002F] = { topleft = -0.2, bottomright = -0.2 }, diff --git a/Master/texmf-dist/tex/context/fonts/mkiv/stixtwo-math.lfg b/Master/texmf-dist/tex/context/fonts/mkiv/stixtwo-math.lfg index 811daffdbea..18f5d721aa7 100644 --- a/Master/texmf-dist/tex/context/fonts/mkiv/stixtwo-math.lfg +++ b/Master/texmf-dist/tex/context/fonts/mkiv/stixtwo-math.lfg @@ -49,19 +49,19 @@ return { }, }, parameters = { - AccentBaseDepth = 30, - FlattenedAccentTopShiftUp = 0, - RadicalKernAfterDegree = -500, - DelimiterPercent = 85, - DelimiterShortfall = 400, - DelimiterDisplayPercent = 90, - DelimiterDisplayShortfall = 400, - DisplayOperatorMinHeight = 1800, -- 1800 in font - PrimeShiftUp = "1.3*SuperscriptShiftUp", - PrimeShiftUpCramped = "1.3*SuperscriptShiftUp", - RadicalDisplayStyleVerticalGap = "RadicalVerticalGap", --170, 85 --- SuperscriptSnap = 1000, --- SubscriptSnap = 500, + AccentBaseDepth = 30, + FlattenedAccentTopShiftUp = 0, + RadicalKernAfterDegree = -500, + DelimiterPercent = 85, + DelimiterShortfall = 400, + DelimiterDisplayPercent = 90, + DelimiterDisplayShortfall = 400, + DisplayOperatorMinHeight = 1800, -- 1800 in font + PrimeShiftUp = "1.3*SuperscriptShiftUp", + PrimeShiftUpCramped = "1.3*SuperscriptShiftUp", + RadicalDisplayStyleVerticalGap = "RadicalVerticalGap", --170, 85 + -- SuperscriptSnap = 1000, + -- SubscriptSnap = 500, }, tweaks = { aftercopying = { @@ -76,6 +76,9 @@ return { { tweak = "addmirrors", }, + { + tweak = "addcomposites", + }, -- MS: we need to check this, I moved it up { tweak = "replacealphabets", @@ -91,6 +94,16 @@ return { feature = "ss01", }, { + source = "uppercaseboldscript", + target = "uppercaseboldcalligraphic", + unicode = "uppercasescriptbold", + }, + { + source = "uppercaseboldscript", + target = "uppercaseboldscript", + feature = "ss01", + }, + { source = { first = 0xE17D, last = 0xE195 }, target = "uppercasesansgreek", unicode = "uppercasegreeknormal", @@ -112,7 +125,13 @@ return { }, }, }, - -- + { + tweak = "replacealphabets", + filename = "TeXGyrePagellaMath.otf", + list = { + { unicodes = { 0x007C, 0x2223, 0x2016, 0x2980, 0x007C } }, -- single single double triple + } + }, presets.scripttocalligraphic { }, presets.rsfstoscript { }, presets.rsfsuprighttoscript { }, @@ -127,6 +146,9 @@ return { { tweak = "checkaccents", }, + { + tweak = "wipecues", + }, -- Extensibles use .s1 (variant 1), so we cannot wipe all { tweak = "wipevariants", diff --git a/Master/texmf-dist/tex/context/fonts/mkiv/termes-math.lfg b/Master/texmf-dist/tex/context/fonts/mkiv/termes-math.lfg index 5d25fe19740..3b8e66dd332 100644 --- a/Master/texmf-dist/tex/context/fonts/mkiv/termes-math.lfg +++ b/Master/texmf-dist/tex/context/fonts/mkiv/termes-math.lfg @@ -40,11 +40,14 @@ return { tweak = "addmirrors", }, { + tweak = "addcomposites", + }, + { tweak = "replacealphabets", list = { { source = { first = 0x02980 }, -- triplebar - filename = "TeXGyreTermesMath-Companion.otf", + filename = "texgyretermesmathcompanion-regular.otf", }, }, }, @@ -63,6 +66,9 @@ return { tweak = "checkaccents", }, { + tweak = "wipecues", + }, + { tweak = "kerns", list = { [0x002F] = { topleft = -0.2, bottomright = -0.2 }, diff --git a/Master/texmf-dist/tex/context/fonts/mkiv/type-imp-antykwa.mkiv b/Master/texmf-dist/tex/context/fonts/mkiv/type-imp-antykwa.mkiv index 09431ca8426..406f3de0e20 100644 --- a/Master/texmf-dist/tex/context/fonts/mkiv/type-imp-antykwa.mkiv +++ b/Master/texmf-dist/tex/context/fonts/mkiv/type-imp-antykwa.mkiv @@ -17,7 +17,7 @@ \startsetups[\s!math:antykwa] \setmathfenceparameter\c!alternative{1}% - \setupmathradical[\c!leftmargin=.05mq,\c!mindepth=.05mx]% + \setupmathradical[\c!leftmargin=.05mq,\c!mindepth=.05mx]% mathquad mathex \stopsetups % cond => -cont as in iwona diff --git a/Master/texmf-dist/tex/context/fonts/mkiv/type-imp-arsenal.mkiv b/Master/texmf-dist/tex/context/fonts/mkiv/type-imp-arsenal.mkiv new file mode 100644 index 00000000000..f04edfb6a43 --- /dev/null +++ b/Master/texmf-dist/tex/context/fonts/mkiv/type-imp-arsenal.mkiv @@ -0,0 +1,33 @@ +%D \module +%D [ file=type-imp-ebgaramond, +%D version=2013.06.22, +%D title=\CONTEXT\ Typescript Macros, +%D subtitle=EB Garamond, +%D author=Hans Hagen, +%D date=\currentdate, +%D copyright={PRAGMA ADE \& \CONTEXT\ Development Team}] +%C +%C This module is part of the \CONTEXT\ macro||package and is +%C therefore copyrighted by \PRAGMA. See mreadme.pdf for +%C details. + +\loadtypescriptfile[iwona] + +\starttypescriptcollection[arsenal] + + \starttypescript [\s!sans] [arsenal] + \setups[font:fallback:sans] + \definefontsynonym [\s!Sans] [\s!file:arsenal-regular] [\s!features=\s!default] + \definefontsynonym [\s!SansItalic] [\s!file:arsenal-italic] [\s!features=\s!default] + \definefontsynonym [\s!SansBold] [\s!file:arsenal-bold] [\s!features=\s!default] + \definefontsynonym [\s!SansBoldItalic][\s!file:arsenal-bolditalic][\s!features=\s!default] + \stoptypescript + + \starttypescript[arsenal] + \definetypeface [\typescriptone] [\s!ss] [\s!sans] [arsenal] [\s!default] + \definetypeface [\typescriptone] [\s!rm] [\s!sans] [arsenal] [\s!default] + \definetypeface [\typescriptone] [\s!tt] [\s!mono] [dejavu] [\s!default] [\s!rscale=0.9] + \definetypeface [\typescriptone] [\s!mm] [\s!math] [iwona-light] [\s!default] [\s!rscale=1.1] + \stoptypescript + +\stoptypescriptcollection diff --git a/Master/texmf-dist/tex/context/fonts/mkiv/type-imp-cambria.mkiv b/Master/texmf-dist/tex/context/fonts/mkiv/type-imp-cambria.mkiv index 85f6766acdd..6db7e29dd97 100644 --- a/Master/texmf-dist/tex/context/fonts/mkiv/type-imp-cambria.mkiv +++ b/Master/texmf-dist/tex/context/fonts/mkiv/type-imp-cambria.mkiv @@ -17,82 +17,63 @@ \starttypescriptcollection[cambria] - \pushglobalsetups + % \setupmathradical[\c!leftmargin=.05mq,\c!mindepth=.05mx]% + \pushglobalsetups \startsetups[\s!math:cambria] - \setupmathradical[\c!leftmargin=.05mq,\c!mindepth=.05mx]% + \setmathradicalparameter\c!leftmargin{.05mq}% + \setmathradicalparameter\c!mindepth {.05mx}% \stopsetups - \popglobalsetups - % microsoft: cambria.ttc cambriab.ttf cambriai.ttf cambriaz.ttf + % microsoft: cambria.ttc cambria.ttc cambriab.ttf cambriai.ttf cambriaz.ttf % ascender : cambmath.ttf cambria.ttf cambriab.ttf cambriai.ttf cambriaz.ttf \doifunknownfontfeature {cambria-math-bold} {\definefontfeature[cambria-math-bold][boldened]} - \starttypescript [\s!math] [cambria,cambria-x,cambria-y,cambria-nt,cambria-m,cambria-a] + \starttypescript [\s!math] [cambria,cambria-nt] \checkedmapfontsize[\typescripttwo][\s!script] [.73] \checkedmapfontsize[\typescripttwo][\s!scriptscript][.60] \stoptypescript - \starttypescript [\s!math,\s!serif] [cambria,cambria-x,cambria-y,cambria-nt] - % whatever matches - \definefontsynonym [CambriaMath] [\s!name:cambriamath] - \definefontsynonym [CambriaSerif] [\s!name:cambria] + \starttypescript [\s!math,\s!serif] [cambria,cambria-nt] + \doifelsefile{cambria.ttc} { + % microsoft cabria + \definefontsynonym [CambriaMath] [\s!file:cambria.ttc(Cambria Math)] + \definefontsynonym [CambriaSerif] [\s!file:cambria.ttc(Cambria)] + } { + % ascender cambria + \definefontsynonym [CambriaMath] [\s!file:cambmath.ttf] + \definefontsynonym [CambriaSerif] [\s!file:cambria.ttf] + } + \definefontsynonym [CambriaSerifBold] [\s!file:cambriab.ttf] + \definefontsynonym [CambriaSerifItalic] [\s!file:cambriai.ttf] + \definefontsynonym [CambriaSerifBoldItalic] [\s!file:cambriaz.ttf] \stoptypescript - \starttypescript [\s!math,\s!serif] [cambria-m] - % microsoft cabria - \definefontsynonym [CambriaMath] [\s!file:cambria.ttc(Cambria Math)] - \definefontsynonym [CambriaSerif] [\s!file:cambria.ttc(Cambria)] - \stoptypescript - \starttypescript [\s!math,\s!serif] [cambria-a] - % ascender cambria - \definefontsynonym [CambriaMath] [\s!file:cambmath.ttf] - \definefontsynonym [CambriaSerif] [\s!file:cambria.ttf] - \stoptypescript - - % We load a goodies file that will apply a patch to the font. As a demonstration - % we apply the patch when caching and when scaling which is why we also specify - % the goodies file with the name. - \starttypescript [\s!math] [cambria,cambria-m,cambria-a] [\s!name] + \starttypescript [\s!math] [cambria] [\s!name] \loadfontgoodies[cambria-math] \definefontsynonym [\s!MathRoman] [CambriaMath] [\s!features={\s!math\mathsizesuffix,cambria:mathextra,mathextra},\s!goodies=cambria-math] \definefontsynonym [\s!MathRomanBold] [CambriaMath] [\s!features={\s!math\mathsizesuffix,cambria-math-bold,cambria:mathextra,mathextra},\s!goodies=cambria-math] \stoptypescript + \starttypescript [\s!math] [cambria-nt] [\s!name] \loadfontgoodies[cambria-math] \definefontsynonym [\s!MathRoman] [CambriaMath] [\s!features={\s!math\mathsizesuffix,cambria:mathextra,mathextra}] \definefontsynonym [\s!MathRomanBold] [CambriaMath] [\s!features={\s!math\mathsizesuffix,cambria-math-bold,cambria:mathextra,mathextra}] \stoptypescript - \starttypescript [\s!math] [cambria-x] [\s!name] - \loadfontgoodies[cambria-math] - \definefontsynonym [\s!MathRoman] [CambriaMath] [\s!features={\s!math,cambria:mathextra,mathextra},\s!goodies=cambria-math] - \definefontsynonym [\s!MathRomanBold] [CambriaMath] [\s!features={\s!math,cambria-math-bold,cambria:mathextra,mathextra},\s!goodies=cambria-math] - \stoptypescript - \starttypescript [\s!math] [cambria-y] [\s!name] - \loadfontgoodies[cambria-math] - \definefontsynonym [\s!MathRoman] [CambriaMath] [\s!features={\s!math-nostack\mathsizesuffix,cambria:mathextra,mathextra},\s!goodies=cambria-math] - \definefontsynonym [\s!MathRomanBold] [CambriaMath] [\s!features={\s!math-nostack\mathsizesuffix,cambria-math-bold,cambria:mathextra,mathextra},\s!goodies=cambria-math] - \stoptypescript - \starttypescript [\s!serif] [cambria,cambria-m,cambria-a,cambria-nt] [\s!name] + \starttypescript [\s!serif] [cambria,cambria-nt] [\s!name] \setups[\s!font:\s!fallback:\s!serif] - \definefontsynonym [\s!Serif] [CambriaSerif] [\s!features=\s!default,\s!goodies=cambria] - \definefontsynonym [\s!SerifBold] [\s!name:cambriabold] [\s!features=\s!default,\s!goodies=cambria] - \definefontsynonym [\s!SerifItalic] [\s!name:cambriaitalic] [\s!features=\s!default,\s!goodies=cambria] - \definefontsynonym [\s!SerifBoldItalic] [\s!name:cambriabolditalic] [\s!features=\s!default,\s!goodies=cambria] + \definefontsynonym [\s!Serif] [CambriaSerif] [\s!features=\s!default,\s!goodies=cambria] + \definefontsynonym [\s!SerifBold] [CambriaSerifBold] [\s!features=\s!default,\s!goodies=cambria] + \definefontsynonym [\s!SerifItalic] [CambriaSerifItalic] [\s!features=\s!default,\s!goodies=cambria] + \definefontsynonym [\s!SerifBoldItalic] [CambriaSerifBoldItalic] [\s!features=\s!default,\s!goodies=cambria] \stoptypescript - \starttypescript [cambria,cambria-m,cambria-a] - % any - \definetypeface [cambria] [\s!rm] [\s!serif] [\typescriptone] [\s!default] - \definetypeface [cambria] [\s!tt] [\s!mono] [dejavu] [\s!default] - \definetypeface [cambria] [\s!mm] [\s!math] [\typescriptone] [\s!default] - \stoptypescript - \starttypescript [cambria-x,cambria-y,cambria-nt] - % test x + \starttypescript [cambria,cambria-nt] \definetypeface [\typescriptone] [\s!rm] [\s!serif] [cambria] [\s!default] + \definetypeface [\typescriptone] [\s!ss] [\s!sans] [dejavu] [\s!default] \definetypeface [\typescriptone] [\s!tt] [\s!mono] [dejavu] [\s!default] \definetypeface [\typescriptone] [\s!mm] [\s!math] [\typescriptone] [\s!default] \stoptypescript diff --git a/Master/texmf-dist/tex/context/fonts/mkiv/type-imp-concrete.mkiv b/Master/texmf-dist/tex/context/fonts/mkiv/type-imp-concrete.mkiv index c383a27fe6d..d85f342be2c 100644 --- a/Master/texmf-dist/tex/context/fonts/mkiv/type-imp-concrete.mkiv +++ b/Master/texmf-dist/tex/context/fonts/mkiv/type-imp-concrete.mkiv @@ -32,9 +32,9 @@ \starttypescript [\s!sans] [concrete] \definefontsynonym [\s!Sans] [LMTypewriterVarWd-Regular] [\s!features={\s!default,concrete-text-bold}] - \definefontsynonym [\s!SansItalic] [LMTypewriterVarWd-Dark] [\s!features={\s!default,concrete-text-bold}] + \definefontsynonym [\s!SansBold] [LMTypewriterVarWd-Dark] [\s!features={\s!default,concrete-text-bold}] + \definefontsynonym [\s!SansItalic] [LMTypewriterVarWd-Oblique] [\s!features={\s!default,concrete-text-bold}] \definefontsynonym [\s!SansSlanted] [LMTypewriterVarWd-Oblique] [\s!features={\s!default,concrete-text-bold}] - \definefontsynonym [\s!SansBold] [LMTypewriterVarWd-Oblique] [\s!features={\s!default,concrete-text-bold}] \definefontsynonym [\s!SansBoldItalic] [LMTypewriterVarWd-DarkOblique] [\s!features={\s!default,concrete-text-bold}] \definefontsynonym [\s!SansBoldSlanted] [LMTypewriterVarWd-DarkOblique] [\s!features={\s!default,concrete-text-bold}] \stoptypescript diff --git a/Master/texmf-dist/tex/context/fonts/mkiv/type-imp-erewhon.mkiv b/Master/texmf-dist/tex/context/fonts/mkiv/type-imp-erewhon.mkiv index 94921609aa7..63cad370aed 100644 --- a/Master/texmf-dist/tex/context/fonts/mkiv/type-imp-erewhon.mkiv +++ b/Master/texmf-dist/tex/context/fonts/mkiv/type-imp-erewhon.mkiv @@ -17,9 +17,12 @@ \starttypescriptcollection[erewhon] + % \setupmathradical[\c!leftmargin=.1mq,\c!mindepth=0.1mx]% + \pushglobalsetups \startsetups[\s!math:erewhon] - \setupmathradical[\c!leftmargin=.1mq,mindepth=0.1mx]% + \setmathradicalparameter\c!leftmargin{.1mq}% + \setmathradicalparameter\c!mindepth {.1mx}% \stopsetups \popglobalsetups diff --git a/Master/texmf-dist/tex/context/fonts/mkiv/type-imp-husayni.mkiv b/Master/texmf-dist/tex/context/fonts/mkiv/type-imp-husayni.mkiv index 76cbf77db65..a551c7f8979 100644 --- a/Master/texmf-dist/tex/context/fonts/mkiv/type-imp-husayni.mkiv +++ b/Master/texmf-dist/tex/context/fonts/mkiv/type-imp-husayni.mkiv @@ -192,7 +192,8 @@ \starttypescript [husayni-default] \definetypeface [husayni-default] [rm] [naskh] [husayni] [default] [fallbacks=husayni-latin] \definetypeface [husayni-default] [tt] [mono] [modern] [default] [fallbacks=husayni-latin] - \definetypeface [husayni-default] [mm] [math] [xitsbidi] [default] + % \definetypeface [husayni-default] [mm] [math] [xitsbidi] [default] + \definetypeface [husayni-default] [mm] [math] [stix] [default] \stoptypescript \stoptypescriptcollection diff --git a/Master/texmf-dist/tex/context/fonts/mkiv/type-imp-koeielettersot.mkiv b/Master/texmf-dist/tex/context/fonts/mkiv/type-imp-koeielettersot.mkiv new file mode 100644 index 00000000000..605b3b3185d --- /dev/null +++ b/Master/texmf-dist/tex/context/fonts/mkiv/type-imp-koeielettersot.mkiv @@ -0,0 +1,185 @@ +%D \module +%D [ file=type-cowotf, +%D version=2016.09.16, +%D title=\CONTEXT\ Typescript Macros, +%D subtitle=Cow Fonts (otf version), +%D author={Taco Hoekwater \& Hans Hagen}, +%D date=\currentdate, +%D copyright={PRAGMA ADE \& \CONTEXT\ Development Team}] +%C +%C This module is part of the \CONTEXT\ macro||package and is +%C therefore copyrighted by \PRAGMA. See mreadme.pdf for +%C details. + +%D The cow fonts are a project of Duane Bibby, Hans Hagen and Taco +%D Hoekwater. + +\unprotect + +\definefontfeature + [sheepdigits] + [mode=node, + script=latn, + ss01=yes] + +\definefontfeature + [mathsheepdigits] + [sheepdigits] + [mode=base] + +\definefontfeature + [cowslogos] + [mode=node, + script=latn, + ss02=yes, + dlig=yes] + +\definefontfeature + [cowsligatures] + [mode=node, + script=latn, + dlig=yes] + +\definefontfeature + [cowscolors] + [mode=node, + colr=yes, + ss02=yes, + dlig=yes] + +\definefontfeature + [cowsdefault] + [default] + [mode=node, + wipemath=no, + compose=yes] + +\definefontfeature + [sheepdefault] + [cowsdefault,sheepdigits] + +\definefontfeature + [cowscolored] + [cowsdefault,cowscolors] + +\definefontfeature + [sheepcolored] + [sheepdefault,cowscolors] + +\definefontfeature[sheepdefaultbold][sheepdefault][boldened] +\definefontfeature[cowsdefaultbold] [cowsdefault] [boldened] + +\starttypescriptcollection[koeielettersot] + + \loadfontgoodies[koeielettersot] + + \starttypescript [\s!all] [cowsotf] + \definefontsynonym [Cows] [koeielettersot][\s!features=cowsdefault] + \definefontsynonym [CowsLogo] [koeielettersot][\s!features=cowslogos] + \definefontsynonym [CowsMathRoman][koeielettersot][\s!features=mathextra,\s!goodies=koeielettersot] + \stoptypescript + + \starttypescript [\s!all] [koeielettersotf,sheepotf] + \definefontsynonym [Sheep] [koeielettersot][\s!features=sheepdefault] + \definefontsynonym [SheepBold] [koeielettersot][\s!features=sheepdefaultbold] + \definefontsynonym [SheepLogo] [koeielettersot][\s!features=cowslogos] + \definefontsynonym [SheepMathRoman][koeielettersot][\s!features={mathsheepdigits,mathextra},\s!goodies=koeielettersot] + \stoptypescript + +% \definefontsynonym[\s!MathRoman][file:texgyredejavu-math][\s!features={\s!math\mathsizesuffix,mathextra},\s!goodies=dejavu-math] + + \starttypescript [\s!all] [coloredcowsotf] + \definefontsynonym [Cows] [koeielettersot][\s!features=cowscolored] + \definefontsynonym [CowsLogo] [koeielettersot][\s!features=cowslogos] + \definefontsynonym [CowsMathRoman][koeielettersot][\s!features=mathextra,\s!goodies=koeielettersot] + \stoptypescript + + \starttypescript [\s!all] [coloredsheepotf] + \definefontsynonym [Sheep] [koeielettersot][\s!features=sheepcolored] + \definefontsynonym [SheepLogo] [koeielettersot][\s!features=cowslogos] + \definefontsynonym [SheepMathRoman][koeielettersot][\s!features={mathsheepdigits,mathextra},\s!goodies=koeielettersot] + \stoptypescript + + \starttypescript [\s!serif] [cowsotf,coloredcowsotf] + \setups[\s!font:\s!fallback:\s!serif] + \definefontsynonym [\s!Serif] [Cows] + \definefontsynonym [\s!Serif Logo][CowsLogo] + \stoptypescript + + \starttypescript [\s!serif] [koeielettersotf,sheepotf,coloredsheepotf] + \setups[\s!font:\s!fallback:\s!serif] + \definefontsynonym [\s!Serif] [Sheep] + \definefontsynonym [\s!SerifBold] [SheepBold] + \definefontsynonym [\s!Serif Logo][SheepLogo] + \stoptypescript + + \starttypescript [\s!math] [cowsotf,coloredcowsotf] + \definefontsynonym [\s!MathRoman][CowsMathRoman] + \enablemathrules % uses \fontclass, for now this way + \stoptypescript + + \starttypescript [\s!math] [koeielettersotf,sheepotf,coloredsheepotf] + \definefontsynonym [\s!MathRoman][SheepMathRoman] + \enablemathrules % uses \fontclass, for now this way + \stoptypescript + + \starttypescript [koeieletters,cows,sheep,coloredcows,coloredsheep] + \definetypeface [\typescriptone][\s!rm][\s!serif][\typescriptone otf][\s!default] + \definetypeface [\typescriptone][\s!ss][\s!serif][\typescriptone otf][\s!default] + \definetypeface [\typescriptone][\s!mm][\s!math] [\typescriptone otf][\s!default] + \definetypeface [\typescriptone][\s!tt][\s!mono] [modern] [\s!default][\s!rscale=0.85] + \stoptypescript + +\stoptypescriptcollection + +\protect + +\continueifinputfile{type-imp-koeielettersot.mkiv} + +\starttext + +\setupbodyfont[cows] + +% \input tufte + +% \stoptext + +% \starttext + +\loadtypescriptfile[cowotf] + +\definecolor[cowred] [r=.50] +\definecolor[cowgreen] [g=.50] +\definecolor[cowblue] [b=.50] +\definecolor[cowyellow][y=.25] + +\definefontcolorpalette[cows][cowgreen,cowyellow,cowblue,cowred] + +\startluacode + fonts.handlers.otf.registerpalette("cows", { + { g = .5 }, + { r = .75, g = .75 }, + { b = .5 }, + { r = .5 }, + }) +\stopluacode + +\adaptfontfeature[cowscolored] [colr=cows] + +\setupbodyfont[coloredcows,12pt] + +\input zapf + +\definefontsynonym + [CowsColored] + [koeielettersot] + +\showotfcomposition + {koeielettersot*default,cowscolors} + {1} + {context} + +\scale[width=\textwidth]{\getnamedglyphdirect{CowsColored*default,cowscolors}{contextlogo}} +\scale[width=\textwidth]{\definedfont[CowsColored*default,cowscolors]context} + +\stoptext diff --git a/Master/texmf-dist/tex/context/fonts/mkiv/type-imp-kpfonts.mkiv b/Master/texmf-dist/tex/context/fonts/mkiv/type-imp-kpfonts.mkiv index bc7de3ae75a..d33c14cc0dc 100644 --- a/Master/texmf-dist/tex/context/fonts/mkiv/type-imp-kpfonts.mkiv +++ b/Master/texmf-dist/tex/context/fonts/mkiv/type-imp-kpfonts.mkiv @@ -15,84 +15,57 @@ \starttypescriptcollection[kpfonts-opentype] - \doifunknownfontfeature {kp-sans-bold} {\definefontfeature[kp-sans-bold][boldened-15]} - - \starttypescript [\s!math] [kpfonts,kpfonts-nt,kpfonts-bold,kpfonts-light,kpfonts-sans] - \checkedmapfontsize[\typescripttwo][\s!script] [.70] - \checkedmapfontsize[\typescripttwo][\s!scriptscript][.55] + \starttypescript [\s!math] [kpfonts-light,kpfonts,kpfonts-sans,kpfonts-nt] + \checkedmapfontsize [\typescripttwo] [\s!script] [.70] + \checkedmapfontsize [\typescripttwo] [\s!scriptscript] [.55] \stoptypescript - \starttypescript [kpfonts,kpfonts-light,kpfonts-bold,kpfonts-sans,kpfonts-nt] - \loadfontgoodies[kpfonts-math] - \definetypeface [\typescriptone] [\s!rm] [\s!serif] [\typescriptone] [\s!default] [\s!features=\s!default] - \definetypeface [\typescriptone] [\s!ss] [\s!sans] [\typescriptone] [\s!default] [\s!features=\s!default] - \definetypeface [\typescriptone] [\s!tt] [\s!mono] [\typescriptone] [\s!default] [\s!features=\s!none] - \definetypeface [\typescriptone] [\s!mm] [\s!math] [\typescriptone] [\s!default] - % for the moment here: - % \setupmathrendering[\typescriptone][\s!it=\s!italic] - \quittypescriptscanning + \starttypescript [\s!math] [kpfonts-light] + \definefontsynonym [\s!MathRoman] [\s!file:KpMath-Light.otf] [\s!features={\s!math\mathsizesuffix,kpfonts:mathextra,mathextra},\s!goodies=kpfonts-math] + \definefontsynonym [\s!MathRomanBold] [\s!file:KpMath-Semibold.otf] [\s!features={\s!math\mathsizesuffix,kpfonts:mathextra,mathextra},\s!goodies=kpfonts-math] \stoptypescript - \starttypescript [\s!serif] [kpfonts,kpfonts-sans,kpfonts-nt] - \definefontsynonym [\s!Serif] [\s!file:KpRoman-Regular.otf][\s!goodies=kpfonts-text] - \definefontsynonym [\s!SerifBold] [\s!file:KpRoman-SemiBold.otf][\s!goodies=kpfonts-text] - \definefontsynonym [\s!SerifItalic] [\s!file:KpRoman-Italic.otf][\s!goodies=kpfonts-text] - \definefontsynonym [\s!SerifBoldItalic] [\s!file:KpRoman-SemiboldItalic.otf][\s!goodies=kpfonts-text] - \definefontsynonym [\s!SerifSlanted] [\s!SerifItalic] - \definefontsynonym [\s!SerifBoldSlanted] [\s!SerifBoldItalic] + \starttypescript [\s!math] [kpfonts] + \definefontsynonym [\s!MathRoman] [\s!file:KpMath-Regular.otf] [\s!features={\s!math\mathsizesuffix,kpfonts:mathextra,mathextra},\s!goodies=kpfonts-math] + \definefontsynonym [\s!MathRomanBold] [\s!file:KpMath-Bold.otf] [\s!features={\s!math\mathsizesuffix,kpfonts:mathextra,mathextra},\s!goodies=kpfonts-math] \stoptypescript - \starttypescript [\s!math] [kpfonts] - \definefontsynonym [\s!MathRoman] [\s!file:KpMath-Regular.otf] [\s!features={\s!math\mathsizesuffix,kpfonts:mathextra,mathextra},\s!goodies=kpfonts-math] - \definefontsynonym [\s!MathRomanBold] [\s!file:KpMath-Semibold.otf] [\s!features={\s!math\mathsizesuffix,kpfonts:mathextra,mathextra},\s!goodies=kpfonts-math] + \starttypescript [\s!math] [kpfonts-sans] + \definefontsynonym [\s!MathRoman] [\s!file:KpMath-Sans.otf] [\s!features={\s!math\mathsizesuffix,kpfonts:mathextra,mathextra},\s!goodies=kpfonts-math] + \definefontsynonym [\s!MathRomanBold] [\s!file:KpMath-SansBold.otf] [\s!features={\s!math\mathsizesuffix,kpfonts:mathextra,mathextra},\s!goodies=kpfonts-math] \stoptypescript \starttypescript [\s!math] [kpfonts-nt] - \definefontsynonym [\s!MathRoman] [\s!file:KpMath-Regular.otf] [\s!features={\s!math\mathsizesuffix,kpfonts:mathextra,mathextra}] - \definefontsynonym [\s!MathRomanBold] [\s!file:KpMath-Semibold.otf] [\s!features={\s!math\mathsizesuffix,kpfonts:mathextra,mathextra}] + \definefontsynonym [\s!MathRoman] [\s!file:KpMath-Regular.otf] [\s!features={\s!math\mathsizesuffix,kpfonts:mathextra,mathextra}] + \definefontsynonym [\s!MathRomanBold] [\s!file:KpMath-Bold.otf] [\s!features={\s!math\mathsizesuffix,kpfonts:mathextra,mathextra}] \stoptypescript - \starttypescript [\s!serif] [kpfonts-light] - \definefontsynonym [\s!Serif] [\s!file:KpRoman-Light.otf] - \definefontsynonym [\s!SerifBold] [\s!file:KpRoman-Regular.otf] - \definefontsynonym [\s!SerifItalic] [\s!file:KpRoman-LightItalic.otf] - \definefontsynonym [\s!SerifBoldItalic] [\s!file:KpRoman-Italic.otf] - \definefontsynonym [\s!SerifSlanted] [\s!SerifItalic] - \definefontsynonym [\s!SerifBoldSlanted] [\s!SerifBoldItalic] - \stoptypescript - \starttypescript [\s!math] [kpfonts-light] - \definefontsynonym [\s!MathRoman] [\s!file:KpMath-Light.otf] [\s!features={\s!math\mathsizesuffix,kpfonts:mathextra,mathextra},\s!goodies=kpfonts-math] - \definefontsynonym [\s!MathRomanBold] [\s!file:KpMath-Regular.otf] [\s!features={\s!math\mathsizesuffix,kpfonts:mathextra,mathextra},\s!goodies=kpfonts-math] - \stoptypescript - - \starttypescript [\s!serif] [kpfonts-bold] + \starttypescript [\s!serif] [kpfonts-light] \setups[\s!font:\s!fallback:\s!serif] - \definefontsynonym [\s!Serif] [\s!file:KpRoman-SemiBold.otf] - \definefontsynonym [\s!SerifBold] [\s!file:KpRoman-Bold.otf] - \definefontsynonym [\s!SerifItalic] [\s!file:KpRoman-SemiboldItalic.otf] - \definefontsynonym [\s!SerifBoldItalic] [\s!file:KpRoman-BoldItalic.otf] + \definefontsynonym [\s!Serif] [\s!file:KpRoman-Light.otf] [\s!goodies=kpfonts-text] + \definefontsynonym [\s!SerifBold] [\s!file:KpRoman-Semibold.otf] [\s!goodies=kpfonts-text] + \definefontsynonym [\s!SerifItalic] [\s!file:KpRoman-LightItalic.otf] [\s!goodies=kpfonts-text] + \definefontsynonym [\s!SerifBoldItalic] [\s!file:KpRoman-SemiboldItalic.otf] [\s!goodies=kpfonts-text] \stoptypescript - \starttypescript [\s!math] [kpfonts-bold] - \definefontsynonym [\s!MathRoman] [\s!file:KpMath-SemiBold.otf] [\s!features={\s!math\mathsizesuffix,kpfonts:mathextra,mathextra},\s!goodies=kpfonts-math] - \definefontsynonym [\s!MathRomanBold] [\s!file:KpMath-Bold.otf] [\s!features={\s!math\mathsizesuffix,kpfonts:mathextra,mathextra},\s!goodies=kpfonts-math] + \starttypescript [\s!serif] [kpfonts,kpfonts-sans,kpfonts-nt] + \setups[\s!font:\s!fallback:\s!serif] + \definefontsynonym [\s!Serif] [\s!file:KpRoman-Regular.otf] [\s!goodies=kpfonts-text] + \definefontsynonym [\s!SerifBold] [\s!file:KpRoman-Bold.otf] [\s!goodies=kpfonts-text] + \definefontsynonym [\s!SerifItalic] [\s!file:KpRoman-Italic.otf] [\s!goodies=kpfonts-text] + \definefontsynonym [\s!SerifBoldItalic] [\s!file:KpRoman-BoldItalic.otf] [\s!goodies=kpfonts-text] \stoptypescript - \starttypescript [\s!sans] [kpfonts,kpfonts-sans,kpfonts-light,kpfonts-bold,kpfonts-nt] + \starttypescript [\s!sans] [kpfonts-light,kpfonts,kpfonts-sans,kpfonts-nt] \setups[\s!font:\s!fallback:\s!sans] - \definefontsynonym [\s!Sans] [\s!file:KpSans-Regular.otf] - \definefontsynonym [\s!SansBold] [\s!file:KpSans-Bold.otf] - \definefontsynonym [\s!SansItalic] [\s!file:KpSans-Italic.otf] - \definefontsynonym [\s!SansBoldItalic] [\s!file:KpSans-BoldItalic.otf] + \definefontsynonym [\s!Sans] [\s!file:KpSans-Regular.otf] [\s!goodies=kpfonts-text] + \definefontsynonym [\s!SansBold] [\s!file:KpSans-Bold.otf] [\s!goodies=kpfonts-text] + \definefontsynonym [\s!SansItalic] [\s!file:KpSans-Italic.otf] [\s!goodies=kpfonts-text] + \definefontsynonym [\s!SansBoldItalic] [\s!file:KpSans-BoldItalic.otf] [\s!goodies=kpfonts-text] \stoptypescript - \starttypescript [\s!math] [kpfonts-sans] - \definefontsynonym [\s!MathRoman] [\s!file:KpMath-Sans.otf] [\s!features={\s!math\mathsizesuffix,kpfonts:mathextra,mathextra},\s!goodies=kpfonts-math] - \definefontsynonym [\s!MathRomanBold] [\s!file:KpMath-Sans.otf] [\s!features={\s!math\mathsizesuffix,kp-sans-bold,kpfonts:mathextra,mathextra},\s!goodies=kpfonts-math] - \stoptypescript - - \starttypescript [\s!mono] [kpfonts,kpfonts-sans,kpfonts-light,kpfonts-bold,kpfonts-nt] + \starttypescript [\s!mono] [kpfonts-light,kpfonts,kpfonts-sans,kpfonts-nt] \setups[\s!font:\s!fallback:\s!mono] \definefontsynonym [\s!Mono] [\s!file:KpMono-Regular.otf] \definefontsynonym [\s!MonoBold] [\s!file:KpMono-Bold.otf] @@ -100,6 +73,17 @@ \definefontsynonym [\s!MonoBoldItalic] [\s!file:KpMono-BoldItalic.otf] \stoptypescript + \starttypescript [kpfonts-light,kpfonts,kpfonts-sans,kpfonts-nt] + \loadfontgoodies[kpfonts-math] + \definetypeface [\typescriptone] [\s!rm] [\s!serif] [\typescriptone] [\s!default] [\s!features=\s!default] + \definetypeface [\typescriptone] [\s!ss] [\s!sans] [\typescriptone] [\s!default] [\s!features=\s!default] + \definetypeface [\typescriptone] [\s!tt] [\s!mono] [\typescriptone] [\s!default] [\s!features=\s!none] + \definetypeface [\typescriptone] [\s!mm] [\s!math] [\typescriptone] [\s!default] + % for the moment here: + % \setupmathrendering[\typescriptone][\s!it=\s!italic] + \quittypescriptscanning + \stoptypescript + \stoptypescriptcollection \endinput diff --git a/Master/texmf-dist/tex/context/fonts/mkiv/type-imp-lato.mkiv b/Master/texmf-dist/tex/context/fonts/mkiv/type-imp-lato.mkiv index 359c2285f15..ee3808ce38b 100644 --- a/Master/texmf-dist/tex/context/fonts/mkiv/type-imp-lato.mkiv +++ b/Master/texmf-dist/tex/context/fonts/mkiv/type-imp-lato.mkiv @@ -30,12 +30,11 @@ % Lato-Thin.ttf % Lato-ThinItalic.ttf -\loadtypescriptfile[dejavu] -\loadtypescriptfile[xits] - \starttypescriptcollection[lato] - \starttypescript [\s!sans] [lato] [\s!name] + \doifunknownfontfeature {lato-math-bold} {\definefontfeature[lato-math-bold][boldened-10]} + + \starttypescript [\s!sans] [lato,lato-nt] [\s!name] \setups[\s!font:\s!fallback:\s!sans] \definefontsynonym [\s!Sans] [\s!file:lato-regular] [\s!features=\s!default] \definefontsynonym [\s!SansBold] [\s!file:lato-bold] [\s!features=\s!default] @@ -99,11 +98,27 @@ \definefontsynonym [\s!SansBoldItalic] [\s!file:lato-semibolditalic] [\s!features=\s!default] \stoptypescript - \starttypescript[lato,lato-light,lato-dark,lato-black,lato-hairline,lato-thin,lato-medium,lato-semibold] + \starttypescript [\s!math] [lato,lato-nt] + \checkedmapfontsize[\typescripttwo][\s!script] [.70] + \checkedmapfontsize[\typescripttwo][\s!scriptscript][.55] + \stoptypescript + + \starttypescript [\s!math] [lato] [\s!name] + \definefontsynonym [\s!MathRoman] [\s!file:LeteSansMath.otf][\s!features={\s!math\mathsizesuffix,lato:mathextra,mathextra},\s!goodies=lato-math] + \definefontsynonym [\s!MathRomanBold][\s!file:LeteSansMath.otf][\s!features={\s!math\mathsizesuffix,lato-math-bold,lato:mathextra,mathextra},\s!goodies=lato-math] + \stoptypescript + + \starttypescript [\s!math] [lato-nt] [\s!name] + \definefontsynonym [\s!MathRoman] [\s!file:LeteSansMath.otf][\s!features={\s!math\mathsizesuffix,lato:mathextra,mathextra}] + \definefontsynonym [\s!MathRomanBold][\s!file:LeteSansMath.otf][\s!features={\s!math\mathsizesuffix,lato-math-bold,lato:mathextra,mathextra}] + \stoptypescript + + + \starttypescript[lato,lato-nt,lato-light,lato-dark,lato-black,lato-hairline,lato-thin,lato-medium,lato-semibold] \definetypeface [\typescriptone] [\s!ss] [\s!sans] [\typescriptone] [\s!default] \definetypeface [\typescriptone] [\s!rm] [\s!serif] [dejavu] [\s!default] \definetypeface [\typescriptone] [\s!tt] [\s!mono] [dejavu] [\s!default] - \definetypeface [\typescriptone] [\s!mm] [\s!math] [xits] [\s!default] [\s!rscale=1.2] + \definetypeface [\typescriptone] [\s!mm] [\s!math] [\typescriptone] [\s!default] %[\s!rscale=1.2] \stoptypescript \stoptypescriptcollection diff --git a/Master/texmf-dist/tex/context/fonts/mkiv/type-imp-libertinus.mkiv b/Master/texmf-dist/tex/context/fonts/mkiv/type-imp-libertinus.mkiv index 36d2666f724..560a9152d32 100644 --- a/Master/texmf-dist/tex/context/fonts/mkiv/type-imp-libertinus.mkiv +++ b/Master/texmf-dist/tex/context/fonts/mkiv/type-imp-libertinus.mkiv @@ -24,10 +24,10 @@ \doifunknownfontfeature {libertinus-math-bold} {\definefontfeature[libertinus-math-bold][boldened]} \starttypescript [\s!serif] [libertinus] - \definefontsynonym [LibertinusSerif-Regular] [\s!file:libertinusserif-regular][\s!goodies=libertinus-text] - \definefontsynonym [LibertinusSerif-Italic] [\s!file:libertinusserif-italic][\s!goodies=libertinus-text] + \definefontsynonym [LibertinusSerif-Regular] [\s!file:libertinusserif-regular] [\s!goodies=libertinus-text] + \definefontsynonym [LibertinusSerif-Italic] [\s!file:libertinusserif-italic] [\s!goodies=libertinus-text] \definefontsynonym [LibertinusSerif-Slanted] [\s!file:libertinusserif-italic] - \definefontsynonym [LibertinusSerif-Bold] [\s!file:libertinusserif-bold][\s!goodies=libertinus-text] + \definefontsynonym [LibertinusSerif-Bold] [\s!file:libertinusserif-bold] [\s!goodies=libertinus-text] \definefontsynonym [LibertinusSerif-BoldItalic] [\s!file:libertinusserif-bolditalic][\s!goodies=libertinus-text] \definefontsynonym [LibertinusSerif-BoldSlanted] [\s!file:libertinusserif-bolditalic] \stoptypescript diff --git a/Master/texmf-dist/tex/context/fonts/mkiv/type-imp-lucida-typeone.mkiv b/Master/texmf-dist/tex/context/fonts/mkiv/type-imp-lucida-typeone.mkiv new file mode 100644 index 00000000000..59d167a1bbf --- /dev/null +++ b/Master/texmf-dist/tex/context/fonts/mkiv/type-imp-lucida-typeone.mkiv @@ -0,0 +1,136 @@ +%D \module +%D [ file=type-imp-lucida-typeone, +%D version=2010.06.21, +%D title=\CONTEXT\ Typescript Macros, +%D subtitle=Lucida, +%D author=Mojca Miklavec \& Hans Hagen, +%D date=\currentdate, +%D copyright={PRAGMA ADE \& \CONTEXT\ Development Team}] +%C +%C This module is part of the \CONTEXT\ macro||package and is +%C therefore copyrighted by \PRAGMA. See mreadme.pdf for +%C details. + +\writestatus{fonts}{Lucida Type 1 support can be broken due to wrong files!} + +\starttypescriptcollection[lucida-typeone] + + \starttypescript [\s!serif] [lucida] + \definefontsynonym [LucidaBright] [\s!name:LucidaBright] + \definefontsynonym [LucidaBright-Demi] [\s!name:LucidaBright-Demi] + \definefontsynonym [LucidaBright-Italic] [\s!name:LucidaBright-Italic] + \definefontsynonym [LucidaBright-DemiItalic] [\s!name:LucidaBright-DemiItalic] + \definefontsynonym [LucidaBright-Oblique] [\s!name:LucidaBright-Oblique] + \definefontsynonym [LucidaBrightSmallcaps] [\s!name:LucidaBrightSmallcaps] + \definefontsynonym [LucidaBrightSmallcaps-Demi] [\s!name:LucidaBrightSmallcaps-Demi] + \stoptypescript + + \starttypescript [\s!sans] [lucida] + \definefontsynonym [LucidaSans] [\s!name:LucidaSans] + \definefontsynonym [LucidaSans-Demi] [\s!name:LucidaSans-Demi] + \definefontsynonym [LucidaSans-Bold] [\s!name:LucidaSans-Bold] + \definefontsynonym [LucidaSans-Italic] [\s!name:LucidaSans-Italic] + \definefontsynonym [LucidaSans-DemiItalic] [\s!name:LucidaSans-DemiItalic] + \definefontsynonym [LucidaSans-BoldItalic] [\s!name:LucidaSans-BoldItalic] + \stoptypescript + + \starttypescript [\s!mono] [lucida] + \definefontsynonym [LucidaTypewriter] [\s!name:LucidaTypewriter] + \definefontsynonym [LucidaTypewriterBold] [\s!name:LucidaTypewriterBold] + \definefontsynonym [LucidaTypewriterOblique] [\s!name:LucidaTypewriterOblique] + \definefontsynonym [LucidaTypewriterBoldOblique] [\s!name:LucidaTypewriterBoldOblique] + \stoptypescript + + \starttypescript [\s!mono] [lucida] + \definefontsynonym [LucidaSans-Typewriter] [\s!name:LucidaSans-Typewriter] + \definefontsynonym [LucidaSans-TypewriterBold] [\s!name:LucidaSans-TypewriterBold] + \definefontsynonym [LucidaSans-TypewriterOblique] [\s!name:LucidaSans-TypewriterOblique] + \definefontsynonym [LucidaSans-TypewriterBoldOblique] [\s!name:LucidaSans-TypewriterBoldOblique] + \stoptypescript + + \starttypescript [calligraphy] [lucida] + \definefontsynonym [LucidaCalligraphy-Italic] [\s!name:LucidaCalligraphy-Italic] + \stoptypescript + + \starttypescript [casual] [lucida] + \definefontsynonym [LucidaCasual] [\s!name:LucidaCasual] + \definefontsynonym [LucidaCasual-Italic] [\s!name:LucidaCasual-Italic] + \stoptypescript + + \starttypescript [handwriting] [lucida] + \definefontsynonym [LucidaHandwriting-Italic] [\s!name:LucidaHandwriting-Italic] + \stoptypescript + + \starttypescript [fax] [lucida] + \definefontsynonym [LucidaFax] [\s!name:LucidaFax] + \definefontsynonym [LucidaFax-Demi] [\s!name:LucidaFax-Demi] + \definefontsynonym [LucidaFax-Italic] [\s!name:LucidaFax-Italic] + \definefontsynonym [LucidaFax-DemiItalic] [\s!name:LucidaFax-DemiItalic] + \stoptypescript + + \starttypescript [blackletter] [lucida] + \definefontsynonym [LucidaBlackletter] [\s!name:LucidaBlackletter] + \stoptypescript + + \starttypescript [\s!math] [lucida] + \loadfontgoodies[lucida-typeone-math] + \definefontsynonym[\s!MathRoman][lucidamath@lucida-math] + \stoptypescript + + \starttypescript [\s!serif] [lucida] [\s!name] + \definefontsynonym [\s!Serif] [LucidaBright] + \definefontsynonym [\s!SerifBold] [LucidaBright-Demi] + \definefontsynonym [\s!SerifItalic] [LucidaBright-Italic] + \definefontsynonym [\s!SerifBoldItalic] [LucidaBright-DemiItalic] + \definefontsynonym [\s!SerifSlanted] [LucidaBright-Oblique] + \definefontsynonym [\s!SerifBoldSlanted] [LucidaBright-DemiItalic] + \definefontsynonym [SerifCaps] [LucidaBrightSmallcaps] + \definefontsynonym [SerifBoldCaps] [LucidaBrightSmallcaps-Demi] + \stoptypescript + + % Lucida Bright Sans + + \starttypescript [\s!sans] [lucida] [\s!name] + \definefontsynonym [\s!Sans] [LucidaSans] + \definefontsynonym [\s!SansBold] [LucidaSans-Demi] + \definefontsynonym [\s!SansItalic] [LucidaSans-Italic] + \definefontsynonym [\s!SansBoldItalic] [LucidaSans-DemiItalic] + \definefontsynonym [\s!SansSlanted] [LucidaSans-Italic] + \definefontsynonym [\s!SansBoldSlanted] [LucidaSans-DemiItalic] + \definefontsynonym [SansCaps] [LucidaSans] + \stoptypescript + + % Lucida Bright Sans Typewriter + + \starttypescript [\s!mono] [lucida] [\s!name] + \definefontsynonym [\s!Mono] [LucidaSans-Typewriter] + \definefontsynonym [\s!MonoBold] [LucidaSans-TypewriterBold] + \definefontsynonym [\s!MonoItalic] [LucidaSans-TypewriterOblique] + \definefontsynonym [\s!MonoBoldItalic] [LucidaSans-TypewriterBoldOblique] + \definefontsynonym [\s!MonoSlanted] [LucidaSans-TypewriterOblique] + \definefontsynonym [\s!MonoBoldSlanted] [LucidaSans-TypewriterBoldOblique] + \definefontsynonym [MonoCaps] [LucidaSans-Typewriter] + \stoptypescript + + % Lucida Calligraphy + + \starttypescript [calligraphy] [lucida] [\s!name] + \definefontsynonym [Calligraphy] [LucidaCalligraphy-Italic] + \stoptypescript + + % Lucida Handwriting + + \starttypescript [handwriting] [lucida] [\s!name] + \definefontsynonym [Handwriting] [LucidaHandwriting-Italic] + \stoptypescript + + \starttypescript [lucida] + \definetypeface [lucida] [\s!rm] [\s!serif] [lucida] [\s!default] [\s!features=\s!default] + \definetypeface [lucida] [\s!ss] [\s!sans] [lucida] [\s!default] [\s!features=\s!default] + \definetypeface [lucida] [\s!tt] [\s!mono] [lucida] [\s!default] [\s!features=\s!none] + \definetypeface [lucida] [\s!hw] [\s!handwriting] [lucida] [\s!default] [\s!features=\s!default] + \definetypeface [lucida] [\s!cg] [\s!calligraphy] [lucida] [\s!default] [\s!features=\s!default] + \definetypeface [lucida] [\s!mm] [\s!math] [lucida] [\s!default] + \stoptypescript + +\stoptypescriptcollection diff --git a/Master/texmf-dist/tex/context/fonts/mkiv/type-imp-lucida.mkiv b/Master/texmf-dist/tex/context/fonts/mkiv/type-imp-lucida.mkiv new file mode 100644 index 00000000000..860b3c604e3 --- /dev/null +++ b/Master/texmf-dist/tex/context/fonts/mkiv/type-imp-lucida.mkiv @@ -0,0 +1,108 @@ +%D \module +%D [ file=type-lucida-opentype, +%D version=2011.05.18, +%D title=\CONTEXT\ Typescript Macros, +%D subtitle=Lucida Nova Opentype, +%D author=Hans Hagen, +%D date=\currentdate, +%D copyright={PRAGMA ADE \& \CONTEXT\ Development Team}] +%C +%C This module is part of the \CONTEXT\ macro||package and is +%C therefore copyrighted by \PRAGMA. See mreadme.pdf for +%C details. + +% NOTA BENE: class features and goodies get expanded! + +\definefontfeature[mathlucida][copymathscripts=yes] % see lfg file + +% \definefontfeature[mathlucida][mathlucida][ss04=yes] % now we swap + +% \definefontfeature[mathlucida][ss03=yes] + +\starttypescriptcollection[lucida-opentype] + + % \setupmathradical[\c!leftmargin=.05mq]% mathquad + + \pushglobalsetups + \startsetups[\s!math:lucida] + \setmathradicalparameter\c!leftmargin{.05mq}% mathquad + \stopsetups + \popglobalsetups + + \doifunknownfontfeature {lucida-math-bold} {\definefontfeature[lucida-math-bold][boldened][boldmath=yes]} + + \starttypescript [lucida,lucidaot,lucidadk,lucidaot-nt,lucida-nt] +% \loadfontgoodies[lucida-opentype-math] + \definetypeface [\typescriptone] [\s!rm] [\s!serif] [\typescriptone] [\s!default] [\s!features=\s!default] + \definetypeface [\typescriptone] [\s!ss] [\s!sans] [\typescriptone] [\s!default] [\s!features=\s!default] + \definetypeface [\typescriptone] [\s!tt] [\s!mono] [\typescriptone] [\s!default] [\s!features=\s!none] + \definetypeface [\typescriptone] [\s!hw] [\s!handwriting] [\typescriptone] [\s!default] [\s!features=\s!default] + \definetypeface [\typescriptone] [\s!cg] [\s!calligraphy] [\typescriptone] [\s!default] [\s!features=\s!default] + \definetypeface [\typescriptone] [\s!mm] [\s!math] [\typescriptone] [\s!default] + \quittypescriptscanning + \stoptypescript + + \starttypescript [\s!serif] [lucida,lucidaot,lucidadk,lucidaot-nt,lucida-nt] + \definefontsynonym [\s!Serif] [\s!file:LucidaBrightOT.otf] [\s!goodies=lucida-text] + \definefontsynonym [\s!SerifBold] [\s!file:LucidaBrightOT-Demi.otf] [\s!goodies=lucida-text] + \definefontsynonym [\s!SerifItalic] [\s!file:LucidaBrightOT-Italic.otf] [\s!goodies=lucida-text] + \definefontsynonym [\s!SerifBoldItalic] [\s!file:LucidaBrightOT-DemiItalic.otf][\s!goodies=lucida-text] + \definefontsynonym [\s!SerifSlanted] [\s!SerifItalic] + \definefontsynonym [\s!SerifBoldSlanted] [\s!SerifBoldItalic] + \stoptypescript + + \starttypescript [\s!sans] [lucida,lucidaot,lucidadk,lucidaot-nt,lucida-nt] + \definefontsynonym [\s!Sans] [\s!file:LucidaSansOT.otf] + \definefontsynonym [\s!SansBold] [\s!file:LucidaSansOT-Demi.otf] + \definefontsynonym [\s!SansItalic] [\s!file:LucidaSansOT-Italic.otf] + \definefontsynonym [\s!SansBoldItalic] [\s!file:LucidaSansOT-DemiItalic.otf] + \definefontsynonym [\s!SansSlanted] [\s!SansItalic] + \definefontsynonym [\s!SansBoldSlanted] [\s!SansBoldItalic] + \stoptypescript + + \starttypescript [\s!mono] [lucida,lucidaot,lucidaot-nt,lucida-nt] + \definefontsynonym [\s!Mono] [\s!file:LucidaSansTypewriterOT.otf] + \definefontsynonym [\s!MonoBold] [\s!file:LucidaSansTypewriterOT-Bold.otf] + \definefontsynonym [\s!MonoItalic] [\s!file:LucidaSansTypewriterOT-Oblique.otf] + \definefontsynonym [\s!MonoBoldItalic] [\s!file:LucidaSansTypewriterOT-BoldOblique.otf] + \definefontsynonym [\s!MonoSlanted] [\s!MonoItalic] + \definefontsynonym [\s!MonoBoldSlanted] [\s!MonoBoldItalic] + \stoptypescript + + \starttypescript [\s!mono] [lucidadk,lucidaot-nt,lucida-nt] + \definefontsynonym [\s!Mono] [\s!file:LucidaGrandeMonoDK.otf] + \definefontsynonym [\s!MonoBold] [\s!file:LucidaGrandeMonoDK-Bold.otf] + \definefontsynonym [\s!MonoItalic] [\s!file:LucidaGrandeMonoDK-Oblique.otf] + \definefontsynonym [\s!MonoBoldItalic] [\s!file:LucidaGrandeMonoDK-BoldOblique.otf] + \definefontsynonym [\s!MonoSlanted] [\s!MonoItalic] + \definefontsynonym [\s!MonoBoldSlanted] [\s!MonoBoldItalic] + \stoptypescript + + \starttypescript [\s!math] [lucida,lucida-nt,lucidaot,lucidaot-nt,lucidadk] + \checkedmapfontsize[\typescripttwo][\s!script] [.70] + \checkedmapfontsize[\typescripttwo][\s!scriptscript][.50] + \stoptypescript + + \starttypescript [\s!math] [lucida,lucidaot,lucidadk] + \definefontsynonym [\s!MathRoman] [\s!file:LucidaBrightMathOT.otf] [\s!features={\s!math\mathsizesuffix,mathlucida,lucida:mathextra,mathextra},\s!goodies=lucida-math] + % \definefontsynonym [\s!MathRomanBold] [\s!file:LucidaBrightMathOT-Demi.otf] [\s!features={\s!math\mathsizesuffix,mathlucida,mathextra},\s!goodies=lucida-math] + \definefontsynonym [\s!MathRomanBold] [\s!file:LucidaBrightMathOT.otf] [\s!features={\s!math\mathsizesuffix,lucida-math-bold,mathlucida,lucida:mathextra,mathextra},\s!goodies=lucida-math] + \stoptypescript + + \starttypescript [\s!math] [lucidaot-nt,lucida-nt] + \definefontsynonym [\s!MathRoman] [\s!file:LucidaBrightMathOT.otf] [\s!features={\s!math\mathsizesuffix,mathlucida,lucida:mathextra,mathextra}] + % \definefontsynonym [\s!MathRomanBold] [\s!file:LucidaBrightMathOT-Demi.otf] [\s!features={\s!math\mathsizesuffix,mathlucida,mathextra}] + \definefontsynonym [\s!MathRomanBold] [\s!file:LucidaBrightMathOT.otf] [\s!features={\s!math\mathsizesuffix,lucida-math-bold,mathlucida,lucida:mathextra,mathextra}] + \stoptypescript + + \starttypescript [\s!handwriting] [lucida,lucidaot,lucidadk,lucidaot-nt,lucida-nt] + \definefontsynonym [\s!Handwriting] [\s!file:LucidaHandwritingOT.otf] + \stoptypescript + + \starttypescript [\s!calligraphy] [lucida,lucidaot,lucidadk,lucidaot-nt,lucida-nt] + \definefontsynonym [\s!Calligraphy] [\s!file:LucidaCalligraphyOT.otf] + \stoptypescript + +\stoptypescriptcollection + +\endinput diff --git a/Master/texmf-dist/tex/context/fonts/mkiv/type-imp-newcomputermodern.mkiv b/Master/texmf-dist/tex/context/fonts/mkiv/type-imp-newcomputermodern.mkiv index b6bb26c7690..e4078c25cb6 100644 --- a/Master/texmf-dist/tex/context/fonts/mkiv/type-imp-newcomputermodern.mkiv +++ b/Master/texmf-dist/tex/context/fonts/mkiv/type-imp-newcomputermodern.mkiv @@ -49,8 +49,8 @@ \starttypescript [\s!math][newcomputermodern] [\s!name] % \loadfontgoodies[newcomputermodern-math] ,\s!goodies=newcomputermodern-math - \definefontsynonym[\s!MathRoman] [\s!file:newcmmath-regular][\s!features={\s!math\mathsizesuffix,mathextra},\s!goodies=newcomputermodern-math] - \definefontsynonym[\s!MathRomanBold][\s!file:newcmmath-regular][\s!features={\s!math\mathsizesuffix,newcomputermodern-math-bold,mathextra},\s!goodies=newcomputermodern-math] + \definefontsynonym[\s!MathRoman] [\s!file:newcmmath-regular.otf][\s!features={\s!math\mathsizesuffix,newcm-mathextra,mathextra},\s!goodies=newcomputermodern-math] + \definefontsynonym[\s!MathRomanBold][\s!file:newcmmath-regular.otf][\s!features={\s!math\mathsizesuffix,newcomputermodern-math-bold,newcm-mathextra,mathextra},\s!goodies=newcomputermodern-math] \stoptypescript \starttypescript [\s!serif] [newcomputermodern-book] [\s!name] @@ -79,8 +79,8 @@ \starttypescript [\s!math][newcomputermodern-book] [\s!name] % \loadfontgoodies[newcomputermodern-math] ,\s!goodies=newcomputermodern-math - \definefontsynonym[\s!MathRoman] [\s!file:newcmmath-book][\s!features={\s!math\mathsizesuffix,newcm-mathextra,mathextra},\s!goodies=newcomputermodern-math] - \definefontsynonym[\s!MathRomanBold][\s!file:newcmmath-book][\s!features={\s!math\mathsizesuffix,newcm-mathextra,newcomputermodern-math-bold,mathextra},\s!goodies=newcomputermodern-math] + \definefontsynonym[\s!MathRoman] [\s!file:newcmmath-book.otf][\s!features={\s!math\mathsizesuffix,newcm-mathextra,mathextra},\s!goodies=newcomputermodern-math] + \definefontsynonym[\s!MathRomanBold][\s!file:newcmmath-book.otf][\s!features={\s!math\mathsizesuffix,newcomputermodern-math-bold,newcm-mathextra,mathextra},\s!goodies=newcomputermodern-math] \stoptypescript \starttypescript[newcomputermodern,newcomputermodern-book] diff --git a/Master/texmf-dist/tex/context/fonts/mkiv/type-imp-plex.mkiv b/Master/texmf-dist/tex/context/fonts/mkiv/type-imp-plex.mkiv index 71f23028347..8c935451d42 100644 --- a/Master/texmf-dist/tex/context/fonts/mkiv/type-imp-plex.mkiv +++ b/Master/texmf-dist/tex/context/fonts/mkiv/type-imp-plex.mkiv @@ -87,8 +87,8 @@ \starttypescript [\s!sans,\s!serif,\s!mono] [plex-text] [\s!name] \setups[\s!font:\s!fallback:\typescriptone] - \edefinefontsynonym [\typescriptprefix{\typescriptone}] [\s!file:\typescriptprefix{n:plex\typescriptone}-text] [\s!features=\typescriptprefix{f:plex\typescriptone}] - \edefinefontsynonym [\typescriptprefix{\typescriptone}\s!Italic] [\s!file:\typescriptprefix{n:plex\typescriptone}-textitalic] [\s!features=\typescriptprefix{f:plex\typescriptone}] + \edefinefontsynonym [\typescriptprefix{\typescriptone}] [\s!file:\typescriptprefix{n:plex\typescriptone}-text] [\s!features=\typescriptprefix{f:plex\typescriptone}] + \edefinefontsynonym [\typescriptprefix{\typescriptone}\s!Italic] [\s!file:\typescriptprefix{n:plex\typescriptone}-textitalic] [\s!features=\typescriptprefix{f:plex\typescriptone}] \edefinefontsynonym [\typescriptprefix{\typescriptone}\s!Bold] [\s!file:\typescriptprefix{n:plex\typescriptone}-semibold] [\s!features=\typescriptprefix{f:plex\typescriptone}] \edefinefontsynonym [\typescriptprefix{\typescriptone}\s!BoldItalic] [\s!file:\typescriptprefix{n:plex\typescriptone}-semibolditalic] [\s!features=\typescriptprefix{f:plex\typescriptone}] \stoptypescript @@ -130,13 +130,13 @@ \stoptypescript \starttypescript [\s!math] [plex] [\s!name] - \definefontsynonym [\s!MathRoman] [\s!file:IBMPlexMath.otf][\s!features={\s!math\mathsizesuffix,plex:mathextra,mathextra},\s!goodies=plex-math] - \definefontsynonym [\s!MathRomanBold][\s!file:IBMPlexMath.otf][\s!features={\s!math\mathsizesuffix,plex-math-bold,plex:mathextra,mathextra},\s!goodies=plex-math] + \definefontsynonym [\s!MathRoman] [\s!file:IBMPlexMath-Regular.otf][\s!features={\s!math\mathsizesuffix,plex:mathextra,mathextra},\s!goodies=plex-math] + \definefontsynonym [\s!MathRomanBold][\s!file:IBMPlexMath-Regular.otf][\s!features={\s!math\mathsizesuffix,plex-math-bold,plex:mathextra,mathextra},\s!goodies=plex-math] \stoptypescript \starttypescript [\s!math] [plex-nt] [\s!name] - \definefontsynonym [\s!MathRoman] [\s!file:IBMPlexMath.otf][\s!features={\s!math\mathsizesuffix,plex:mathextra,mathextra}] - \definefontsynonym [\s!MathRomanBold][\s!file:IBMPlexMath.otf][\s!features={\s!math\mathsizesuffix,plex-math-bold,plex:mathextra,mathextra}] + \definefontsynonym [\s!MathRoman] [\s!file:IBMPlexMath-Regular.otf][\s!features={\s!math\mathsizesuffix,plex:mathextra,mathextra}] + \definefontsynonym [\s!MathRomanBold][\s!file:IBMPlexMath-Regular.otf][\s!features={\s!math\mathsizesuffix,plex-math-bold,plex:mathextra,mathextra}] \stoptypescript % done @@ -145,7 +145,7 @@ \definetypeface [\typescriptone] [\s!rm] [\s!serif] [\typescriptone] [\s!default] \definetypeface [\typescriptone] [\s!ss] [\s!sans] [\typescriptone] [\s!default] \definetypeface [\typescriptone] [\s!tt] [\s!mono] [\typescriptone] [\s!default] -\doifelsefileexists{IBMPlexMath.otf} { +\doifelsefileexists{IBMPlexMath-Regular.otf} { \definetypeface [\typescriptone] [\s!mm] [\s!math] [plex] [\s!default] } { \definetypeface [\typescriptone] [\s!mm] [\s!math] [bookman] [\s!default] [\s!rscale=1.03] @@ -386,22 +386,14 @@ \definetypeface [\typescriptone] [\s!ss] [\s!sans] [\typescriptone] [\s!default] \definetypeface [\typescriptone] [\s!rm] [\s!serif] [\typescriptone] [\s!default] \definetypeface [\typescriptone] [\s!tt] [\s!mono] [\typescriptone] [\s!default] -\doifelsefileexists{IBMPlexMath.otf} { \definetypeface [\typescriptone] [\s!mm] [\s!math] [plex] [\s!default] -} { - \definetypeface [\typescriptone] [\s!mm] [\s!math] [bookman] [\s!default] [\s!rscale=1.03] -} \stoptypescript \starttypescript[ibmplexnarrow,ibmplexnarrow-thin,ibmplexnarrow-extralight,ibmplexnarrow-light] \definetypeface [\typescriptone] [\s!ss] [\s!sans] [\typescriptone] [\s!default] \definetypeface [\typescriptone] [\s!rm] [\s!serif] [\typescriptone] [\s!default] \definetypeface [\typescriptone] [\s!tt] [\s!mono] [\typescriptone] [\s!default] -\doifelsefileexists{IBMPlexMath.otf} { \definetypeface [\typescriptone] [\s!mm] [\s!math] [plex] [\s!default] -} { - \definetypeface [\typescriptone] [\s!mm] [\s!math] [bookman] [\s!default] [\s!rscale=1.03] -} \stoptypescript \stoptypescriptcollection diff --git a/Master/texmf-dist/tex/context/fonts/mkiv/type-imp-stix.mkiv b/Master/texmf-dist/tex/context/fonts/mkiv/type-imp-stix.mkiv index d1bad9a2e9a..72c61bf3a98 100644 --- a/Master/texmf-dist/tex/context/fonts/mkiv/type-imp-stix.mkiv +++ b/Master/texmf-dist/tex/context/fonts/mkiv/type-imp-stix.mkiv @@ -66,7 +66,7 @@ \starttypescript[stix,stixtwo,xits,stix-nt,stixtwo-nt] \definetypeface [\typescriptone] [\s!rm] [\s!serif] [stixtwo] [\s!default] - \definetypeface [\typescriptone] [\s!ss] [\s!serif] [stixtwo] [\s!default] + \definetypeface [\typescriptone] [\s!ss] [\s!sans] [dejavu] [\s!default] [\s!rscale=0.895] \definetypeface [\typescriptone] [\s!tt] [\s!mono] [dejavu] [\s!default] [\s!rscale=0.895] \stoptypescript \starttypescript[stix,stixtwo,xits] diff --git a/Master/texmf-dist/tex/context/fonts/mkiv/type-imp-uprightonly.mkiv b/Master/texmf-dist/tex/context/fonts/mkiv/type-imp-uprightonly.mkiv new file mode 100644 index 00000000000..f74c974503b --- /dev/null +++ b/Master/texmf-dist/tex/context/fonts/mkiv/type-imp-uprightonly.mkiv @@ -0,0 +1,55 @@ +%D \module +%D [ file=type-imp-uprightonly, +%D version=2024.08.24, +%D title=\CONTEXT\ Typescript Macros, +%D subtitle=Upright Only, +%D author=WOlfgang Schuster, +%D date=\currentdate, +%D copyright={\CONTEXT\ Development Team}] +%C +%C This module is part of the \CONTEXT\ macro||package and is, See mreadme.pdf for +%C details. + +\unprotect % needed for test run + +\starttypescriptcollection[uprightonly] + +\starttypescript [\s!serif,\s!sans,\s!mono] [uprightonly] + \definefontsynonym [\typescriptprefix\typescriptone\s!Italic] [\typescriptprefix\typescriptone] + \definefontsynonym [\typescriptprefix\typescriptone\s!Slanted] [\typescriptprefix\typescriptone] + \definefontsynonym [\typescriptprefix\typescriptone\s!Bold] [\typescriptprefix\typescriptone] + \definefontsynonym [\typescriptprefix\typescriptone\s!BoldItalic] [\typescriptprefix\typescriptone] + \definefontsynonym [\typescriptprefix\typescriptone\s!BoldSlanted][\typescriptprefix\typescriptone] +\stoptypescript + +\starttypescript [uprightonly] + \definetypeface [\typescriptone] [\s!rm] [\s!serif] [\typescriptone] + \definetypeface [\typescriptone] [\s!ss] [\s!sans] [\typescriptone] + \definetypeface [\typescriptone] [\s!tt] [\s!mono] [\typescriptone] + \definetypeface [\typescriptone] [\s!mm] [\s!math] [\globalfontclass] +\stoptypescript + +\stoptypescriptcollection + +\protect + +\continueifinputfile{type-imp-uprightonly.mkiv} + +\usetypescriptfile[uprightonly] +\setupbodyfont[pagella] + +\starttext + +\startbuffer +xxx {\bf yyy} xxx {\it zzz} xxx \im{x = 1} +\stopbuffer + +\getbuffer + +\start \switchtobodyfont[uprightonly] +\getbuffer +\stop + +\getbuffer + +\stoptext diff --git a/Master/texmf-dist/tex/context/fonts/mkiv/type-imp-xcharter.mkiv b/Master/texmf-dist/tex/context/fonts/mkiv/type-imp-xcharter.mkiv index 45070c40dbd..6c4a1e03f1d 100644 --- a/Master/texmf-dist/tex/context/fonts/mkiv/type-imp-xcharter.mkiv +++ b/Master/texmf-dist/tex/context/fonts/mkiv/type-imp-xcharter.mkiv @@ -13,9 +13,12 @@ \starttypescriptcollection[xcharter] + % \setupmathradical[\c!leftmargin=.05mq,\c!mindepth=.1mx]% + \pushglobalsetups \startsetups[\s!math:xcharter] - \setupmathradical[\c!leftmargin=.05mq,mindepth=0.1mx]% + \setmathradicalparameter\c!leftmargin{.05mq}% + \setmathradicalparameter\c!mindepth {.1mx}% \stopsetups \popglobalsetups diff --git a/Master/texmf-dist/tex/context/fonts/mkiv/xcharter-math.lfg b/Master/texmf-dist/tex/context/fonts/mkiv/xcharter-math.lfg index 7614a311350..f0abf106ec4 100644 --- a/Master/texmf-dist/tex/context/fonts/mkiv/xcharter-math.lfg +++ b/Master/texmf-dist/tex/context/fonts/mkiv/xcharter-math.lfg @@ -32,6 +32,9 @@ return { { tweak = "addmirrors", }, + { + tweak = "addcomposites", + }, presets.scripttocalligraphic { }, presets.rsfstoscript { }, presets.rsfsuprighttoscript { }, diff --git a/Master/texmf-dist/tex/context/fonts/mkiv/xits-math.lfg b/Master/texmf-dist/tex/context/fonts/mkiv/xits-math.lfg index 1d7e22df61d..0744c23ed1d 100644 --- a/Master/texmf-dist/tex/context/fonts/mkiv/xits-math.lfg +++ b/Master/texmf-dist/tex/context/fonts/mkiv/xits-math.lfg @@ -95,6 +95,9 @@ return { factor = 0.85, }, { + tweak = "addcomposites", + }, + { tweak = "checkspacing", }, { diff --git a/Master/texmf-dist/tex/context/fonts/mkxl/notosans-math.lfg b/Master/texmf-dist/tex/context/fonts/mkxl/notosans-math.lfg new file mode 100644 index 00000000000..9adfa6c170b --- /dev/null +++ b/Master/texmf-dist/tex/context/fonts/mkxl/notosans-math.lfg @@ -0,0 +1,312 @@ +local common = fonts.goodies.load("common-math.lfg") +local presets = common.mathematics.tweaks.presets + +-- local integral_variants = { bottomright = -0.4 } +-- ----- integral_top = { topright = 0.05 } +-- local integral_bottom = { bottomright = -0.35 } + +return { + name = "stix-two-math", + version = "1.00", + comment = "Goodies that complement stix two opentype.", + author = "Hans Hagen & Mikael Sundqvist", + copyright = "ConTeXt development team", + mathematics = { + alternates = { +-- lambdabar = { feature = 'cv01', value = 1, comment = "Mathematical Alternative Lambda Bar" }, +-- ramshorn = { feature = 'cv02', value = 1, comment = "Mathematical Alternative Rams Horn" }, +-- emptyset = { feature = 'cv03', value = 1, comment = "Mathematical Alternative Empty Set" }, +-- setminus = { feature = 'cv04', value = 1, comment = "Mathematical Alternative Setminus" }, +-- calligraphic = { feature = 'ss01', value = 1, comment = "Mathematical Alternative Calligraphic Characters" }, -- We do this differently +-- italic = { feature = 'ss02', value = 1, comment = "Mathematical Alternative Lowercase Italic" }, +-- barred = { feature = 'ss03', value = 1, comment = "Mathematical Alternative Barred Characters" }, -- hbar, lambdabar etc +-- primes = { feature = 'ss04', value = 1, comment = "Mathematical Alternative Primes" }, -- larger/lower primes, minute etc +-- arrow = { feature = 'ss05', value = 1, comment = "Mathematical Alternative Smaller Arrows" }, +-- narrower = { feature = 'ss06', value = 1, comment = "Mathematical Alternative Narrower Elements" }, -- narrower/shorter element etc +-- small = { feature = 'ss07', value = 1, comment = "Mathematical Alternative Smaller Operators" }, +-- upright = { feature = 'ss08', value = 1, comment = "Mathematical Alternative Upright Symbols" }, -- upright integrals etc. +-- negated = { feature = 'ss09', value = 1, comment = "Mathematical Alternative Negated Symbols" }, +-- relation = { feature = 'ss10', value = 1, comment = "Mathematical Alternative Relations" }, +-- negatedset = { feature = 'ss11', value = 1, comment = "Mathematical Alternative Negated Set Symbols" }, +-- propfrown = { feature = 'ss12', value = 1, comment = "Mathematical Alternative Proportional and Frown" }, +-- negsine = { feature = 'ss13', value = 1, comment = "Mathematical Alternative Negated Sine Wave" }, +-- intprod = { feature = 'ss14', value = 1, comment = "Mathematical Alternative Interior Products" }, +-- capcup = { feature = 'ss15', value = 1, comment = "Mathematical Alternative Intersection and Union with serif" }, +-- circled = { feature = 'ss16', value = 1, comment = "Mathematical Alternative Circled Operators" }, +-- simvar = { feature = 'ss20', value = 1, comment = "Mathematical Alternative Similar and some more unrelated" }, +-- -- demo features: +-- negated8774 = { +-- feature = 'ss09', +-- value = 1, +-- comment = "Mathematical Alternative Negated 8774", +-- list = { [8774] = true }, +-- }, +-- negated8775 = { +-- feature = 'ss09', +-- value = 1, +-- comment = "Mathematical Alternative Negated 8775", +-- list = { [8775] = true }, +-- }, + }, + parameters = { +-- AccentBaseDepth = 30, +-- FlattenedAccentTopShiftUp = 0, +-- RadicalKernAfterDegree = -500, + DelimiterPercent = 90, + DelimiterShortfall = 400, + DelimiterDisplayPercent = 90, + DelimiterDisplayShortfall = 400, +-- DisplayOperatorMinHeight = 1800, -- 1800 in font + PrimeShiftUp = "1.15*SuperscriptShiftUp", + PrimeShiftUpCramped = "1.15*SuperscriptShiftUp", +-- RadicalDisplayStyleVerticalGap = "RadicalVerticalGap", --170, 85 +-- -- SuperscriptSnap = 1000, +-- -- SubscriptSnap = 500, + }, + tweaks = { + aftercopying = { + { + tweak = "version", + expected = "Version 2.12 b168", + }, + { + tweak = "fixprimes", + factor = 0.9, + }, + { + tweak = "addmirrors", + }, + { + tweak = "addcomposites", + }, + -- MS: we need to check this, I moved it up +-- { +-- tweak = "replacealphabets", +-- list = { +-- { +-- source = "uppercasescript", +-- target = "uppercasecalligraphic", +-- unicode = "uppercasescript", +-- }, +-- { +-- source = "uppercasescript", +-- target = "uppercasescript", +-- feature = "ss01", +-- }, +-- { +-- source = "uppercaseboldscript", +-- target = "uppercaseboldcalligraphic", +-- unicode = "uppercasescriptbold", +-- }, +-- { +-- source = "uppercaseboldscript", +-- target = "uppercaseboldscript", +-- feature = "ss01", +-- }, +-- { +-- source = { first = 0xE17D, last = 0xE195 }, +-- target = "uppercasesansgreek", +-- unicode = "uppercasegreeknormal", +-- }, +-- { +-- source = { first = 0xE196, last = 0xE1AE }, -- maybe last = E1B3 +-- target = "lowercasesansgreek", +-- unicode = "lowercasegreeknormal", +-- }, +-- { +-- source = { first = 0xE1BF, last = 0xE1D7 }, +-- target = "uppercaseitalicsansgreek", +-- unicode = "uppercasegreekitalic", +-- }, +-- { +-- source = { first = 0xE1D8, last = 0xE1F0 }, -- maybe last = E1F5 +-- target = "lowercaseitalicsansgreek", +-- unicode = "lowercasegreekitalic", +-- }, +-- }, +-- }, +-- { +-- tweak = "replacealphabets", +-- filename = "TeXGyrePagellaMath.otf", +-- list = { +-- { unicodes = { 0x007C, 0x2223, 0x2016, 0x2980, 0x007C } }, -- single single double triple +-- } +-- }, + presets.scripttocalligraphic { }, + presets.rsfstoscript { }, + presets.rsfsuprighttoscript { }, + presets.moderntocalligraphic { }, + presets.eulertocalligraphic { }, + presets.xitsarabic { rscale = 0.95 }, + presets.fallbacks { }, + presets.moveitalics { correct = true }, + presets.moveitalics { correct = true, letters = true }, + presets.moveintegrals { }, + presets.wipeitalics { }, + { + tweak = "checkaccents", + }, + -- Extensibles use .s1 (variant 1), so we cannot wipe all +-- { +-- tweak = "wipevariants", +-- list = { +-- [0x20D6] = 3, +-- [0x20D7] = 3, +-- [0x20EE] = 3, +-- [0x20EF] = 3, +-- }, +-- }, + { + tweak = "simplifykerns", + }, +-- { +-- tweak = "kerns", +-- list = { +-- [0x002F] = { topleft = -0.2, bottomright = -0.2 }, +-- ["0x7D.parts.top"] = { topright = -0.15, }, -- right brace top +-- ["0x7D.parts.bottom"] = { bottomright = -0.15 }, -- right brace bottom +-- ["0x29.parts.top"] = { topright = -0.1, }, -- right parenthesis top +-- ["0x29.parts.bottom"] = { bottomright = -0.1 }, -- right parenthesis bottom +-- ["0x29.variants.*"] = { topright = -0.2, bottomright = -0.2 }, -- right parenthesis variants +-- ["0x221A.parts.top"] = { topright = 0.2, }, -- right radical top +-- ["0x221A.parts.bottom"] = { bottomright = 0.2 }, -- right radical bottom +-- ["0x221A.variants.*"] = { topright = 0.2, bottomright = 0.2 }, -- right radical variants +-- [0x27E9] = { topright = -0.1, bottomright = -0.1 }, -- angle +-- ["0x27E9.variants.*"] = { topright = -0.2, bottomright = -0.2 }, +-- [0x27EB] = { topright = -0.1, bottomright = -0.1 }, +-- ["0x27EB.variants.*"] = { topright = -0.2, bottomright = -0.2 }, +-- -- +-- ["0x222B.parts.bottom"] = { bottomright = -0.30 }, -- int +-- }, +-- }, + -- Accents are a mess. We migrate the extensibles from the combiners to the base accent + -- and then need to tweak the width (which is auto set because it was zero with a large + -- accent anchor offset). First we copy and fix. + { + tweak = "extendaccents", + }, +-- { +-- tweak = "radicaldegreeanchors", +-- list = { +-- [0x221A] = { location = "left", hfactor = 0.00, vfactor = 0.7 }, +-- ["0x221A.variants.*"] = { location = "left", hfactor = 0.00, vfactor = 0.55 }, +-- ["0x221A.variants.3"] = { location = "left", hfactor = 0.00, vfactor = .525 }, +-- ["0x221A.parts.bottom"] = { location = "left", hfactor = 0.05, vfactor = 1.00 }, +-- } +-- }, + { + tweak = "flattenaccents", + }, + { + tweak = "fixaccents", + }, +-- -- First we set the dimensions of the initial accent which started out as zero but we want +-- -- a proper width. +-- -- { +-- -- tweak = "dimensions", +-- -- list = { +-- -- [0x00302] = { width = 1.2, anchor = 1.10, xoffset = .05 }, -- widehat +-- -- [0x00303] = { width = 1.4, anchor = 1.20, xoffset = .10 }, -- widetilde +-- -- [0x00306] = { width = 1.4, anchor = 1.20, xoffset = .10 }, -- widebreve +-- -- [0x0030C] = { width = 1.4, anchor = 1.20, xoffset = .10 }, -- widecheck +-- -- }, +-- -- }, +-- -- Then we deal with all offsets and heights in one go. So we treat the initial accent +-- -- as well as the variants here. +-- { +-- tweak = "dimensions", +-- list = { +-- -- here we want to apply to all +-- [0x020DB] = { yoffset = 0.025, height = .95, all = true }, -- widedddot : 0x20DB (self) +-- }, +-- }, + -- We now copy these to the not wide slots so that we can set these to stretch as well, + -- if only because it is less confusing and more consistent. + { + tweak = "copyaccents", + }, + -- So far for the accents. + { + tweak = "checkspacing", + }, + { + tweak = "addscripts", + }, + { + tweak = "accentdimensions", + }, + { + tweak = "addrules", + }, + { + tweak = "addarrows", + }, + { + tweak = "fixslashes", + }, + { + tweak = "replacerules", +-- minus = { +-- height = .233, +-- yoffset = .768, +-- leftoffset = .08, +-- rightoffset = .08, +-- }, +-- fraction = { +-- height = .233, +-- yoffset = .768, +-- }, +-- radical = { +-- height = .233, +-- yoffset = .768, +-- leftoffset = .08, +-- rightoffset = .08, +-- }, +-- stacker = { +-- height = .233, +-- yoffset = .768, +-- }, + }, + { + tweak = "addactuarian", + }, + { + tweak = "addfourier", + variant = 1, + }, + { + tweak = "addprimed", + }, +-- { +-- tweak = "addparts", +-- list = { +-- [0x21F4] = { +-- horizontal = true, +-- template = 0x2192, +-- sequence = { +-- { glyph = "first", factor = 2 }, +-- { glyph = 0x2218 }, +-- { glyph = "first", factor = 2 }, +-- { glyph = "last" }, +-- } +-- } +-- } +-- }, +-- { +-- tweak = "addbars", +-- advance = 0.3, +-- check = true, -- only add triples +-- }, + -- this is the mkiv section +-- { +-- tweak = "emulatelmtx", +-- feature = "emulatelmtx", +-- comment = "this is for mkiv", +-- }, + }, + }, + bigslots = { + 1, 3, 5, 7 + }, + }, +} diff --git a/Master/texmf-dist/tex/context/fonts/mkxl/type-imp-euler.mkxl b/Master/texmf-dist/tex/context/fonts/mkxl/type-imp-euler.mkxl index a4d91a9958a..0298a546807 100644 --- a/Master/texmf-dist/tex/context/fonts/mkxl/type-imp-euler.mkxl +++ b/Master/texmf-dist/tex/context/fonts/mkxl/type-imp-euler.mkxl @@ -21,10 +21,10 @@ \definefontfeature[pagellaovereuler][pagellaovereuler=yes] \definefontfeature[euleroverpagella][euleroverpagella=yes] -\definefontfeature[eulerregular] [default][compose=yes] -\definefontfeature[eulerbold] [default][compose=yes,weight=.3] -\definefontfeature[euleritalic] [default][compose=yes,slant=.2] -\definefontfeature[eulerbolditalic][default][compose=yes,slant=.2,weight=.3] +\definefontfeature[eulerregular] [default][wipemath=no,compose=yes] +\definefontfeature[eulerbold] [default][wipemath=no,compose=yes,weight=.3] +\definefontfeature[euleritalic] [default][wipemath=no,compose=yes,slant=.2] +\definefontfeature[eulerbolditalic][default][wipemath=no,compose=yes,slant=.2,weight=.3] \starttypescriptcollection[pagella-eulernova] diff --git a/Master/texmf-dist/tex/context/fonts/mkxl/type-imp-noto.mkxl b/Master/texmf-dist/tex/context/fonts/mkxl/type-imp-noto.mkxl new file mode 100644 index 00000000000..e3cc71b7007 --- /dev/null +++ b/Master/texmf-dist/tex/context/fonts/mkxl/type-imp-noto.mkxl @@ -0,0 +1,74 @@ +%D \module +%D [ file=type-imp-noto, +%D version=2024.06.14, +%D title=\CONTEXT\ Typescript Macros, +%D subtitle=Google Noto Fonts, +%D author={Hans Hagen & Mikael Sundqvist}, +%D date=\currentdate, +%D copyright={PRAGMA ADE \& \CONTEXT\ Development Team}] + +%D This font is in development and we will cook up a proper goodie file when the +%D time is ready for it. We also might need a companion font to deal with the serifs +%D because after all we lost sans as distinctive shape and now need serif to act as +%D such. +%D +%D In the past one could download a noto zip but in the meantime one is supposed to +%D get the fonts from github. +%D +%D \starttyping +%D local files = dir.glob([[<path to>/repositories/notofonts.github.io/fonts/**/full/otf/*.otf]]) +%D +%D for i=1,#files do file.copy(files[i],file.basename(files[i])) end +%D +%D os.execute("mtxrun --generate") +%D os.execute("mtxrun --script font --reload") +%D \stoptyping + +\usetypescriptfile[dejavu] + +\starttypescriptcollection[notosans] + + \doifunknownfontfeature {noto-math-bold} {\definefontfeature[noto-math-bold][boldened]} + + \starttypescript [\s!serif] [noto] [\s!name] + \definefontsynonym [\s!Serif] [\s!file:NotoSerif-Regular] [\s!features=\s!default] + \definefontsynonym [\s!SerifItalic] [\s!file:NotoSerif-Italic] [\s!features=\s!default] + \definefontsynonym [\s!SerifBold] [\s!file:NotoSerif-Bold] [\s!features=\s!default] + \definefontsynonym [\s!SerifBoldItalic] [\s!file:NotoSerif-BoldItalic] [\s!features=\s!default] + \stoptypescript + + \starttypescript [\s!sans] [noto] [\s!name] + \setups[\s!font:\s!fallback:\s!sans] + \definefontsynonym [\s!Sans] [\s!file:NotoSans-Regular] [\s!features=\s!default] + \definefontsynonym [\s!SansItalic] [\s!file:NotoSans-Italic] [\s!features=\s!default] + \definefontsynonym [\s!SansBold] [\s!file:NotoSans-SemiBold] [\s!features=\s!default] + \definefontsynonym [\s!SansBoldItalic][\s!file:NotoSans-SemiBoldItalic][\s!features=\s!default] + \stoptypescript + + % \starttypescript [\s!mono] [noto] [\s!name] + % \setups[\s!font:\s!fallback:\s!mono] + % \definefontsynonym [\s!Mono] [\s!file:NotoMono-Regular] [\s!features=\s!none] + % \definefontsynonym [\s!MonoItalic] [\s!file:NotoMono-Italic] [\s!features=\s!none] + % \definefontsynonym [\s!MonoBold] [\s!file:NotoMono-SemiBold] [\s!features=\s!none] + % \definefontsynonym [\s!MonoBoldItalic][\s!file:NotoMono-SemiBoldItalic][\s!features=\s!none] + % \stoptypescript + + \starttypescript [\s!math] [noto][\s!name] + \checkedmapfontsize[\typescripttwo][\s!script] [.70] + \checkedmapfontsize[\typescripttwo][\s!scriptscript][.55] + \stoptypescript + + \starttypescript [\s!math] [noto][\s!name] + \definefontsynonym [\s!MathRoman] [\s!file:NotoSansMath-Regular.otf][\s!features={\s!math\mathsizesuffix,noto:mathextra,mathextra},\s!goodies=notosans-math] + \definefontsynonym [\s!MathRomanBold][\s!file:NotoSansMath-Regular.otf][\s!features={\s!math\mathsizesuffix,noto-math-bold,noto:mathextra,mathextra},\s!goodies=notosans-math] + \stoptypescript + + \starttypescript [noto] + \definetypeface [\typescriptone] [\s!rm] [\s!serif] [\typescriptone] [\s!default] + \definetypeface [\typescriptone] [\s!ss] [\s!sans] [\typescriptone] [\s!default] + \definetypeface [\typescriptone] [\s!mm] [\s!math] [\typescriptone] [\s!default] + \definetypeface [\typescriptone] [\s!tt] [\s!mono] [dejavu] [\s!default] % todo rscale + \quittypescriptscanning + \stoptypescript + +\stoptypescriptcollection diff --git a/Master/texmf-dist/tex/context/third/circuitikz/t-circuitikz-1.0.tex b/Master/texmf-dist/tex/context/third/circuitikz/t-circuitikz-1.0.tex index 9f955a46548..45433f03e1a 100644 --- a/Master/texmf-dist/tex/context/third/circuitikz/t-circuitikz-1.0.tex +++ b/Master/texmf-dist/tex/context/third/circuitikz/t-circuitikz-1.0.tex @@ -1,7 +1,7 @@ -% Copyright 2018-2024 by Romano Giannetti -% Copyright 2015-2024 by Stefan Lindner -% Copyright 2013-2024 by Stefan Erhardt -% Copyright 2007-2024 by Massimo Redaelli +% Copyright 2018-2025 by Romano Giannetti +% Copyright 2015-2025 by Stefan Lindner +% Copyright 2013-2025 by Stefan Erhardt +% Copyright 2007-2025 by Massimo Redaelli % % This file may be distributed and/or modified % @@ -31,10 +31,10 @@ %%%%%%%%%%% Springe nach tex/pgfcirc.defines %%%---------- open: tex/pgfcirc.defines.tex -% Copyright 2018-2024 by Romano Giannetti -% Copyright 2015-2024 by Stefan Lindner -% Copyright 2013-2024 by Stefan Erhardt -% Copyright 2007-2024 by Massimo Redaelli +% Copyright 2018-2025 by Romano Giannetti +% Copyright 2015-2025 by Stefan Lindner +% Copyright 2013-2025 by Stefan Erhardt +% Copyright 2007-2025 by Massimo Redaelli % % This file may be distributed and/or modified % @@ -1993,10 +1993,10 @@ %%%---------- close: tex/pgfcirc.defines %%%%%%%%%%% Springe nach tex/pgfcircutils %%%---------- open: tex/pgfcircutils.tex -% Copyright 2018-2024 by Romano Giannetti -% Copyright 2015-2024 by Stefan Lindner -% Copyright 2013-2024 by Stefan Erhardt -% Copyright 2007-2024 by Massimo Redaelli +% Copyright 2018-2025 by Romano Giannetti +% Copyright 2015-2025 by Stefan Lindner +% Copyright 2013-2025 by Stefan Erhardt +% Copyright 2007-2025 by Massimo Redaelli % % This file may be distributed and/or modified % @@ -2065,10 +2065,10 @@ %%%%%%%%%%% Springe nach tex/pgfcircshapes %%%---------- open: tex/pgfcircshapes.tex -% Copyright 2018-2024 by Romano Giannetti -% Copyright 2015-2024 by Stefan Lindner -% Copyright 2013-2024 by Stefan Erhardt -% Copyright 2007-2024 by Massimo Redaelli +% Copyright 2018-2025 by Romano Giannetti +% Copyright 2015-2025 by Stefan Lindner +% Copyright 2013-2025 by Stefan Erhardt +% Copyright 2007-2025 by Massimo Redaelli % % This file may be distributed and/or modified % @@ -2871,10 +2871,10 @@ %%%---------- close: tex/pgfcircshapes %%%%%%%%%%% Springe nach tex/pgfcircmonopoles %%%---------- open: tex/pgfcircmonopoles.tex -% Copyright 2018-2024 by Romano Giannetti -% Copyright 2015-2024 by Stefan Lindner -% Copyright 2013-2024 by Stefan Erhardt -% Copyright 2007-2024 by Massimo Redaelli +% Copyright 2018-2025 by Romano Giannetti +% Copyright 2015-2025 by Stefan Lindner +% Copyright 2013-2025 by Stefan Erhardt +% Copyright 2007-2025 by Massimo Redaelli % % This file may be distributed and/or modified % @@ -3887,10 +3887,10 @@ %%%---------- close: tex/pgfcircmonopoles %%%%%%%%%%% Springe nach tex/pgfcircbipoles %%%---------- open: tex/pgfcircbipoles.tex -% Copyright 2018-2024 by Romano Giannetti -% Copyright 2015-2024 by Stefan Lindner -% Copyright 2013-2024 by Stefan Erhardt -% Copyright 2007-2024 by Massimo Redaelli +% Copyright 2018-2025 by Romano Giannetti +% Copyright 2015-2025 by Stefan Lindner +% Copyright 2013-2025 by Stefan Erhardt +% Copyright 2007-2025 by Massimo Redaelli % % This file may be distributed and/or modified % @@ -8991,10 +8991,10 @@ %%%---------- close: tex/pgfcircbipoles %%%%%%%%%%% Springe nach tex/pgfcirctripoles %%%---------- open: tex/pgfcirctripoles.tex -% Copyright 2018-2024 by Romano Giannetti -% Copyright 2015-2024 by Stefan Lindner -% Copyright 2013-2024 by Stefan Erhardt -% Copyright 2007-2024 by Massimo Redaelli +% Copyright 2018-2025 by Romano Giannetti +% Copyright 2015-2025 by Stefan Lindner +% Copyright 2013-2025 by Stefan Erhardt +% Copyright 2007-2025 by Massimo Redaelli % % This file may be distributed and/or modified % @@ -14699,10 +14699,10 @@ %%%---------- close: tex/pgfcirctripoles %%%%%%%%%%% Springe nach tex/pgfcircquadpoles %%%---------- open: tex/pgfcircquadpoles.tex -% Copyright 2018-2024 by Romano Giannetti -% Copyright 2015-2024 by Stefan Lindner -% Copyright 2013-2024 by Stefan Erhardt -% Copyright 2007-2024 by Massimo Redaelli +% Copyright 2018-2025 by Romano Giannetti +% Copyright 2015-2025 by Stefan Lindner +% Copyright 2013-2025 by Stefan Erhardt +% Copyright 2007-2025 by Massimo Redaelli % % This file may be distributed and/or modified % @@ -15850,10 +15850,10 @@ %%%---------- close: tex/pgfcircquadpoles %%%%%%%%%%% Springe nach tex/pgfcircmultipoles %%%---------- open: tex/pgfcircmultipoles.tex -% Copyright 2018-2024 by Romano Giannetti -% Copyright 2015-2024 by Stefan Lindner -% Copyright 2013-2024 by Stefan Erhardt -% Copyright 2007-2024 by Massimo Redaelli +% Copyright 2018-2025 by Romano Giannetti +% Copyright 2015-2025 by Stefan Lindner +% Copyright 2013-2025 by Stefan Erhardt +% Copyright 2007-2025 by Massimo Redaelli % % This file may be distributed and/or modified % @@ -17628,10 +17628,10 @@ %%%%%%%%%%% Springe nach tex/pgfcirclabel %%%---------- open: tex/pgfcirclabel.tex -% Copyright 2018-2024 by Romano Giannetti -% Copyright 2015-2024 by Stefan Lindner -% Copyright 2013-2024 by Stefan Erhardt -% Copyright 2007-2024 by Massimo Redaelli +% Copyright 2018-2025 by Romano Giannetti +% Copyright 2015-2025 by Stefan Lindner +% Copyright 2013-2025 by Stefan Erhardt +% Copyright 2007-2025 by Massimo Redaelli % % This file may be distributed and/or modified % @@ -17997,10 +17997,10 @@ %%%---------- close: tex/pgfcirclabel %%%%%%%%%%% Springe nach tex/pgfcircvoltage %%%---------- open: tex/pgfcircvoltage.tex -% Copyright 2018-2024 by Romano Giannetti -% Copyright 2015-2024 by Stefan Lindner -% Copyright 2013-2024 by Stefan Erhardt -% Copyright 2007-2024 by Massimo Redaelli +% Copyright 2018-2025 by Romano Giannetti +% Copyright 2015-2025 by Stefan Lindner +% Copyright 2013-2025 by Stefan Erhardt +% Copyright 2007-2025 by Massimo Redaelli % % This file may be distributed and/or modified % @@ -18496,10 +18496,10 @@ %%%---------- close: tex/pgfcircvoltage %%%%%%%%%%% Springe nach tex/pgfcirccurrent %%%---------- open: tex/pgfcirccurrent.tex -% Copyright 2018-2024 by Romano Giannetti -% Copyright 2015-2024 by Stefan Lindner -% Copyright 2013-2024 by Stefan Erhardt -% Copyright 2007-2024 by Massimo Redaelli +% Copyright 2018-2025 by Romano Giannetti +% Copyright 2015-2025 by Stefan Lindner +% Copyright 2013-2025 by Stefan Erhardt +% Copyright 2007-2025 by Massimo Redaelli % % This file may be distributed and/or modified % @@ -18711,10 +18711,10 @@ %%%---------- close: tex/pgfcirccurrent %%%%%%%%%%% Springe nach tex/pgfcircflow %%%---------- open: tex/pgfcircflow.tex -% Copyright 2018-2024 by Romano Giannetti -% Copyright 2015-2024 by Stefan Lindner -% Copyright 2013-2024 by Stefan Erhardt -% Copyright 2007-2024 by Massimo Redaelli +% Copyright 2018-2025 by Romano Giannetti +% Copyright 2015-2025 by Stefan Lindner +% Copyright 2013-2025 by Stefan Erhardt +% Copyright 2007-2025 by Massimo Redaelli % % This file may be distributed and/or modified % @@ -19008,10 +19008,10 @@ %%%%%%%%%%% Springe nach tex/pgfcircpath %%%---------- open: tex/pgfcircpath.tex -% Copyright 2018-2024 by Romano Giannetti -% Copyright 2015-2024 by Stefan Lindner -% Copyright 2013-2024 by Stefan Erhardt -% Copyright 2007-2024 by Massimo Redaelli +% Copyright 2018-2025 by Romano Giannetti +% Copyright 2015-2025 by Stefan Lindner +% Copyright 2013-2025 by Stefan Erhardt +% Copyright 2007-2025 by Massimo Redaelli % % This file may be distributed and/or modified % diff --git a/Master/texmf-dist/tex/context/third/circuitikz/t-circuitikz-1.1.2.tex b/Master/texmf-dist/tex/context/third/circuitikz/t-circuitikz-1.1.2.tex index ea2d3e5b14e..aedc4b598db 100644 --- a/Master/texmf-dist/tex/context/third/circuitikz/t-circuitikz-1.1.2.tex +++ b/Master/texmf-dist/tex/context/third/circuitikz/t-circuitikz-1.1.2.tex @@ -1,7 +1,7 @@ -% Copyright 2018-2024 by Romano Giannetti -% Copyright 2015-2024 by Stefan Lindner -% Copyright 2013-2024 by Stefan Erhardt -% Copyright 2007-2024 by Massimo Redaelli +% Copyright 2018-2025 by Romano Giannetti +% Copyright 2015-2025 by Stefan Lindner +% Copyright 2013-2025 by Stefan Erhardt +% Copyright 2007-2025 by Massimo Redaelli % % This file may be distributed and/or modified % @@ -32,10 +32,10 @@ %%%%%%%%%%% Springe nach tex/pgfcirc.defines %%%---------- open: tex/pgfcirc.defines.tex -% Copyright 2018-2024 by Romano Giannetti -% Copyright 2015-2024 by Stefan Lindner -% Copyright 2013-2024 by Stefan Erhardt -% Copyright 2007-2024 by Massimo Redaelli +% Copyright 2018-2025 by Romano Giannetti +% Copyright 2015-2025 by Stefan Lindner +% Copyright 2013-2025 by Stefan Erhardt +% Copyright 2007-2025 by Massimo Redaelli % % This file may be distributed and/or modified % @@ -2138,10 +2138,10 @@ %%%---------- close: tex/pgfcirc.defines %%%%%%%%%%% Springe nach tex/pgfcircutils %%%---------- open: tex/pgfcircutils.tex -% Copyright 2018-2024 by Romano Giannetti -% Copyright 2015-2024 by Stefan Lindner -% Copyright 2013-2024 by Stefan Erhardt -% Copyright 2007-2024 by Massimo Redaelli +% Copyright 2018-2025 by Romano Giannetti +% Copyright 2015-2025 by Stefan Lindner +% Copyright 2013-2025 by Stefan Erhardt +% Copyright 2007-2025 by Massimo Redaelli % % This file may be distributed and/or modified % @@ -2224,10 +2224,10 @@ %%%%%%%%%%% Springe nach tex/pgfcircshapes %%%---------- open: tex/pgfcircshapes.tex -% Copyright 2018-2024 by Romano Giannetti -% Copyright 2015-2024 by Stefan Lindner -% Copyright 2013-2024 by Stefan Erhardt -% Copyright 2007-2024 by Massimo Redaelli +% Copyright 2018-2025 by Romano Giannetti +% Copyright 2015-2025 by Stefan Lindner +% Copyright 2013-2025 by Stefan Erhardt +% Copyright 2007-2025 by Massimo Redaelli % % This file may be distributed and/or modified % @@ -3030,10 +3030,10 @@ %%%---------- close: tex/pgfcircshapes %%%%%%%%%%% Springe nach tex/pgfcircmonopoles %%%---------- open: tex/pgfcircmonopoles.tex -% Copyright 2018-2024 by Romano Giannetti -% Copyright 2015-2024 by Stefan Lindner -% Copyright 2013-2024 by Stefan Erhardt -% Copyright 2007-2024 by Massimo Redaelli +% Copyright 2018-2025 by Romano Giannetti +% Copyright 2015-2025 by Stefan Lindner +% Copyright 2013-2025 by Stefan Erhardt +% Copyright 2007-2025 by Massimo Redaelli % % This file may be distributed and/or modified % @@ -4046,10 +4046,10 @@ %%%---------- close: tex/pgfcircmonopoles %%%%%%%%%%% Springe nach tex/pgfcircbipoles %%%---------- open: tex/pgfcircbipoles.tex -% Copyright 2018-2024 by Romano Giannetti -% Copyright 2015-2024 by Stefan Lindner -% Copyright 2013-2024 by Stefan Erhardt -% Copyright 2007-2024 by Massimo Redaelli +% Copyright 2018-2025 by Romano Giannetti +% Copyright 2015-2025 by Stefan Lindner +% Copyright 2013-2025 by Stefan Erhardt +% Copyright 2007-2025 by Massimo Redaelli % % This file may be distributed and/or modified % @@ -9943,10 +9943,10 @@ %%%---------- close: tex/pgfcircbipoles %%%%%%%%%%% Springe nach tex/pgfcirctripoles %%%---------- open: tex/pgfcirctripoles.tex -% Copyright 2018-2024 by Romano Giannetti -% Copyright 2015-2024 by Stefan Lindner -% Copyright 2013-2024 by Stefan Erhardt -% Copyright 2007-2024 by Massimo Redaelli +% Copyright 2018-2025 by Romano Giannetti +% Copyright 2015-2025 by Stefan Lindner +% Copyright 2013-2025 by Stefan Erhardt +% Copyright 2007-2025 by Massimo Redaelli % % This file may be distributed and/or modified % @@ -15850,10 +15850,10 @@ %%%---------- close: tex/pgfcirctripoles %%%%%%%%%%% Springe nach tex/pgfcircquadpoles %%%---------- open: tex/pgfcircquadpoles.tex -% Copyright 2018-2024 by Romano Giannetti -% Copyright 2015-2024 by Stefan Lindner -% Copyright 2013-2024 by Stefan Erhardt -% Copyright 2007-2024 by Massimo Redaelli +% Copyright 2018-2025 by Romano Giannetti +% Copyright 2015-2025 by Stefan Lindner +% Copyright 2013-2025 by Stefan Erhardt +% Copyright 2007-2025 by Massimo Redaelli % % This file may be distributed and/or modified % @@ -17137,10 +17137,10 @@ %%%---------- close: tex/pgfcircquadpoles %%%%%%%%%%% Springe nach tex/pgfcircmultipoles %%%---------- open: tex/pgfcircmultipoles.tex -% Copyright 2018-2024 by Romano Giannetti -% Copyright 2015-2024 by Stefan Lindner -% Copyright 2013-2024 by Stefan Erhardt -% Copyright 2007-2024 by Massimo Redaelli +% Copyright 2018-2025 by Romano Giannetti +% Copyright 2015-2025 by Stefan Lindner +% Copyright 2013-2025 by Stefan Erhardt +% Copyright 2007-2025 by Massimo Redaelli % % This file may be distributed and/or modified % @@ -19831,10 +19831,10 @@ %%%%%%%%%%% Springe nach tex/pgfcirclabel %%%---------- open: tex/pgfcirclabel.tex -% Copyright 2018-2024 by Romano Giannetti -% Copyright 2015-2024 by Stefan Lindner -% Copyright 2013-2024 by Stefan Erhardt -% Copyright 2007-2024 by Massimo Redaelli +% Copyright 2018-2025 by Romano Giannetti +% Copyright 2015-2025 by Stefan Lindner +% Copyright 2013-2025 by Stefan Erhardt +% Copyright 2007-2025 by Massimo Redaelli % % This file may be distributed and/or modified % @@ -20200,10 +20200,10 @@ %%%---------- close: tex/pgfcirclabel %%%%%%%%%%% Springe nach tex/pgfcircvoltage %%%---------- open: tex/pgfcircvoltage.tex -% Copyright 2018-2024 by Romano Giannetti -% Copyright 2015-2024 by Stefan Lindner -% Copyright 2013-2024 by Stefan Erhardt -% Copyright 2007-2024 by Massimo Redaelli +% Copyright 2018-2025 by Romano Giannetti +% Copyright 2015-2025 by Stefan Lindner +% Copyright 2013-2025 by Stefan Erhardt +% Copyright 2007-2025 by Massimo Redaelli % % This file may be distributed and/or modified % @@ -20749,10 +20749,10 @@ %%%---------- close: tex/pgfcircvoltage %%%%%%%%%%% Springe nach tex/pgfcirccurrent %%%---------- open: tex/pgfcirccurrent.tex -% Copyright 2018-2024 by Romano Giannetti -% Copyright 2015-2024 by Stefan Lindner -% Copyright 2013-2024 by Stefan Erhardt -% Copyright 2007-2024 by Massimo Redaelli +% Copyright 2018-2025 by Romano Giannetti +% Copyright 2015-2025 by Stefan Lindner +% Copyright 2013-2025 by Stefan Erhardt +% Copyright 2007-2025 by Massimo Redaelli % % This file may be distributed and/or modified % @@ -20964,10 +20964,10 @@ %%%---------- close: tex/pgfcirccurrent %%%%%%%%%%% Springe nach tex/pgfcircflow %%%---------- open: tex/pgfcircflow.tex -% Copyright 2018-2024 by Romano Giannetti -% Copyright 2015-2024 by Stefan Lindner -% Copyright 2013-2024 by Stefan Erhardt -% Copyright 2007-2024 by Massimo Redaelli +% Copyright 2018-2025 by Romano Giannetti +% Copyright 2015-2025 by Stefan Lindner +% Copyright 2013-2025 by Stefan Erhardt +% Copyright 2007-2025 by Massimo Redaelli % % This file may be distributed and/or modified % @@ -21261,10 +21261,10 @@ %%%%%%%%%%% Springe nach tex/pgfcircpath %%%---------- open: tex/pgfcircpath.tex -% Copyright 2018-2024 by Romano Giannetti -% Copyright 2015-2024 by Stefan Lindner -% Copyright 2013-2024 by Stefan Erhardt -% Copyright 2007-2024 by Massimo Redaelli +% Copyright 2018-2025 by Romano Giannetti +% Copyright 2015-2025 by Stefan Lindner +% Copyright 2013-2025 by Stefan Erhardt +% Copyright 2007-2025 by Massimo Redaelli % % This file may be distributed and/or modified % diff --git a/Master/texmf-dist/tex/context/third/circuitikz/t-circuitikz-1.2.7.tex b/Master/texmf-dist/tex/context/third/circuitikz/t-circuitikz-1.2.7.tex index 52008ac9933..9def87d0ae8 100644 --- a/Master/texmf-dist/tex/context/third/circuitikz/t-circuitikz-1.2.7.tex +++ b/Master/texmf-dist/tex/context/third/circuitikz/t-circuitikz-1.2.7.tex @@ -1,7 +1,7 @@ -% Copyright 2018-2024 by Romano Giannetti -% Copyright 2015-2024 by Stefan Lindner -% Copyright 2013-2024 by Stefan Erhardt -% Copyright 2007-2024 by Massimo Redaelli +% Copyright 2018-2025 by Romano Giannetti +% Copyright 2015-2025 by Stefan Lindner +% Copyright 2013-2025 by Stefan Erhardt +% Copyright 2007-2025 by Massimo Redaelli % % This file may be distributed and/or modified % @@ -32,10 +32,10 @@ %%%%%%%%%%% Springe nach tex/pgfcirc.defines %%%---------- open: tex/pgfcirc.defines.tex -% Copyright 2018-2024 by Romano Giannetti -% Copyright 2015-2024 by Stefan Lindner -% Copyright 2013-2024 by Stefan Erhardt -% Copyright 2007-2024 by Massimo Redaelli +% Copyright 2018-2025 by Romano Giannetti +% Copyright 2015-2025 by Stefan Lindner +% Copyright 2013-2025 by Stefan Erhardt +% Copyright 2007-2025 by Massimo Redaelli % % This file may be distributed and/or modified % @@ -2353,10 +2353,10 @@ %%%---------- close: tex/pgfcirc.defines %%%%%%%%%%% Springe nach tex/pgfcircutils %%%---------- open: tex/pgfcircutils.tex -% Copyright 2018-2024 by Romano Giannetti -% Copyright 2015-2024 by Stefan Lindner -% Copyright 2013-2024 by Stefan Erhardt -% Copyright 2007-2024 by Massimo Redaelli +% Copyright 2018-2025 by Romano Giannetti +% Copyright 2015-2025 by Stefan Lindner +% Copyright 2013-2025 by Stefan Erhardt +% Copyright 2007-2025 by Massimo Redaelli % % This file may be distributed and/or modified % @@ -2448,10 +2448,10 @@ %%%%%%%%%%% Springe nach tex/pgfcircshapes %%%---------- open: tex/pgfcircshapes.tex -% Copyright 2018-2024 by Romano Giannetti -% Copyright 2015-2024 by Stefan Lindner -% Copyright 2013-2024 by Stefan Erhardt -% Copyright 2007-2024 by Massimo Redaelli +% Copyright 2018-2025 by Romano Giannetti +% Copyright 2015-2025 by Stefan Lindner +% Copyright 2013-2025 by Stefan Erhardt +% Copyright 2007-2025 by Massimo Redaelli % % This file may be distributed and/or modified % @@ -3260,10 +3260,10 @@ %%%---------- close: tex/pgfcircshapes %%%%%%%%%%% Springe nach tex/pgfcircmonopoles %%%---------- open: tex/pgfcircmonopoles.tex -% Copyright 2018-2024 by Romano Giannetti -% Copyright 2015-2024 by Stefan Lindner -% Copyright 2013-2024 by Stefan Erhardt -% Copyright 2007-2024 by Massimo Redaelli +% Copyright 2018-2025 by Romano Giannetti +% Copyright 2015-2025 by Stefan Lindner +% Copyright 2013-2025 by Stefan Erhardt +% Copyright 2007-2025 by Massimo Redaelli % % This file may be distributed and/or modified % @@ -4362,10 +4362,10 @@ %%%---------- close: tex/pgfcircmonopoles %%%%%%%%%%% Springe nach tex/pgfcircbipoles %%%---------- open: tex/pgfcircbipoles.tex -% Copyright 2018-2024 by Romano Giannetti -% Copyright 2015-2024 by Stefan Lindner -% Copyright 2013-2024 by Stefan Erhardt -% Copyright 2007-2024 by Massimo Redaelli +% Copyright 2018-2025 by Romano Giannetti +% Copyright 2015-2025 by Stefan Lindner +% Copyright 2013-2025 by Stefan Erhardt +% Copyright 2007-2025 by Massimo Redaelli % % This file may be distributed and/or modified % @@ -10525,10 +10525,10 @@ %%%---------- close: tex/pgfcircbipoles %%%%%%%%%%% Springe nach tex/pgfcirctripoles %%%---------- open: tex/pgfcirctripoles.tex -% Copyright 2018-2024 by Romano Giannetti -% Copyright 2015-2024 by Stefan Lindner -% Copyright 2013-2024 by Stefan Erhardt -% Copyright 2007-2024 by Massimo Redaelli +% Copyright 2018-2025 by Romano Giannetti +% Copyright 2015-2025 by Stefan Lindner +% Copyright 2013-2025 by Stefan Erhardt +% Copyright 2007-2025 by Massimo Redaelli % % This file may be distributed and/or modified % @@ -16959,10 +16959,10 @@ %%%---------- close: tex/pgfcirctripoles %%%%%%%%%%% Springe nach tex/pgfcircquadpoles %%%---------- open: tex/pgfcircquadpoles.tex -% Copyright 2018-2024 by Romano Giannetti -% Copyright 2015-2024 by Stefan Lindner -% Copyright 2013-2024 by Stefan Erhardt -% Copyright 2007-2024 by Massimo Redaelli +% Copyright 2018-2025 by Romano Giannetti +% Copyright 2015-2025 by Stefan Lindner +% Copyright 2013-2025 by Stefan Erhardt +% Copyright 2007-2025 by Massimo Redaelli % % This file may be distributed and/or modified % @@ -18705,10 +18705,10 @@ %%%---------- close: tex/pgfcircquadpoles %%%%%%%%%%% Springe nach tex/pgfcircmultipoles %%%---------- open: tex/pgfcircmultipoles.tex -% Copyright 2018-2024 by Romano Giannetti -% Copyright 2015-2024 by Stefan Lindner -% Copyright 2013-2024 by Stefan Erhardt -% Copyright 2007-2024 by Massimo Redaelli +% Copyright 2018-2025 by Romano Giannetti +% Copyright 2015-2025 by Stefan Lindner +% Copyright 2013-2025 by Stefan Erhardt +% Copyright 2007-2025 by Massimo Redaelli % % This file may be distributed and/or modified % @@ -21736,10 +21736,10 @@ %%%%%%%%%%% Springe nach tex/pgfcirclabel %%%---------- open: tex/pgfcirclabel.tex -% Copyright 2018-2024 by Romano Giannetti -% Copyright 2015-2024 by Stefan Lindner -% Copyright 2013-2024 by Stefan Erhardt -% Copyright 2007-2024 by Massimo Redaelli +% Copyright 2018-2025 by Romano Giannetti +% Copyright 2015-2025 by Stefan Lindner +% Copyright 2013-2025 by Stefan Erhardt +% Copyright 2007-2025 by Massimo Redaelli % % This file may be distributed and/or modified % @@ -22107,10 +22107,10 @@ %%%---------- close: tex/pgfcirclabel %%%%%%%%%%% Springe nach tex/pgfcircvoltage %%%---------- open: tex/pgfcircvoltage.tex -% Copyright 2018-2024 by Romano Giannetti -% Copyright 2015-2024 by Stefan Lindner -% Copyright 2013-2024 by Stefan Erhardt -% Copyright 2007-2024 by Massimo Redaelli +% Copyright 2018-2025 by Romano Giannetti +% Copyright 2015-2025 by Stefan Lindner +% Copyright 2013-2025 by Stefan Erhardt +% Copyright 2007-2025 by Massimo Redaelli % % This file may be distributed and/or modified % @@ -22738,10 +22738,10 @@ %%%---------- close: tex/pgfcircvoltage %%%%%%%%%%% Springe nach tex/pgfcirccurrent %%%---------- open: tex/pgfcirccurrent.tex -% Copyright 2018-2024 by Romano Giannetti -% Copyright 2015-2024 by Stefan Lindner -% Copyright 2013-2024 by Stefan Erhardt -% Copyright 2007-2024 by Massimo Redaelli +% Copyright 2018-2025 by Romano Giannetti +% Copyright 2015-2025 by Stefan Lindner +% Copyright 2013-2025 by Stefan Erhardt +% Copyright 2007-2025 by Massimo Redaelli % % This file may be distributed and/or modified % @@ -22968,10 +22968,10 @@ %%%---------- close: tex/pgfcirccurrent %%%%%%%%%%% Springe nach tex/pgfcircflow %%%---------- open: tex/pgfcircflow.tex -% Copyright 2018-2024 by Romano Giannetti -% Copyright 2015-2024 by Stefan Lindner -% Copyright 2013-2024 by Stefan Erhardt -% Copyright 2007-2024 by Massimo Redaelli +% Copyright 2018-2025 by Romano Giannetti +% Copyright 2015-2025 by Stefan Lindner +% Copyright 2013-2025 by Stefan Erhardt +% Copyright 2007-2025 by Massimo Redaelli % % This file may be distributed and/or modified % @@ -23292,10 +23292,10 @@ %%%%%%%%%%% Springe nach tex/pgfcircpath %%%---------- open: tex/pgfcircpath.tex -% Copyright 2018-2024 by Romano Giannetti -% Copyright 2015-2024 by Stefan Lindner -% Copyright 2013-2024 by Stefan Erhardt -% Copyright 2007-2024 by Massimo Redaelli +% Copyright 2018-2025 by Romano Giannetti +% Copyright 2015-2025 by Stefan Lindner +% Copyright 2013-2025 by Stefan Erhardt +% Copyright 2007-2025 by Massimo Redaelli % % This file may be distributed and/or modified % diff --git a/Master/texmf-dist/tex/context/third/circuitikz/t-circuitikz-1.4.6.tex b/Master/texmf-dist/tex/context/third/circuitikz/t-circuitikz-1.4.6.tex index 422784d674b..1ae3bf3d7dc 100644 --- a/Master/texmf-dist/tex/context/third/circuitikz/t-circuitikz-1.4.6.tex +++ b/Master/texmf-dist/tex/context/third/circuitikz/t-circuitikz-1.4.6.tex @@ -1,7 +1,7 @@ -% Copyright 2018-2024 by Romano Giannetti -% Copyright 2015-2024 by Stefan Lindner -% Copyright 2013-2024 by Stefan Erhardt -% Copyright 2007-2024 by Massimo Redaelli +% Copyright 2018-2025 by Romano Giannetti +% Copyright 2015-2025 by Stefan Lindner +% Copyright 2013-2025 by Stefan Erhardt +% Copyright 2007-2025 by Massimo Redaelli % % This file may be distributed and/or modified % @@ -32,10 +32,10 @@ %%%%%%%%%%% Springe nach tex/pgfcirc.defines %%%---------- open: tex/pgfcirc.defines.tex -% Copyright 2018-2024 by Romano Giannetti -% Copyright 2015-2024 by Stefan Lindner -% Copyright 2013-2024 by Stefan Erhardt -% Copyright 2007-2024 by Massimo Redaelli +% Copyright 2018-2025 by Romano Giannetti +% Copyright 2015-2025 by Stefan Lindner +% Copyright 2013-2025 by Stefan Erhardt +% Copyright 2007-2025 by Massimo Redaelli % % This file may be distributed and/or modified % @@ -927,10 +927,10 @@ %%%---------- close: tex/pgfcirc.defines %%%%%%%%%%% Springe nach tex/pgfcircutils %%%---------- open: tex/pgfcircutils.tex -% Copyright 2018-2024 by Romano Giannetti -% Copyright 2015-2024 by Stefan Lindner -% Copyright 2013-2024 by Stefan Erhardt -% Copyright 2007-2024 by Massimo Redaelli +% Copyright 2018-2025 by Romano Giannetti +% Copyright 2015-2025 by Stefan Lindner +% Copyright 2013-2025 by Stefan Erhardt +% Copyright 2007-2025 by Massimo Redaelli % % This file may be distributed and/or modified % @@ -1332,10 +1332,10 @@ %%%---------- close: tex/pgfcircutils %%%%%%%%%%% Springe nach tex/pgfcircpath %%%---------- open: tex/pgfcircpath.tex -% Copyright 2018-2024 by Romano Giannetti -% Copyright 2015-2024 by Stefan Lindner -% Copyright 2013-2024 by Stefan Erhardt -% Copyright 2007-2024 by Massimo Redaelli +% Copyright 2018-2025 by Romano Giannetti +% Copyright 2015-2025 by Stefan Lindner +% Copyright 2013-2025 by Stefan Erhardt +% Copyright 2007-2025 by Massimo Redaelli % % This file may be distributed and/or modified % @@ -1697,10 +1697,10 @@ %%%%%%%%%%% Springe nach tex/pgfcircshapes %%%---------- open: tex/pgfcircshapes.tex -% Copyright 2018-2024 by Romano Giannetti -% Copyright 2015-2024 by Stefan Lindner -% Copyright 2013-2024 by Stefan Erhardt -% Copyright 2007-2024 by Massimo Redaelli +% Copyright 2018-2025 by Romano Giannetti +% Copyright 2015-2025 by Stefan Lindner +% Copyright 2013-2025 by Stefan Erhardt +% Copyright 2007-2025 by Massimo Redaelli % % This file may be distributed and/or modified % @@ -2519,10 +2519,10 @@ %%%---------- close: tex/pgfcircshapes %%%%%%%%%%% Springe nach tex/pgfcircmonopoles %%%---------- open: tex/pgfcircmonopoles.tex -% Copyright 2018-2024 by Romano Giannetti -% Copyright 2015-2024 by Stefan Lindner -% Copyright 2013-2024 by Stefan Erhardt -% Copyright 2007-2024 by Massimo Redaelli +% Copyright 2018-2025 by Romano Giannetti +% Copyright 2015-2025 by Stefan Lindner +% Copyright 2013-2025 by Stefan Erhardt +% Copyright 2007-2025 by Massimo Redaelli % % This file may be distributed and/or modified % @@ -3722,10 +3722,10 @@ %%%---------- close: tex/pgfcircmonopoles %%%%%%%%%%% Springe nach tex/pgfcircbipoles %%%---------- open: tex/pgfcircbipoles.tex -% Copyright 2018-2024 by Romano Giannetti -% Copyright 2015-2024 by Stefan Lindner -% Copyright 2013-2024 by Stefan Erhardt -% Copyright 2007-2024 by Massimo Redaelli +% Copyright 2018-2025 by Romano Giannetti +% Copyright 2015-2025 by Stefan Lindner +% Copyright 2013-2025 by Stefan Erhardt +% Copyright 2007-2025 by Massimo Redaelli % % This file may be distributed and/or modified % @@ -9952,10 +9952,10 @@ %%%---------- close: tex/pgfcircbipoles %%%%%%%%%%% Springe nach tex/pgfcirctripoles %%%---------- open: tex/pgfcirctripoles.tex -% Copyright 2018-2024 by Romano Giannetti -% Copyright 2015-2024 by Stefan Lindner -% Copyright 2013-2024 by Stefan Erhardt -% Copyright 2007-2024 by Massimo Redaelli +% Copyright 2018-2025 by Romano Giannetti +% Copyright 2015-2025 by Stefan Lindner +% Copyright 2013-2025 by Stefan Erhardt +% Copyright 2007-2025 by Massimo Redaelli % % This file may be distributed and/or modified % @@ -18520,10 +18520,10 @@ %%%---------- close: tex/pgfcirctripoles %%%%%%%%%%% Springe nach tex/pgfcircquadpoles %%%---------- open: tex/pgfcircquadpoles.tex -% Copyright 2018-2024 by Romano Giannetti -% Copyright 2015-2024 by Stefan Lindner -% Copyright 2013-2024 by Stefan Erhardt -% Copyright 2007-2024 by Massimo Redaelli +% Copyright 2018-2025 by Romano Giannetti +% Copyright 2015-2025 by Stefan Lindner +% Copyright 2013-2025 by Stefan Erhardt +% Copyright 2007-2025 by Massimo Redaelli % % This file may be distributed and/or modified % @@ -22281,10 +22281,10 @@ %%%---------- close: tex/pgfcircquadpoles %%%%%%%%%%% Springe nach tex/pgfcircmultipoles %%%---------- open: tex/pgfcircmultipoles.tex -% Copyright 2018-2024 by Romano Giannetti -% Copyright 2015-2024 by Stefan Lindner -% Copyright 2013-2024 by Stefan Erhardt -% Copyright 2007-2024 by Massimo Redaelli +% Copyright 2018-2025 by Romano Giannetti +% Copyright 2015-2025 by Stefan Lindner +% Copyright 2013-2025 by Stefan Erhardt +% Copyright 2007-2025 by Massimo Redaelli % % This file may be distributed and/or modified % @@ -24442,10 +24442,10 @@ %%%%%%%%%%% Springe nach tex/pgfcirclabel %%%---------- open: tex/pgfcirclabel.tex -% Copyright 2018-2024 by Romano Giannetti -% Copyright 2015-2024 by Stefan Lindner -% Copyright 2013-2024 by Stefan Erhardt -% Copyright 2007-2024 by Massimo Redaelli +% Copyright 2018-2025 by Romano Giannetti +% Copyright 2015-2025 by Stefan Lindner +% Copyright 2013-2025 by Stefan Erhardt +% Copyright 2007-2025 by Massimo Redaelli % % This file may be distributed and/or modified % @@ -24844,10 +24844,10 @@ %%%---------- close: tex/pgfcirclabel %%%%%%%%%%% Springe nach tex/pgfcircvoltage %%%---------- open: tex/pgfcircvoltage.tex -% Copyright 2018-2024 by Romano Giannetti -% Copyright 2015-2024 by Stefan Lindner -% Copyright 2013-2024 by Stefan Erhardt -% Copyright 2007-2024 by Massimo Redaelli +% Copyright 2018-2025 by Romano Giannetti +% Copyright 2015-2025 by Stefan Lindner +% Copyright 2013-2025 by Stefan Erhardt +% Copyright 2007-2025 by Massimo Redaelli % % This file may be distributed and/or modified % @@ -25554,10 +25554,10 @@ %%%---------- close: tex/pgfcircvoltage %%%%%%%%%%% Springe nach tex/pgfcirccurrent %%%---------- open: tex/pgfcirccurrent.tex -% Copyright 2018-2024 by Romano Giannetti -% Copyright 2015-2024 by Stefan Lindner -% Copyright 2013-2024 by Stefan Erhardt -% Copyright 2007-2024 by Massimo Redaelli +% Copyright 2018-2025 by Romano Giannetti +% Copyright 2015-2025 by Stefan Lindner +% Copyright 2013-2025 by Stefan Erhardt +% Copyright 2007-2025 by Massimo Redaelli % % This file may be distributed and/or modified % @@ -25800,10 +25800,10 @@ %%%---------- close: tex/pgfcirccurrent %%%%%%%%%%% Springe nach tex/pgfcircflow %%%---------- open: tex/pgfcircflow.tex -% Copyright 2018-2024 by Romano Giannetti -% Copyright 2015-2024 by Stefan Lindner -% Copyright 2013-2024 by Stefan Erhardt -% Copyright 2007-2024 by Massimo Redaelli +% Copyright 2018-2025 by Romano Giannetti +% Copyright 2015-2025 by Stefan Lindner +% Copyright 2013-2025 by Stefan Erhardt +% Copyright 2007-2025 by Massimo Redaelli % % This file may be distributed and/or modified % diff --git a/Master/texmf-dist/tex/context/third/circuitikz/t-circuitikz.tex b/Master/texmf-dist/tex/context/third/circuitikz/t-circuitikz.tex index f85b8ab58b3..6f3c8c364f5 100644 --- a/Master/texmf-dist/tex/context/third/circuitikz/t-circuitikz.tex +++ b/Master/texmf-dist/tex/context/third/circuitikz/t-circuitikz.tex @@ -1,7 +1,7 @@ -% Copyright 2018-2024 by Romano Giannetti -% Copyright 2015-2024 by Stefan Lindner -% Copyright 2013-2024 by Stefan Erhardt -% Copyright 2007-2024 by Massimo Redaelli +% Copyright 2018-2025 by Romano Giannetti +% Copyright 2015-2025 by Stefan Lindner +% Copyright 2013-2025 by Stefan Erhardt +% Copyright 2007-2025 by Massimo Redaelli % % This file may be distributed and/or modified % @@ -16,8 +16,8 @@ \startmodule[circuitikz] \usemodule[tikz] -\def\pgfcircversion{1.7.0} -\def\pgfcircversiondate{2024/08/03} +\def\pgfcircversion{1.7.1} +\def\pgfcircversiondate{2025/01/10} \writestatus{loading}{\pgfcircversiondate{} The CircuiTikz circuit drawing package version \pgfcircversion} diff --git a/Master/texmf-dist/tex/context/third/expkv-bundle/t-expkv-cs.tex b/Master/texmf-dist/tex/context/third/expkv-bundle/t-expkv-cs.tex index f4fcf8fdc0f..73aa33ef1c1 100644 --- a/Master/texmf-dist/tex/context/third/expkv-bundle/t-expkv-cs.tex +++ b/Master/texmf-dist/tex/context/third/expkv-bundle/t-expkv-cs.tex @@ -13,7 +13,7 @@ %% See http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -%% Copyright (C) 2020-2023 Jonathan P. Spratte +%% Copyright (C) 2020-2024 Jonathan P. Spratte %% %% This work may be distributed and/or modified under the conditions of the %% LaTeX Project Public License (LPPL), either version 1.3c of this license or diff --git a/Master/texmf-dist/tex/context/third/expkv-bundle/t-expkv-def.tex b/Master/texmf-dist/tex/context/third/expkv-bundle/t-expkv-def.tex index 5752a499295..2dd8f672f67 100644 --- a/Master/texmf-dist/tex/context/third/expkv-bundle/t-expkv-def.tex +++ b/Master/texmf-dist/tex/context/third/expkv-bundle/t-expkv-def.tex @@ -13,7 +13,7 @@ %% See http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -%% Copyright (C) 2020-2023 Jonathan P. Spratte +%% Copyright (C) 2020-2024 Jonathan P. Spratte %% %% This work may be distributed and/or modified under the conditions of the %% LaTeX Project Public License (LPPL), either version 1.3c of this license or diff --git a/Master/texmf-dist/tex/context/third/expkv-bundle/t-expkv-pop.tex b/Master/texmf-dist/tex/context/third/expkv-bundle/t-expkv-pop.tex index 4e66a908a9c..0309abd776b 100644 --- a/Master/texmf-dist/tex/context/third/expkv-bundle/t-expkv-pop.tex +++ b/Master/texmf-dist/tex/context/third/expkv-bundle/t-expkv-pop.tex @@ -13,7 +13,7 @@ %% See http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -%% Copyright (C) 2020-2023 Jonathan P. Spratte +%% Copyright (C) 2020-2024 Jonathan P. Spratte %% %% This work may be distributed and/or modified under the conditions of the %% LaTeX Project Public License (LPPL), either version 1.3c of this license or diff --git a/Master/texmf-dist/tex/context/third/expkv-bundle/t-expkv.tex b/Master/texmf-dist/tex/context/third/expkv-bundle/t-expkv.tex index 489f2df0159..b6acaf2e7e7 100644 --- a/Master/texmf-dist/tex/context/third/expkv-bundle/t-expkv.tex +++ b/Master/texmf-dist/tex/context/third/expkv-bundle/t-expkv.tex @@ -13,7 +13,7 @@ %% See http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -%% Copyright (C) 2020-2023 Jonathan P. Spratte +%% Copyright (C) 2020-2024 Jonathan P. Spratte %% %% This work may be distributed and/or modified under the conditions of the %% LaTeX Project Public License (LPPL), either version 1.3c of this license or diff --git a/Master/texmf-dist/tex/context/third/markdown/t-markdown.tex b/Master/texmf-dist/tex/context/third/markdown/t-markdown.tex index 790807abc7c..67ca8d8d5c6 100644 --- a/Master/texmf-dist/tex/context/third/markdown/t-markdown.tex +++ b/Master/texmf-dist/tex/context/third/markdown/t-markdown.tex @@ -6,7 +6,7 @@ %% %% markdown.dtx (with options: `context') %% -%% Copyright (C) 2016-2024 Vít Starý Novotný, Andrej Genčur +%% Copyright (C) 2016-2025 Vít Starý Novotný, Andrej Genčur %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3c @@ -43,7 +43,7 @@ %% The names of the source files used are shown above. %% \unprotect -\ifx\ExplSyntaxOn\undefined +\expandafter\ifx\csname ExplSyntaxOn\endcsname\relax \input expl3-generic \fi \ExplSyntaxOn @@ -66,7 +66,10 @@ \input markdown/markdown \let\startmarkdown\relax \let\stopmarkdown\relax +\let\startyaml\relax +\let\stopyaml\relax \let\inputmarkdown\relax +\let\inputyaml\relax \ExplSyntaxOn \cs_new:Npn \setupmarkdown @@ -75,6 +78,9 @@ \__markdown_setup:n { #1 } } +\cs_gset_eq:NN + \setupyaml + \setupmarkdown \cs_new:Nn \__markdown_caseless:N { \regex_replace_all:nnN @@ -94,6 +100,8 @@ \__markdown_define_renderers: \__markdown_define_renderer_prototypes: } +\prop_new:N + \g__markdown_context_built_in_themes_prop \ExplSyntaxOff \def\markdownMakeOther{% \count0=128\relax @@ -112,6 +120,12 @@ \fi \markdownInput{#2}% \endgroup}% +\long\def\inputyaml{% + \dosingleempty + \doinputyaml}% +\long\def\doinputyaml[#1]#2{% + \doinputmarkdown + [jekyllData, expectJekyllData, ensureJekyllData, #1]{#2}}% \startluacode document.markdown_buffering = false local function preserve_trailing_spaces(line) @@ -132,36 +146,153 @@ |gdef|stopmarkdown{% |ctxlua{document.markdown_buffering = false}% |markdownEnd}% + |gdef|startyaml{% + |begingroup + |ctxlua{document.markdown_buffering = true}% + |setupyaml[jekyllData, expectJekyllData, ensureJekyllData]% + |markdownReadAndConvert{\stopyaml}% + {|stopyaml}}% + |gdef|stopyaml{% + |ctxlua{document.markdown_buffering = false}% + |yamlEnd}% |endgroup \ExplSyntaxOn +\prop_new:N \g__markdown_context_loaded_themes_linenos_prop +\prop_new:N \g__markdown_context_loaded_themes_versions_prop \cs_gset:Nn - \__markdown_load_theme:nn + \__markdown_load_theme:nnn { - \file_if_exist:nTF - { t - markdown theme #2.tex } + \bool_if:nTF + { + \bool_lazy_or_p:nn + { + \prop_if_in_p:Nn + \g__markdown_context_built_in_themes_prop + { #1 } + } + { + \file_if_exist_p:n + { t - markdown theme #3.tex } + } + } { - \msg_info:nnn - { markdown } - { loading-context-theme } + \prop_get:NnNTF + \g__markdown_context_loaded_themes_linenos_prop { #1 } - \usemodule - [ t ] - [ markdown theme #2 ] + \l_tmpa_tl + { + \prop_get:NnN + \g__markdown_context_loaded_themes_versions_prop + { #1 } + \l_tmpb_tl + \str_if_eq:nVTF + { #2 } + \l_tmpb_tl + { + \msg_warning:nnnVn + { markdown } + { repeatedly-loaded-context-theme } + { #1 } + \l_tmpa_tl + { #2 } + } + { + \msg_error:nnnnVV + { markdown } + { different-versions-of-context-theme } + { #1 } + { #2 } + \l_tmpb_tl + \l_tmpa_tl + } + } + { + \prop_gput:Nnx + \g__markdown_context_loaded_themes_linenos_prop + { #1 } + { \tex_the:D \tex_inputlineno:D } % noqa: W200 + \prop_gput:Nnn + \g__markdown_context_loaded_themes_versions_prop + { #1 } + { #2 } + \prop_if_in:NnTF + \g__markdown_context_built_in_themes_prop + { #1 } + { + \msg_info:nnnn + { markdown } + { loading-built-in-context-theme } + { #1 } + { #2 } + \prop_item:Nn + \g__markdown_context_built_in_themes_prop + { #1 } + } + { + \msg_info:nnnn + { markdown } + { loading-context-theme } + { #1 } + { #2 } + \usemodule + [ t ] + [ markdown theme #3 ] + } + } } { - \__markdown_plain_tex_load_theme:nn + \__markdown_plain_tex_load_theme:nnn { #1 } { #2 } + { #3 } } } \msg_new:nnn { markdown } + { loading-built-in-context-theme } + { Loading~version~#2~of~built-in~ConTeXt~Markdown~theme~#1 } +\msg_new:nnn + { markdown } { loading-context-theme } - { Loading~ConTeXt~Markdown~theme~#1 } + { Loading~version~#2~of~ConTeXt~Markdown~theme~#1 } +\msg_new:nnn + { markdown } + { repeatedly-loaded-context-theme } + { + Version~#3~of~ConTeXt~Markdown~theme~#1~was~previously~ + loaded~on~line~#2,~not~loading~it~again + } +\msg_new:nnn + { markdown } + { different-versions-of-context-theme } + { + Tried~to~load~version~#2~of~ConTeXt~Markdown~theme~#1~ + but~version~#3~has~already~been~loaded~on~line~#4 + } +\str_if_eq:VVT + \c__markdown_top_layer_tl + \c__markdown_option_layer_context_tl + { + \use:c + { ExplSyntaxOff } + \__markdown_if_option:nF + { noDefaults } + { + \__markdown_if_option:nTF + { experimental } + { + \__markdown_setup:n + { theme = witiko/markdown/defaults@experimental } + } + { + \__markdown_setup:n + { theme = witiko/markdown/defaults } + } + } + \use:c + { ExplSyntaxOn } + } \ExplSyntaxOff -\markdownIfOption{noDefaults}{}{ - \setupmarkdown[theme=witiko/markdown/defaults] -} \stopmodule \protect \endinput diff --git a/Master/texmf-dist/tex/context/third/markdown/t-markdownthemewitiko_markdown_defaults.tex b/Master/texmf-dist/tex/context/third/markdown/t-markdownthemewitiko_markdown_defaults.tex index dde11e86ae3..6bad0deb7ba 100644 --- a/Master/texmf-dist/tex/context/third/markdown/t-markdownthemewitiko_markdown_defaults.tex +++ b/Master/texmf-dist/tex/context/third/markdown/t-markdownthemewitiko_markdown_defaults.tex @@ -6,7 +6,7 @@ %% %% markdown.dtx (with options: `themes-witiko-markdown-defaults-ctx') %% -%% Copyright (C) 2016-2024 Vít Starý Novotný, Andrej Genčur +%% Copyright (C) 2016-2025 Vít Starý Novotný, Andrej Genčur %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3c @@ -143,7 +143,7 @@ \seq_pop_left:NN \l_tmpa_seq \l_tmpa_tl - \typefile[\l_tmpa_tl][]{#1} + \typefile[ \l_tmpa_tl ][] {#1} } } \ExplSyntaxOff diff --git a/Master/texmf-dist/tex/context/third/memoize/t-memoizable.tex b/Master/texmf-dist/tex/context/third/memoize/t-memoizable.tex index a5191dfade4..fe2bdd94691 100644 --- a/Master/texmf-dist/tex/context/third/memoize/t-memoizable.tex +++ b/Master/texmf-dist/tex/context/third/memoize/t-memoizable.tex @@ -26,11 +26,11 @@ %% (<texmf>/doc/generic/memoize/)FILES. %D \module[ %D file=t-memoizable.tex, -%D version=1.3.0, +%D version=1.4.1, %D title=Memoizable, %D subtitle=A programmer's stub for Memoize, %D author=Saso Zivanovic, -%D date=2024-04-02, +%D date=2024-12-02, %D copyright=Saso Zivanovic, %D license=LPPL, %D ] diff --git a/Master/texmf-dist/tex/context/third/memoize/t-memoize.tex b/Master/texmf-dist/tex/context/third/memoize/t-memoize.tex index aac4dd734a4..19baab25b9d 100644 --- a/Master/texmf-dist/tex/context/third/memoize/t-memoize.tex +++ b/Master/texmf-dist/tex/context/third/memoize/t-memoize.tex @@ -26,11 +26,11 @@ %% (<texmf>/doc/generic/memoize/)FILES. %D \module[ %D file=t-memoize.tex, -%D version=1.3.0, +%D version=1.4.1, %D title=Memoize, %D subtitle=Fast and flexible externalization, %D author=Saso Zivanovic, -%D date=2024-04-02, +%D date=2024-12-02, %D copyright=Saso Zivanovic, %D license=LPPL, %D ] @@ -375,7 +375,10 @@ \ifmemoizing \else \ifmemoize - \xdef\mmz@code@mdfivesum{\pdf@mdfivesum{\the\mmz@mdfive@source}}% + \xdef\mmz@code@mdfivesum{\pdf@mdfivesum{% + \normalexpanded{\the\mmzSalt}% + \the\mmz@mdfive@source + }}% \mmz@trace@code@mdfive \ifnum\mmz@mode=\mmz@mode@recompile\relax \ifnum\pdf@draftmode=0 @@ -653,16 +656,34 @@ {}% }, clear context/.value forbidden, - meaning to context/.code={\forcsvlist\mmz@mtoc{#1}}, - csname meaning to context/.code={\mmz@mtoc@csname{#1}}, - key meaning to context/.code={% + meaning to context/.code={\mmz@Cos\forcsvlist\mmz@mtoc{#1}}, + csname meaning to context/.code={\mmz@Cos\mmz@mtoc@csname{#1}}, + key meaning to context/.code={\mmz@Cos \forcsvlist\mmz@mtoc\mmz@mtoc@keycmd{#1}}, - key value to context/.code={\forcsvlist\mmz@mtoc@key{#1}}, - /handlers/.meaning to context/.code={\normalexpanded{% + key value to context/.code={\mmz@Cos\forcsvlist\mmz@mtoc@key{#1}}, + /handlers/.meaning to context/.code={\mmz@Cos\normalexpanded{% \noexpand\mmz@mtoc@csname{pgfk@\pgfkeyscurrentpath/.@cmd}}}, - /handlers/.value to context/.code={% + /handlers/.value to context/.code={\mmz@Cos \normalexpanded{\noexpand\mmz@mtoc@csname{pgfk@\pgfkeyscurrentpath}}}, } +\newtoks\mmzSalt +\mmzset{ + salt/.code=\expandafter\toksapp\expandafter\mmzSalt{#1,}, + clear salt/.value forbidden, + clear salt/.code=\mmzSalt{}, + meaning to salt/.code={\mmz@coS\forcsvlist\mmz@mtoc{#1}}, + csname meaning to salt/.code={\mmz@coS\mmz@mtoc@csname{#1}}, + key meaning to salt/.code={\mmz@coS + \forcsvlist\mmz@mtoc\mmz@mtoc@keycmd{#1}}, + key value to salt/.code={\mmz@coS + \forcsvlist\mmz@mtoc@key{#1}}, + /handlers/.meaning to salt/.code={\mmz@coS\normalexpanded{% + \noexpand\mmz@mtoc@csname{pgfk@\pgfkeyscurrentpath/.@cmd}}}, + /handlers/.value to salt/.code={\mmz@coS + \normalexpanded{\noexpand\mmz@mtoc@csname{pgfk@\pgfkeyscurrentpath}}}, +} +\def\mmz@Cos{\def\mmz@context@or@salt{context}} +\def\mmz@coS{\def\mmz@context@or@salt{salt}} \def\mmz@mtoc#1{% \collargs@cs@cases{#1}% {\mmz@mtoc@cmd{#1}}% @@ -683,14 +704,17 @@ \expandafter\mmz@mtoc@csname\expandafter{\string#1}% } \def\mmz@mtoc@csname#1{% - \pgfkeysvalueof{/mmz/context/.@cmd}% - \detokenize{#1}={\expandafter\meaning\csname#1\endcsname}% + \pgfkeysvalueof{/mmz/\mmz@context@or@salt/.@cmd}% + \detokenize{#1}% + \ifcsname#1\endcsname + ={\expandafter\meaning\csname#1\endcsname}% + \fi \pgfeov } \def\mmz@mtoc@key#1{\mmz@mtoc@csname{pgfk@#1}} \def\mmz@mtoc@keycmd#1{\mmz@mtoc@csname{pgfk@#1/.@cmd}} \def\mmz@mtoc@error@notcsorenv#1{% - \PackageError{memoize}{'\detokenize{#1}' passed to key 'meaning to context' + \PackageError{memoize}{'\detokenize{#1}' passed to key 'meaning to \mmz@context@or@salt' is neither a command nor an environment}{}% } \def\mmz@cmemo@path{\mmz@prefix\mmz@code@mdfivesum.memo} @@ -784,6 +808,8 @@ \fi \mmz@trace@resource{#1}% \fi + \csxdef{mmz@resource@\the\mmz@seq}{\mmz@prefix@dir#1}% + \global\advance\mmz@seq1 } \def\mmz@process@ccmemo{% \mmz@trace@process@ccmemo @@ -813,6 +839,7 @@ }% \fi }% + \global\mmz@seq=0 \IfFileExists{\mmz@ccmemo@path}{% \ifmmz@direct@ccmemo@input \input{\mmz@ccmemo@path}% @@ -930,6 +957,7 @@ }) }% }% + \mmz@shipout@unrotate \hoffset\dimexpr\mmz@padding@left - \pdfhorigin\relax \voffset\dimexpr\mmz@padding@top - \pdfvorigin\relax \pdf@primitive\shipout\box\mmz@box @@ -967,6 +995,19 @@ \mmzset{begindocument/.append code={% \edef\mmz@inverse@mag{\expandafter\mmz@Pgf@geT\the\dimexpr 1000pt/\mag}% }} +\ifdef\XeTeXversion{% + \def\mmz@shipout@unrotate{}% +}{% + \ifdef\luatexversion{% + \def\mmz@shipout@unrotate{% + \pdfvariable pageattr {/Rotate 0}% + }% + }{% + \def\mmz@shipout@unrotate{% + \pdfpageattr{/Rotate 0}% + }% + }% +} \let\mmzRegularPages\realpageno \newcount\mmzExternPages \mmzset{ @@ -978,14 +1019,18 @@ }, } \newcount\mmzExtraPages -\def\mmz@include@extern#1#2#3#4#5#6#7#8#9{% - \mmz@seq=#1\relax +\def\mmz@include@extern#1{% + \expandafter\expandafter\expandafter\mmz@include@extern@i + \expandafter\expandafter\expandafter{% + \csname mmz@resource@#1\endcsname}% +} +\def\mmz@include@extern@i#1#2#3#4#5#6#7#8#9{% \setbox\mmz@box=#2{% \setbox0=\hbox{% \lower\dimexpr #5+#7\relax\hbox{% \hskip -#6\relax \setbox0=\hbox{% - \mmz@insertpdfpage{\mmz@extern@path}{1}% + \mmz@insertpdfpage{#1}{1}% }% \unhbox0 }% @@ -1408,6 +1453,20 @@ \pgfeov \AdviceOriginal } +\def\mmz@unknown{} +\mmzset{ + .unknown/.code={% + \eappto\mmz@unknown{,\pgfkeyscurrentkey={#1}}% + }, + begindocument/end/.append code={% + \pgfkeyslet{/mmz/.unknown/.@cmd}\undefined + \expandafter\pgfkeysalso\expandafter{\mmz@unknown}% + }, +} +\def\mmz@makeatletter{% + \edef\mmz@restoreatcatcode{\catcode`\noexpand\@\the\catcode`\@\relax}% + \catcode`\@=11 +} \def\mmz@if@package@loaded#1#2#3{% \mmzset{% begindocument/before/.append code={% @@ -1431,14 +1490,12 @@ }% \ifx\mmz@temp=0 \else - \xtoksapp\mmzCCMemo{% - \normalunexpanded{% - \global\expandafter\advance\csname pgf@picture@serial@count\endcsname - }% - \mmz@temp - }% + \xtoksapp\mmzCCMemo{\noexpand\mmzStepPgfPictureId{\mmz@temp}}% \fi }% + \def\mmzStepPgfPictureId##1{% + \global\advance\pgf@picture@serial@count##1\relax + }% \mmzset{% at begin memoization=\mmzPgfAtBeginMemoization, at end memoization=\mmzPgfAtEndMemoization, diff --git a/Master/texmf-dist/tex/context/third/memoize/t-nomemoize.tex b/Master/texmf-dist/tex/context/third/memoize/t-nomemoize.tex index a476e26599a..ad568dd807b 100644 --- a/Master/texmf-dist/tex/context/third/memoize/t-nomemoize.tex +++ b/Master/texmf-dist/tex/context/third/memoize/t-nomemoize.tex @@ -26,11 +26,11 @@ %% (<texmf>/doc/generic/memoize/)FILES. %D \module[ %D file=t-nomemoize.tex, -%D version=1.3.0, +%D version=1.4.1, %D title=Memoize, %D subtitle=A no-op stub for Memoize, %D author=Saso Zivanovic, -%D date=2024-04-02, +%D date=2024-12-02, %D copyright=Saso Zivanovic, %D license=LPPL, %D ] diff --git a/Master/texmf-dist/tex/context/third/pocketdiary/PocketDiary.mkiv b/Master/texmf-dist/tex/context/third/pocketdiary/PocketDiary.mkiv index fb2172fc6cb..9498200a493 100644 --- a/Master/texmf-dist/tex/context/third/pocketdiary/PocketDiary.mkiv +++ b/Master/texmf-dist/tex/context/third/pocketdiary/PocketDiary.mkiv @@ -1,5 +1,5 @@ %D \module -%D [ file=t-pocketdiary.tex, +%D [ file=t-pocketdiary.mkiv, %D version=2023.04.15, %D title=PocketDiary, %D subtitle=User file for PocketDiary,, @@ -113,7 +113,7 @@ %D Setup the document \starttext - \setuparranging[1*8] % this can be uncommented in t-pocketdiary.tex + \setuparranging[1*8] % this can be uncommented in t-pocketdiary.mkiv \getbuffer[Pocketdiary] \stoptext
\ No newline at end of file diff --git a/Master/texmf-dist/tex/context/third/pocketdiary/t-pocketdiary.mkiv b/Master/texmf-dist/tex/context/third/pocketdiary/t-pocketdiary.mkiv index 4ca5f86989e..9bb83c4c79c 100644 --- a/Master/texmf-dist/tex/context/third/pocketdiary/t-pocketdiary.mkiv +++ b/Master/texmf-dist/tex/context/third/pocketdiary/t-pocketdiary.mkiv @@ -1,6 +1,6 @@ %D \module %D [ file=t-pocketdiary, -%D version="2023-04-15", +%D version=2023-04-15, %D title=PocketDiary \CONTEXT\ User Module, %D subtitle=PocketDiary, %D author=Willi Egger, @@ -283,7 +283,7 @@ \setuplabeltext[nl][sun=Zo] \setuplabeltext[nl][january=Januari] -\setuplabeltext[nl][february=Febrari] +\setuplabeltext[nl][february=Februari] \setuplabeltext[nl][march=Maart] \setuplabeltext[nl][april=April] \setuplabeltext[nl][may=Mei] @@ -555,7 +555,7 @@ %D In the templates a light gray color for (grid)lines is used. Separator %D lines can have %D an individual color too. We define the two colors with arbitrary values. -%D These preset colors can be adjusted in the user file \type{PocketDiary.tex}. +%D These preset colors can be adjusted in the user file \type{PocketDiary.mkiv}. \definecolor[Grid][s=.75] \definecolor[Separatorline][blue] @@ -661,14 +661,14 @@ %D The return value of the moon phase calculation can be either a number, %D representing the day number in the lunar month, or a command to put a %D \METAFUN -graphic (New moon, growing moon, full moon, waning moon). -%D These little graphics are stored in the file \type{moons-MP.tex}. +%D These little graphics are stored in the file \type{moons-MP.mkiv}. -\input moons-MP +\input moons-MP.mkiv %D In this file 4 overlays are defined which are used in a dedicated %D \type{\framed[]{}} to typeset the pictograms. %D -%M \input ./Moonphase/moons-MP +%M \input ./Moonphase/moons-MP.mkiv %M \defineoverlay[waningmoon][\useMPgraphic{Moon::Waning_moon}] %M \defineoverlay[growingmoon][\useMPgraphic{Moon::Growing_moon}] %M \defineoverlay[newmoon][\useMPgraphic{Moon::Newmoon}] @@ -711,13 +711,13 @@ %D %D For sunrise, sunset and light hours exist three \METAFUN\ drawings. %D These are included in the directory \type{Solar} in the file -%D \type{sun-MP.tex}. +%D \type{sun-MP.mkiv}. -\input sun-MP +\input sun-MP.mkiv %D In this file 3 overlays are defined which can then be used as a %D background in a dedicated framed environment. -%M \input ./solar/sun-MP +%M \input ./solar/sun-MP.mkiv %M \defineoverlay[Sunrise][\useMPgraphic{Sun::Sunrise}] %M \defineoverlay[Sunset][\useMPgraphic{Sun::Sunset}] %M \defineoverlay[Light][\useMPgraphic{Sun::Light}] @@ -995,7 +995,7 @@ \define[8]\Dayplan{\ctxlua{thirddata.diary.dayplan(#1,#2,#3,#4,#5,#6,#7,#8)}} -%D The Dayplan-command with the collected parameters is placed in a buffer. This buffer is later called from the user-file \type{PocketDiary.tex} . +%D The Dayplan-command with the collected parameters is placed in a buffer. This buffer is later called from the user-file \type{PocketDiary.mkiv} . \startbuffer[Dayplan] \Dayplan %Weekday,Week,Month,Year,lat,lon,timeoffset,continent @@ -1029,7 +1029,7 @@ \define[8]\Weekendplan{\ctxlua{thirddata.diary.weekendplan(#1,#2,#3,#4,#5,#6,#7,#8)}} -%D Again this command with the collected information of the 8 parameters is placed in a buffer which is called then from the user-file \type{PocketDiary.tex} . +%D Again this command with the collected information of the 8 parameters is placed in a buffer which is called then from the user-file \type{PocketDiary.mkiv} . \startbuffer[Weekendplan] \Weekendplan %Weekday,Week,Month,Year,lat,lon,timeoffset,continent @@ -1075,7 +1075,7 @@ \define[8]\Weekcurrentplan{\ctxlua{thirddata.diary.weekplan(#1,#2,#3,#4,#5,#6,#7,#8)}} -%D And the command together with the gathered parameters is stored in a buffer, which will be used by the user-file \type{PocketDiary.tex} . +%D And the command together with the gathered parameters is stored in a buffer, which will be used by the user-file \type{PocketDiary.mkiv} . \startbuffer[Weekcurrentplan] \Weekcurrentplan %Weekday,Week,Month,Year,lat,lon,timeoffset,continent @@ -1135,7 +1135,7 @@ \define[2]\Monthcurrentplan{\ctxlua{thirddata.diary.monthcurrentplan(#1,#2)}} %D The command is kept together with the gathered parameters in a buffer again. -%D This will be called from the user-file \type{PocketDiary.tex} . +%D This will be called from the user-file \type{PocketDiary.mkiv} . \startbuffer[Monthcurrentplan] \Monthcurrentplan @@ -1168,7 +1168,7 @@ %D \stopplacefigure %D The year table(s) are prepared as the week tables with a table-setup %D sequence, a custom command which resides with the parameters assigned in a -%D buffer, which will again be called from the user-file \type{PocketDiary.tex} +%D buffer, which will again be called from the user-file \type{PocketDiary.mkiv} \startsetups table:year \setupTABLE[column] @@ -1204,7 +1204,7 @@ \define[8]\Daybyday{\ctxlua{thirddata.diary.daybydayplan(#1,#2,#3,#4,#5,#6,#7,#8)}} -%D A buffer contains the command just defined with the gathered information for the parameters. The buffer then is called from the user-file \type{PocketDiary.tex} . +%D A buffer contains the command just defined with the gathered information for the parameters. The buffer then is called from the user-file \type{PocketDiary.mkiv} . \startbuffer[Daybyday] \Daybyday @@ -1278,7 +1278,7 @@ \setupbackgrounds[text][text][background=] \stopsetups -%D All templates for these pages are contained in buffers in order to call them from the user-file \type{PocketDiary.tex} +%D All templates for these pages are contained in buffers in order to call them from the user-file \type{PocketDiary.mkiv} \startbuffer[Contact] \setupheadertexts[{\bf \labeltext{contact}\hfill}] @@ -1455,7 +1455,7 @@ %D %D The arrangement of the 8 pages is not switched on in this file. For the %D purpose of experimenting it is better to keep this command in the user file -%D \type{\type{PocketDiary.tex} } +%D \type{\type{PocketDiary.mkiv} } %D %D \stopsubject |