diff options
14 files changed, 37 insertions, 13 deletions
diff --git a/Master/texmf-dist/doc/fonts/xcharter/README b/Master/texmf-dist/doc/fonts/xcharter/README index b389fce7b94..56bdffeef64 100644 --- a/Master/texmf-dist/doc/fonts/xcharter/README +++ b/Master/texmf-dist/doc/fonts/xcharter/README @@ -1,6 +1,6 @@ XCharter Fonts Michael Sharpe - 2017-12-19 + 2018-04-10 This package is an extension of Bitstream Charter, whose original license is reproduced below, as required under the terms of that license. The extension provides small caps, oldstyle figures and superior figures in all four styles, accompanied by LaTeX font support files. The font files themselves are in otf and pfb formats. The fonts are licensed as Free fonts under the same terms as the original from Bitstream. All other support files are subject to the LaTeX Project Public License. See http://www.ctan.org/license/lppl1.3 @@ -19,10 +19,13 @@ Original Bitstream Free font license: BITSTREAM CHARTER is a registered trademark of Bitstream Inc. -Portions of the font modifications are Copyright (c) 2009--2012, Andrey Panov; Copyright (c) 2013--2017, Michael Sharpe. +Portions of the font modifications are Copyright (c) 2009--2012, Andrey Panov; Copyright (c) 2013--2018, Michael Sharpe. -Current version: 1.112 2017-12-19 +Current version: 1.113 2018-04-10 + +Changes in version 1.113 +Added new math italics with original Charter italic v and w. Not suited for use with Greek math \nu. Changes in version 1.112 1. Reworked the organization of math alphabets to use unicode names. diff --git a/Master/texmf-dist/doc/fonts/xcharter/xcharter-doc.pdf b/Master/texmf-dist/doc/fonts/xcharter/xcharter-doc.pdf Binary files differindex 25bb0d5e36d..54dd92ba465 100644 --- a/Master/texmf-dist/doc/fonts/xcharter/xcharter-doc.pdf +++ b/Master/texmf-dist/doc/fonts/xcharter/xcharter-doc.pdf diff --git a/Master/texmf-dist/doc/fonts/xcharter/xcharter-doc.tex b/Master/texmf-dist/doc/fonts/xcharter/xcharter-doc.tex index 33220ee7394..23aebcc9030 100644 --- a/Master/texmf-dist/doc/fonts/xcharter/xcharter-doc.tex +++ b/Master/texmf-dist/doc/fonts/xcharter/xcharter-doc.tex @@ -8,7 +8,7 @@ \usepackage[scaled=.98,osfI]{XCharter} \usepackage[OT2,T2A,T1]{fontenc} \linespread{1.04} -\usepackage[charter,vvarbb,scaled=1.07]{newtxmath} +\usepackage[charter,vvarbb,scaled=1.05]{newtxmath} \usepackage[cal=boondoxo]{mathalfa} \font\osfIfnt=XCharter-Roman-tosf-t1 at 11pt \font\osffnt=XCharter1-Roman-tosf-t1 at 11pt @@ -62,7 +62,8 @@ one slot in upright and slanted shapes and five slots in italic shapes, as expec \end{itemize} -Three math packages seem to provide reasonable companions for \textsf{XCharter}. The first example uses Charter italics as math italics, but doesn't provide arbitrary scaling and doesn't sufficiently distinguish math italic v from mathematical Greek \verb|\nu|. Moreover, it is not easy to redefine \verb|\mathcal| to get a better math calligraphic alphabet---eg, the {\tt mathalfa} package fails. The second uses \textsf{libertine} italics and Greek in math mode, which is a good match to Charter in style and weight after scaling up, is arbitrarily scalable, has distinct math italic v and mathematical Greek \verb|\nu|, and is completely compatible with {\tt mathalfa}. The third is a new revision of {\tt newtxmath} with option {\tt charter} (or, equivalently, {\tt xcharter}), which substitutes Charter italics as math italics and, as of version 1.11, uses a newly developed family of Greek symbols in {regular,bold} $\times$ {upright, italic} to match the style and italic angle of XCharter. This version is scalable and has a math italic v (plus a matching w) distinct from \verb|\nu|. +Three math packages seem to provide reasonable companions for \textsf{XCharter}. The first example uses Charter italics as math italics, but doesn't provide arbitrary scaling and doesn't sufficiently distinguish math italic v from mathematical Greek \verb|\nu|. Moreover, it is not easy to redefine \verb|\mathcal| to get a better math calligraphic alphabet---eg, the {\tt mathalfa} package fails. The second uses \textsf{libertine} italics and Greek in math mode, which is a good match to Charter in style and weight after scaling up, is arbitrarily scalable, has distinct math italic v and mathematical Greek \verb|\nu|, and is completely compatible with {\tt mathalfa}. The third is a new revision of {\tt newtxmath} with option {\tt charter} (or, equivalently, {\tt xcharter}), which substitutes Charter italics as math italics and, as of version 1.11, uses a newly developed family of Greek symbols in {regular,bold} $\times$ {upright, italic} to match the style and italic angle of XCharter. This version is scalable and has a math italic v (plus a matching w) distinct from \verb|\nu|. (The option {\tt noxchvw} to {\tt newtxmath} changes the v and w to be the original Charter italic glyphs, which may lead to issues with \verb|\nu|.) + \textsc{Example 1:} \begin{verbatim} @@ -201,6 +202,7 @@ The Russian part of the following sentence is entered as \verb|\textcyr{a e1to - This is text in English, then Russian: \textcyr{a e1to --- po-russki}. +\newpage \textsc{Using T$2$A with T$1$:} diff --git a/Master/texmf-dist/fonts/afm/public/xcharter/XCharterMathBMI.afm b/Master/texmf-dist/fonts/afm/public/xcharter/XCharterMathBMI.afm index 06583ab90be..cc174b9e5b0 100644 --- a/Master/texmf-dist/fonts/afm/public/xcharter/XCharterMathBMI.afm +++ b/Master/texmf-dist/fonts/afm/public/xcharter/XCharterMathBMI.afm @@ -1,6 +1,6 @@ StartFontMetrics 2.0 Comment Generated by FontForge 20170730 -Comment Creation Date: Sun Dec 17 20:24:09 2017 +Comment Creation Date: Tue Apr 10 21:07:13 2018 FontName XCharterMathBMI FullName XCharter Math Bold Italic FamilyName XCharterMath @@ -12,10 +12,10 @@ IsFixedPitch false UnderlinePosition -100 UnderlineThickness 50 Version 001.000 -EncodingScheme xchbmi +EncodingScheme FontSpecific FontBBox -154 -225 963 898 XHeight 493 -StartCharMetrics 123 +StartCharMetrics 125 C 0 ; WX 329 ; N degree ; B 27 434 303 710 ; C 1 ; WX 318 ; N dotlessi ; B 29 -7 293 493 ; C 2 ; WX 659 ; N uni019B ; B 55 -10 626 748 ; @@ -58,7 +58,7 @@ C 38 ; WX 519 ; N u1D750 ; B 28 -11 475 499 ; C 39 ; WX 563 ; N u1D73B ; B 34 -225 543 744 ; C 40 ; WX 558 ; N u1D73C ; B 24 -219 514 499 ; C 41 ; WX 637 ; N u1D73D ; B 34 -11 592 744 ; -C 42 ; WX 327 ; N u1D73E ; B 35 -11 275 495 ; +C 42 ; WX 327 ; N u1D73E ; B 39 -11 275 495 ; C 43 ; WX 641 ; N u1D73F ; B 35 -7 598 499 ; C 44 ; WX 579 ; N u1D740 ; B -15 -10 556 744 ; C 45 ; WX 628 ; N u1D741 ; B -14 -218 584 495 ; @@ -139,5 +139,7 @@ C 119 ; WX 820 ; N u1D498 ; B 22 -12 775 494 ; C 120 ; WX 510 ; N u1D499 ; B -38 -6 511 494 ; C 121 ; WX 494 ; N u1D49A ; B -78 -216 513 494 ; C 122 ; WX 465 ; N u1D49B ; B -20 -14 461 502 ; +C 123 ; WX 547 ; N u1D497.alt ; B 22 -1 502 494 ; +C 124 ; WX 809 ; N u1D498.alt ; B 22 0 764 494 ; EndCharMetrics EndFontMetrics diff --git a/Master/texmf-dist/fonts/afm/public/xcharter/XCharterMathMI.afm b/Master/texmf-dist/fonts/afm/public/xcharter/XCharterMathMI.afm index eefc37e5c91..a2006ef693a 100644 --- a/Master/texmf-dist/fonts/afm/public/xcharter/XCharterMathMI.afm +++ b/Master/texmf-dist/fonts/afm/public/xcharter/XCharterMathMI.afm @@ -1,6 +1,6 @@ StartFontMetrics 2.0 Comment Generated by FontForge 20170730 -Comment Creation Date: Sun Dec 17 19:56:35 2017 +Comment Creation Date: Tue Apr 10 21:09:27 2018 FontName XCharterMathMI FullName XCharter Math Italic FamilyName XCharterMath @@ -12,10 +12,10 @@ IsFixedPitch false UnderlinePosition -100 UnderlineThickness 50 Version 001.000 -EncodingScheme xchmi +EncodingScheme FontSpecific FontBBox -151 -223 951 898 XHeight 482 -StartCharMetrics 123 +StartCharMetrics 125 C 0 ; WX 329 ; N degree ; B 27 434 303 710 ; C 1 ; WX 515 ; N uni019B ; B -10 -7 505 744 ; C 2 ; WX 586 ; N uni01B5 ; B 45 0 539 671 ; @@ -109,7 +109,7 @@ C 89 ; WX 498 ; N u1D700 ; B 35 -11 453 492 ; C 90 ; WX 540 ; N u1D701 ; B 35 -222 510 744 ; C 91 ; WX 530 ; N u1D702 ; B 30 -218 480 491 ; C 92 ; WX 598 ; N u1D703 ; B 40 -11 543 744 ; -C 93 ; WX 290 ; N u1D704 ; B 50 -11 250 486 ; +C 93 ; WX 290 ; N u1D704 ; B 53 -11 250 486 ; C 94 ; WX 576 ; N u1D705 ; B 20 -7 521 484 ; C 95 ; WX 515 ; N u1D706 ; B -10 -7 505 744 ; C 96 ; WX 581 ; N u1D707 ; B 18 -218 535 491 ; @@ -139,5 +139,7 @@ C 119 ; WX 551 ; N NameMe.53 ; B 23 -6 505 736 ; C 120 ; WX 595 ; N NameMe.54 ; B 50 -7 565 744 ; C 121 ; WX 287 ; N dotlessi ; B 33 -7 254 482 ; C 122 ; WX 269 ; N dotlessj ; B -128 -216 213 482 ; +C 123 ; WX 499 ; N u1D463.alt ; B 15 0 457 484 ; +C 124 ; WX 743 ; N u1D464.alt ; B 15 0 703 485 ; EndCharMetrics EndFontMetrics diff --git a/Master/texmf-dist/fonts/tfm/public/xcharter/XCharterMathBMI.tfm b/Master/texmf-dist/fonts/tfm/public/xcharter/XCharterMathBMI.tfm Binary files differindex 3ba2ba9ffba..e20f19b665e 100644 --- a/Master/texmf-dist/fonts/tfm/public/xcharter/XCharterMathBMI.tfm +++ b/Master/texmf-dist/fonts/tfm/public/xcharter/XCharterMathBMI.tfm diff --git a/Master/texmf-dist/fonts/tfm/public/xcharter/XCharterMathMI.tfm b/Master/texmf-dist/fonts/tfm/public/xcharter/XCharterMathMI.tfm Binary files differindex 98af1d34c7c..cae173eeef1 100644 --- a/Master/texmf-dist/fonts/tfm/public/xcharter/XCharterMathMI.tfm +++ b/Master/texmf-dist/fonts/tfm/public/xcharter/XCharterMathMI.tfm diff --git a/Master/texmf-dist/fonts/tfm/public/xcharter/zchbmi0.tfm b/Master/texmf-dist/fonts/tfm/public/xcharter/zchbmi0.tfm Binary files differnew file mode 100644 index 00000000000..9b925ade2d0 --- /dev/null +++ b/Master/texmf-dist/fonts/tfm/public/xcharter/zchbmi0.tfm diff --git a/Master/texmf-dist/fonts/tfm/public/xcharter/zchmi0.tfm b/Master/texmf-dist/fonts/tfm/public/xcharter/zchmi0.tfm Binary files differnew file mode 100644 index 00000000000..ef795c93e7c --- /dev/null +++ b/Master/texmf-dist/fonts/tfm/public/xcharter/zchmi0.tfm diff --git a/Master/texmf-dist/fonts/type1/public/xcharter/XCharterMathBMI.pfb b/Master/texmf-dist/fonts/type1/public/xcharter/XCharterMathBMI.pfb Binary files differindex 2fa35ca2517..8b695c47264 100644 --- a/Master/texmf-dist/fonts/type1/public/xcharter/XCharterMathBMI.pfb +++ b/Master/texmf-dist/fonts/type1/public/xcharter/XCharterMathBMI.pfb diff --git a/Master/texmf-dist/fonts/type1/public/xcharter/XCharterMathMI.pfb b/Master/texmf-dist/fonts/type1/public/xcharter/XCharterMathMI.pfb Binary files differindex 14f13249fde..52ecca8c14b 100644 --- a/Master/texmf-dist/fonts/type1/public/xcharter/XCharterMathMI.pfb +++ b/Master/texmf-dist/fonts/type1/public/xcharter/XCharterMathMI.pfb diff --git a/Master/texmf-dist/fonts/vf/public/xcharter/zchbmi0.vf b/Master/texmf-dist/fonts/vf/public/xcharter/zchbmi0.vf Binary files differnew file mode 100644 index 00000000000..5ee3c82920d --- /dev/null +++ b/Master/texmf-dist/fonts/vf/public/xcharter/zchbmi0.vf diff --git a/Master/texmf-dist/fonts/vf/public/xcharter/zchmi0.vf b/Master/texmf-dist/fonts/vf/public/xcharter/zchmi0.vf Binary files differnew file mode 100644 index 00000000000..4dad9f7dc74 --- /dev/null +++ b/Master/texmf-dist/fonts/vf/public/xcharter/zchmi0.vf diff --git a/Master/texmf-dist/tex/latex/xcharter/omlzchmi.fd b/Master/texmf-dist/tex/latex/xcharter/omlzchmi.fd index 514f2335b96..70109e79826 100644 --- a/Master/texmf-dist/tex/latex/xcharter/omlzchmi.fd +++ b/Master/texmf-dist/tex/latex/xcharter/omlzchmi.fd @@ -11,8 +11,22 @@ \let\ntxmath@scaled\@empty% \fi +\def\tx@donozchvw{\newif\iftx@nozchvw} +\expandafter\ifx\csname tx@nozchvwfalse\endcsname\relax + \tx@donozchvw +\fi + \DeclareFontFamily{OML}{zchmi}{\skewchar \font =127} +\iftx@nozchvw % use original v, w in math italic +\DeclareFontShape{OML}{zchmi}{m}{it}{ + <-> \ntxmath@scaled zchmi0 +}{} + +\DeclareFontShape{OML}{zchmi}{b}{it}{ + <-> \ntxmath@scaled zchbmi0 +}{} +\else \DeclareFontShape{OML}{zchmi}{m}{it}{ <-> \ntxmath@scaled zchmi }{} @@ -20,6 +34,7 @@ \DeclareFontShape{OML}{zchmi}{b}{it}{ <-> \ntxmath@scaled zchbmi }{} +\fi \DeclareFontShape{OML}{zchmi}{m}{sl}{<->ssub * zchmi/m/it}{} \DeclareFontShape{OML}{zchmi}{bx}{it}{<->ssub * zchmi/b/it}{} |