summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2012-11-21 00:02:39 +0000
committerKarl Berry <karl@freefriends.org>2012-11-21 00:02:39 +0000
commita3a157d5f7b57ff875e31046aafd206af27de3dd (patch)
tree769b0ca974b920ed45c3bf6b700f60094b4ace7c
parentad8a6556471d695c571c22bd67934aabd74fdec5 (diff)
newtx (20nov12)
git-svn-id: svn://tug.org/texlive/trunk@28317 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/fonts/newtx/README20
-rw-r--r--Master/texmf-dist/tex/latex/newtx/newtxmath.sty21
-rwxr-xr-xMaster/tlpkg/libexec/ctan2tds1
3 files changed, 27 insertions, 15 deletions
diff --git a/Master/texmf-dist/doc/fonts/newtx/README b/Master/texmf-dist/doc/fonts/newtx/README
index f34d2ec23d7..f61e1930700 100644
--- a/Master/texmf-dist/doc/fonts/newtx/README
+++ b/Master/texmf-dist/doc/fonts/newtx/README
@@ -1,12 +1,14 @@
This package, based on txfonts, provides many fixes and enhancements to the txfonts package, splitting it into two separate packages---newtxtext and newtxmath, which may be run independently of one another. It provides scaling, improved metrics, and other options. In particular, newtxmath offers a libertine option which substitutes Linux Libertine (provided with TeXLive and MikTeX) italic and Greek letters for the default Times letters, providing a good match for the Libertine text font, which is heavier than Computer Modern but lighter than Times, and in my experience, looks very sharp and clear on the screen.
-Current version: 1.05
+Current version: 1.06
This material is subject to the LaTeX Project Public License. See http://www.ctan.org/tex-archive/help/Catalogue/licenses.lppl.html for the details of that license.
+Changes in version 1.06:
+Added code to add option garamondx to newtxmath. (Requires package garamondx from CTAN, non-free.)
+
Changes in version 1.05:
A number of the changes here were due to valued feedback from Volodya Shavrukov.
-
0. As of this version, it is required that you install libertine-type1, which serves as a replacement for libertine-legacy. Note too that the map file name has changed to newtx.map from ntx.map.
1. Fixed some remaining references to libertine-legacy fonts so they point now to the included fonts.
2. Added a new option largelibfigs to [libertine]{newtxmath}, changing the figures used in math mode from the default Libertine figures, which are about 8% shorter than Libertine's CapHeight, to Libertine .cap figures, which are exactly match Libertine CapHeight. (The .cap figures in semibold weight required for math bold were created to match the regular style.)
@@ -97,7 +99,7 @@ sudo mktexlsr
then
-sudo -H updmap-sys --enable Map=ntx.map
+sudo -H updmap-sys --enable Map=newtx.map
Method B: If you insist on making your font installations in your home folder, potentially making your personal installation become out of sync with updates to TeXLive, use instead
@@ -107,7 +109,7 @@ cp -Rfp * ~/Library/texmf
then
-updmap --enable Map=ntx.map
+updmap --enable Map=newtx.map
(ii) otherwise
@@ -115,25 +117,25 @@ cp -Rfp * ~/Library/texmf
then
-sudo updmap-sys --enable Map=ntx.map
+sudo updmap-sys --enable Map=newtx.map
Linux: Very similar to Mac OS X.
-MikTeX: Copy the newtxTDS.zip to the root of the folder you use for personal additions to the TeX trees, open a command window, chdir to that folder, and type
+MikTeX: Copy the newtx.tds.zip to the root of the folder you use for personal additions to the TeX trees, open a command window, chdir to that folder, and type
-unzip newtxTDS
+unzip newtx.tds
initexmf --update-fndb
initexmf --edit-config-file updmap
The latter command should open updmap.cfg in your default editor, commonly Notepad. Add the line
-Map ntx.map
+Map newtx.map
to updmap.cfg, save and close. Then, in the command window, type
initexmf --mkmaps
-You can ignore error messages that may occur here. This should result in a properly enabled ntx.
+You can ignore error messages that may occur here. This should result in a properly enabled newtx.
The underlying glyphs from txfonts are good, and I believe I've improved the metrics and the package substantially.
diff --git a/Master/texmf-dist/tex/latex/newtx/newtxmath.sty b/Master/texmf-dist/tex/latex/newtx/newtxmath.sty
index 6a38ec837c4..2e5aa56067d 100644
--- a/Master/texmf-dist/tex/latex/newtx/newtxmath.sty
+++ b/Master/texmf-dist/tex/latex/newtx/newtxmath.sty
@@ -10,8 +10,8 @@
% of glyph collisions.
% These modifications are by Michael Sharpe, msharpe at ucsd dot edu
-\def\fileversion{1.05}
-\def\filedate{2012/11/10}
+\def\fileversion{1.06}
+\def\filedate{2012/11/19}
\ProvidesPackage{newtxmath}
[\filedate\space v\fileversion]
\@ifundefined{newtxmathLoaded}{}{\endinput}
@@ -33,6 +33,7 @@
\newcount\tx@Isdigit
\newif\iftx@ams \newif\iftx@slantedG \newif\iftx@cmint \newif\iftx@braces
\newif\iftx@libertine \newif\iftx@varbb \newif\iftx@vvarbb \newif\iftx@symbolsC
+\newif\iftx@gm
\tx@symbolsCtrue
\newif\iftx@altnu
\newif\iftx@largelibfigs
@@ -43,6 +44,7 @@
\DeclareOption{nosymbolsc}{\tx@symbolsCfalse}
\DeclareOption{libertine}{\tx@libertinetrue}
\DeclareOption{minion}{\tx@miniontrue}
+\DeclareOption{garamondx}{\tx@gmtrue}
\DeclareOption{cmintegrals}{\tx@cminttrue}
\DeclareOption{cmbraces}{\tx@bracestrue}
\DeclareOption{noamssymbols}{\tx@amsfalse}
@@ -55,9 +57,10 @@
amssymbols,uprightGreek}
\ProcessOptions*
-% No varg option with option libertine or option minion
+% No varg option with option libertine or option minion or garamond
\iftx@libertine\ifx\X@s@v@rg\undefined\else\let\X@s@v@rg\@undefined\fi\fi
\iftx@minion\ifx\X@s@v@rg\undefined\else\let\X@s@v@rg\@undefined\fi\fi
+\iftx@gm\ifx\X@s@v@rg\undefined\else\let\X@s@v@rg\@undefined\fi\fi
% altnu and largelibfigs valid only with libertine
\iftx@libertine\else\tx@altnufalse\tx@largelibfigsfalse\fi
% Use existing text fonts for operators, mathrm, etc
@@ -97,9 +100,15 @@ amssymbols,uprightGreek}
\SetSymbolFont{letters}{bold}{OML}{zmnmi}{b}{it}
\DeclareFontSubstitution{OML}{zmnmi}{m}{it}
\else
- \DeclareSymbolFont{letters}{OML}{ntxmi}{m}{it}
- \SetSymbolFont{letters}{bold}{OML}{ntxmi}{b}{it}
- \DeclareFontSubstitution{OML}{ntxmi}{m}{it}
+ \iftx@gm
+ \DeclareSymbolFont{letters}{OML}{zgmmi}{m}{it}
+ \SetSymbolFont{letters}{bold}{OML}{zgmmi}{b}{it}
+ \DeclareFontSubstitution{OML}{zgmmi}{m}{it}
+ \else
+ \DeclareSymbolFont{letters}{OML}{ntxmi}{m}{it}
+ \SetSymbolFont{letters}{bold}{OML}{ntxmi}{b}{it}
+ \DeclareFontSubstitution{OML}{ntxmi}{m}{it}
+ \fi
\fi
\fi
%%%%%%%%%%%%%%%%%
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index a86fcae2999..ef277a4a612 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -408,6 +408,7 @@ chomp ($Build = `cd $Master/../Build/source && pwd`);
'galley', "die 'skipping, will be included in xpackages later'",
'gapfill', "die 'skipping, separate macosx scripts are too painful'",
'garamond', "die 'skipping, nonfree font'",
+ 'garamondx', "die 'skipping, nonfree font'",
'garuda-c90', "&MAKEgaruda_c90",
'geschichtsfrkl', "&MAKEflatten",
'gene', "die 'skipping, complicated, some have sources, sorry'",