summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/newtxtt/newtxtt.sty
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/latex/newtxtt/newtxtt.sty')
-rw-r--r--Master/texmf-dist/tex/latex/newtxtt/newtxtt.sty34
1 files changed, 25 insertions, 9 deletions
diff --git a/Master/texmf-dist/tex/latex/newtxtt/newtxtt.sty b/Master/texmf-dist/tex/latex/newtxtt/newtxtt.sty
index fd87b8a0edd..29594c5edae 100644
--- a/Master/texmf-dist/tex/latex/newtxtt/newtxtt.sty
+++ b/Master/texmf-dist/tex/latex/newtxtt/newtxtt.sty
@@ -1,6 +1,6 @@
\NeedsTeXFormat{LaTeX2e}
-\def\filedate{2014/09/29}
-\def\fileversion{1.03}
+\def\filedate{2014/11/18}
+\def\fileversion{1.05}
\ProvidesPackage{newtxtt}[\filedate\space v\fileversion]
\message{`newtxtt' v\fileversion, \filedate\space Typewriter text macros based on txfonts (msharpe)}
@@ -8,13 +8,17 @@
\RequirePackage{textcomp}
\DeclareEncodingSubset{TS1}{newtxtt}{0}
\DeclareEncodingSubset{TS1}{newtxttz}{0}
-\renewcommand*{\ttdefault}{newtxtt}
-\newcommand*{\ttzdefault}{newtxttz}
+\renewcommand{\ttdefault}{newtxtt}
+\newcommand{\ttzdefault}{newtxttz}
+
+\newif\iftxtt@upq
+\newif\iftxtt@tt
+\newif\iftxtt@ttz
\edef\newtxtt@fig{a}
\IfFileExists{xkeyval.sty}{
\RequirePackage{xkeyval}
- \define@choicekey*+{newtxtt.sty}{zerostyle}[\val\nr]{a,b,c,d}[a]{%
+ \define@choicekey*+{newtxtt.sty}{zerostyle}[\val\nr]{a,b,c,d,e}[a]{%
\ifcase\nr\relax
\edef\newtxtt@fig{a}
\or
@@ -23,22 +27,34 @@
\edef\newtxtt@fig{c}
\or
\edef\newtxtt@fig{d}
+ \or
+ \edef\newtxtt@fig{e}
\fi
}{%
- \PackageWarning{newtxtt}{Option zerostyle must be one of a,b,c,d. Using `a'.}%
+ \PackageWarning{newtxtt}{Option zerostyle must be one of a,b,c,d,e. Using `a'.}%
}
\newcommand*{\newtxtt@scale}{1}
\DeclareOptionX{scale}{\renewcommand*{\newtxtt@scale}{##1}}
\DeclareOptionX{scaled}{\renewcommand*{\newtxtt@scale}{##1}}
\DeclareOptionX{nomono}{\let\ttdefault\ttzdefault}
+ \DeclareOptionX{straightquotes}{\txtt@upqtrue}
+ \DeclareOptionX{ttdefault}{\txtt@tttrue}
+ \DeclareOptionX{ttzdefault}{\txtt@ttztrue}
}{
\let\DeclareOptionX\DeclareOption
\let\ExecuteOptionsX\ExecuteOptions
\let\ProcessOptionsX\ProcessOptions
}
-\ProcessOptionsX<newtxtt.sty>
-\DeclareRobustCommand\ttzfamily
- {\not@math@alphabet\ttzfamily\mathtt
+%\ProcessOptionsX%<newtxtt.sty>
+\ProcessOptionsX\relax
+%ttz takes precedence over tt
+\iftxtt@ttz \renewcommand{\familydefault}{\ttzdefault}
+\else
+\iftxtt@tt \renewcommand{\familydefault}{\ttdefault}\fi
+\fi
+
+\DeclareRobustCommand{\ttzfamily}{%
+ \not@math@alphabet\ttzfamily\mathtt
\fontfamily\ttzdefault\selectfont}
\DeclareOldFontCommand{\ttz}{\normalfont\ttzfamily}{\mathtt}
\DeclareTextFontCommand{\textttz}{\ttzfamily}