summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/newtxtt
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2014-11-21 00:32:17 +0000
committerKarl Berry <karl@freefriends.org>2014-11-21 00:32:17 +0000
commit990c8b9570b5bb74dc588b5343fd33bbbffac59e (patch)
treee4749199f7acf32cfabce960faef043d98d09470 /Master/texmf-dist/tex/latex/newtxtt
parente838bf49f73b3c3977ae76c173c3e247b019a541 (diff)
newtxtt (20nov14)
git-svn-id: svn://tug.org/texlive/trunk@35629 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/newtxtt')
-rw-r--r--Master/texmf-dist/tex/latex/newtxtt/newtxtt.sty34
-rw-r--r--Master/texmf-dist/tex/latex/newtxtt/t1newtxtt.fd42
-rw-r--r--Master/texmf-dist/tex/latex/newtxtt/t1newtxttz.fd43
-rw-r--r--Master/texmf-dist/tex/latex/newtxtt/ts1newtxtt.fd46
-rw-r--r--Master/texmf-dist/tex/latex/newtxtt/ts1newtxttz.fd46
5 files changed, 119 insertions, 92 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}
diff --git a/Master/texmf-dist/tex/latex/newtxtt/t1newtxtt.fd b/Master/texmf-dist/tex/latex/newtxtt/t1newtxtt.fd
index a98c77ed496..32479256068 100644
--- a/Master/texmf-dist/tex/latex/newtxtt/t1newtxtt.fd
+++ b/Master/texmf-dist/tex/latex/newtxtt/t1newtxtt.fd
@@ -13,23 +13,29 @@
\let\newtxtt@@fig\newtxtt@fig
\fi
+\let\newtxtt@@upq\@empty
+\expandafter\ifx\csname txtt@upqfalse\endcsname\relax
+\else
+ \iftxtt@upq\def\newtxtt@@upq{q}
+\fi
+
\DeclareFontFamily{T1}{newtxtt}{\hyphenchar\font\m@ne}
\DeclareFontShape{T1}{newtxtt}{m}{n}{
- <-> \newtxtt@@scale newtxtt\newtxtt@@fig
+ <-> \newtxtt@@scale newtxtt\newtxtt@@fig\newtxtt@@upq
}{}
\DeclareFontShape{T1}{newtxtt}{b}{n}{
- <-> \newtxtt@@scale newtxbtt\newtxtt@@fig
+ <-> \newtxtt@@scale newtxbtt\newtxtt@@fig\newtxtt@@upq
}{}
\DeclareFontShape{T1}{newtxtt}{bx}{n}{
<-> ssub * newtxtt/b/n
}{}
\DeclareFontShape{T1}{newtxtt}{m}{sc}{ %cap & small cap
- <-> \newtxtt@@scale newtxttsc\newtxtt@@fig
+ <-> \newtxtt@@scale newtxttsc\newtxtt@@fig\newtxtt@@upq
}{}
\DeclareFontShape{T1}{newtxtt}{m}{sl}{ %slanted
- <-> \newtxtt@@scale newtxttsl\newtxtt@@fig
+ <-> \newtxtt@@scale newtxttsl\newtxtt@@fig\newtxtt@@upq
}{}
\DeclareFontShape{T1}{newtxtt}{m}{it}{ %italic
<-> ssub * newtxtt/m/sl%
@@ -37,29 +43,29 @@
\DeclareFontShape{T1}{newtxtt}{m}{ui}{ %unslanted italic
<-> ssub * newtxtt/m/sl%
}{}
-\DeclareFontShape{T1}{newtxtt}{b}{sc}{ %bold extended cap & small cap
- <-> \newtxtt@@scale newtxbttsc\newtxtt@@fig
+\DeclareFontShape{T1}{newtxtt}{b}{sc}{ %bold cap & small cap
+ <-> \newtxtt@@scale newtxbttsc\newtxtt@@fig\newtxtt@@upq
}{}
-\DeclareFontShape{T1}{newtxtt}{b}{sl}{ %bold extended slanted
- <-> \newtxtt@@scale newtxbttsl\newtxtt@@fig
+\DeclareFontShape{T1}{newtxtt}{b}{sl}{ %bold slanted
+ <-> \newtxtt@@scale newtxbttsl\newtxtt@@fig\newtxtt@@upq
}{}
-\DeclareFontShape{T1}{newtxtt}{b}{it}{ %bold extended italic
+\DeclareFontShape{T1}{newtxtt}{b}{it}{ %bold italic
<-> ssub * newtxtt/b/sl%
}{}
-\DeclareFontShape{T1}{newtxtt}{bx}{ui}{ %bold extended unslanted italic
- <-> ssub * newtxtt/b/sl%
-}{}
-\DeclareFontShape{T1}{newtxtt}{bx}{sc}{ %bold cap & small cap
+%\DeclareFontShape{T1}{newtxtt}{bx}{ui}{ %bold unslanted italic
+% <-> ssub * newtxtt/b/sl%
+%}{}
+\DeclareFontShape{T1}{newtxtt}{bx}{sc}{ %bold extended cap & small cap
<-> ssub * newtxtt/b/sc%
}{}
-\DeclareFontShape{T1}{newtxtt}{bx}{sl}{ %bold slanted
- <-> ssub * newtxtt/b/sl%
-}{}
-\DeclareFontShape{T1}{newtxtt}{b}{it}{ %bold italic
+\DeclareFontShape{T1}{newtxtt}{bx}{sl}{ %bold extended slanted
<-> ssub * newtxtt/b/sl%
}{}
-\DeclareFontShape{T1}{newtxtt}{b}{ui}{ %bold unslanted italic
+\DeclareFontShape{T1}{newtxtt}{bx}{it}{ %bold extended italic
<-> ssub * newtxtt/b/sl%
}{}
+%\DeclareFontShape{T1}{newtxtt}{bx}{ui}{ %bold extended unslanted italic
+% <-> ssub * newtxtt/b/sl%
+%}{}
\endinput
diff --git a/Master/texmf-dist/tex/latex/newtxtt/t1newtxttz.fd b/Master/texmf-dist/tex/latex/newtxtt/t1newtxttz.fd
index 860c5cbff91..6d6461f8e0c 100644
--- a/Master/texmf-dist/tex/latex/newtxtt/t1newtxttz.fd
+++ b/Master/texmf-dist/tex/latex/newtxtt/t1newtxttz.fd
@@ -13,53 +13,58 @@
\let\newtxtt@@fig\newtxtt@fig
\fi
+\let\newtxtt@@upq\@empty
+\expandafter\ifx\csname txtt@upqfalse\endcsname\relax
+\else
+ \iftxtt@upq\def\newtxtt@@upq{q}
+\fi
+
\DeclareFontFamily{T1}{newtxttz}{\hyphenchar\font 45 }
\DeclareFontShape{T1}{newtxttz}{m}{n}{
- <-> \newtxtt@@scale newtxttz\newtxtt@@fig
+ <-> \newtxtt@@scale newtxttz\newtxtt@@fig\newtxtt@@upq
}{}
\DeclareFontShape{T1}{newtxttz}{b}{n}{
- <-> \newtxtt@@scale newtxbttz\newtxtt@@fig
+ <-> \newtxtt@@scale newtxbttz\newtxtt@@fig\newtxtt@@upq
}{}
\DeclareFontShape{T1}{newtxttz}{bx}{n}{
<-> ssub * newtxttz/b/n
}{}
-
\DeclareFontShape{T1}{newtxttz}{m}{sc}{ %cap & small cap
- <-> \newtxtt@@scale newtxttzsc\newtxtt@@fig
+ <-> \newtxtt@@scale newtxttzsc\newtxtt@@fig\newtxtt@@upq
}{}
\DeclareFontShape{T1}{newtxttz}{m}{sl}{ %slanted
- <-> \newtxtt@@scale newtxttzsl\newtxtt@@fig
+ <-> \newtxtt@@scale newtxttzsl\newtxtt@@fig\newtxtt@@upq
}{}
\DeclareFontShape{T1}{newtxttz}{m}{it}{ %italic
<-> ssub * newtxttz/m/sl%
}{}
-\DeclareFontShape{T1}{newtxttz}{m}{ui}{ %unslanted italic
- <-> ssub * newtxttz/m/sl%
-}{}
+%\DeclareFontShape{T1}{newtxttz}{m}{ui}{ %unslanted italic
+% <-> ssub * newtxttz/m/sl%
+%}{}
\DeclareFontShape{T1}{newtxttz}{b}{sc}{ %bold cap & small cap
- <-> \newtxtt@@scale newtxbttzsc\newtxtt@@fig
+ <-> \newtxtt@@scale newtxbttzsc\newtxtt@@fig\newtxtt@@upq
}{}
\DeclareFontShape{T1}{newtxttz}{b}{sl}{ %bold slanted
- <-> \newtxtt@@scale newtxbttzsl\newtxtt@@fig
+ <-> \newtxtt@@scale newtxbttzsl\newtxtt@@fig\newtxtt@@upq
}{}
\DeclareFontShape{T1}{newtxttz}{b}{it}{ %bold italic
<-> ssub * newtxttz/b/sl%
}{}
-\DeclareFontShape{T1}{newtxttz}{b}{ui}{ %bold extended unslanted italic
- <-> ssub * newtxttz/b/sl%
-}{}
-\DeclareFontShape{T1}{newtxttz}{bx}{sc}{ %bold cap & small cap
+%\DeclareFontShape{T1}{newtxttz}{b}{ui}{ %bold unslanted italic
+% <-> ssub * newtxttz/b/sl%
+%}{}
+\DeclareFontShape{T1}{newtxttz}{bx}{sc}{%bold extended cap & small cap
<-> ssub * newtxttz/b/sc%
}{}
-\DeclareFontShape{T1}{newtxttz}{bx}{sl}{ %bold slanted
- <-> ssub * newtxttz/b/sl%
-}{}
-\DeclareFontShape{T1}{newtxttz}{bx}{it}{ %bold italic
+\DeclareFontShape{T1}{newtxttz}{bx}{sl}{ %bold extended slanted
<-> ssub * newtxttz/b/sl%
}{}
-\DeclareFontShape{T1}{newtxttz}{bx}{ui}{ %bold unslanted italic
+\DeclareFontShape{T1}{newtxttz}{bx}{it}{ %bold extended italic
<-> ssub * newtxttz/b/sl%
}{}
+%\DeclareFontShape{T1}{newtxttz}{bx}{ui}{ %bold extended unslanted italic
+% <-> ssub * newtxttz/b/sl%
+%}{}
\endinput
diff --git a/Master/texmf-dist/tex/latex/newtxtt/ts1newtxtt.fd b/Master/texmf-dist/tex/latex/newtxtt/ts1newtxtt.fd
index 6d83a250011..47b2852b645 100644
--- a/Master/texmf-dist/tex/latex/newtxtt/ts1newtxtt.fd
+++ b/Master/texmf-dist/tex/latex/newtxtt/ts1newtxtt.fd
@@ -21,38 +21,38 @@
\DeclareFontShape{TS1}{newtxtt}{m}{it}{ %italic
<->ssub * newtxtt/m/sl%
}{}
-\DeclareFontShape{TS1}{newtxtt}{m}{ui}{ %unslanted italic
- <->ssub * newtxtt/m/it%
-}{}
-\DeclareFontShape{TS1}{newtxtt}{bx}{n}{ %bold extended
+%\DeclareFontShape{TS1}{newtxtt}{m}{ui}{ %unslanted italic
+% <->ssub * newtxtt/m/it%
+%}{}
+\DeclareFontShape{TS1}{newtxtt}{b}{n}{ %bold
<-> \newtxtt@@scale tcxbtt%
}{}
-\DeclareFontShape{TS1}{newtxtt}{bx}{sc}{ %bold extended cap & small cap
- <->ssub * newtxtt/bx/n%
+\DeclareFontShape{TS1}{newtxtt}{b}{sc}{ %bold cap & small cap
+ <->ssub * newtxtt/b/n%
}{}
-\DeclareFontShape{TS1}{newtxtt}{bx}{sl}{ %bold extended slanted
+\DeclareFontShape{TS1}{newtxtt}{b}{sl}{ %bold slanted
<-> \newtxtt@@scale tcxbttsl%
}{}
-\DeclareFontShape{TS1}{newtxtt}{bx}{it}{ %bold extended italic
- <->ssub * newtxtt/bx/sl%
-}{}
-\DeclareFontShape{TS1}{newtxtt}{bx}{ui}{ %bold extended unslanted italic
- <->ssub * newtxtt/bx/it%
+\DeclareFontShape{TS1}{newtxtt}{b}{it}{ %bold italic
+ <->ssub * newtxtt/b/sl%
}{}
-\DeclareFontShape{TS1}{newtxtt}{b}{n}{ %bold
- <->ssub * newtxtt/bx/n%
-}{}
-\DeclareFontShape{TS1}{newtxtt}{b}{sc}{ %bold cap & small cap
- <->ssub * newtxtt/bx/sc%
+%\DeclareFontShape{TS1}{newtxtt}{b}{ui}{ %bold unslanted italic
+% <->ssub * newtxtt/b/it%
+%}{}
+\DeclareFontShape{TS1}{newtxtt}{bx}{n}{ %bold extended
+ <->ssub * newtxtt/b/n%
}{}
-\DeclareFontShape{TS1}{newtxtt}{b}{sl}{ %bold slanted
- <->ssub * newtxtt/bx/sl%
+\DeclareFontShape{TS1}{newtxtt}{bx}{sc}{ %bold extended cap & small cap
+ <->ssub * newtxtt/b/sc%
}{}
-\DeclareFontShape{TS1}{newtxtt}{b}{it}{ %bold italic
- <->ssub * newtxtt/bx/it%
+\DeclareFontShape{TS1}{newtxtt}{bx}{sl}{ %bold extended slanted
+ <->ssub * newtxtt/b/sl%
}{}
-\DeclareFontShape{TS1}{newtxtt}{b}{ui}{ %bold unslanted italic
- <->ssub * newtxtt/bx/ui%
+\DeclareFontShape{TS1}{newtxtt}{bx}{it}{ %bold extended italic
+ <->ssub * newtxtt/b/it%
}{}
+%\DeclareFontShape{TS1}{newtxtt}{bx}{ui}{ %bold extended unslanted italic
+% <->ssub * newtxtt/bb/ui%
+%}{}
\endinput
diff --git a/Master/texmf-dist/tex/latex/newtxtt/ts1newtxttz.fd b/Master/texmf-dist/tex/latex/newtxtt/ts1newtxttz.fd
index 3c789cc4a6e..f8716baf75a 100644
--- a/Master/texmf-dist/tex/latex/newtxtt/ts1newtxttz.fd
+++ b/Master/texmf-dist/tex/latex/newtxtt/ts1newtxttz.fd
@@ -21,38 +21,38 @@
\DeclareFontShape{TS1}{newtxttz}{m}{it}{ %italic
<->ssub * newtxttz/m/sl%
}{}
-\DeclareFontShape{TS1}{newtxttz}{m}{ui}{ %unslanted italic
- <->ssub * newtxttz/m/it%
-}{}
-\DeclareFontShape{TS1}{newtxttz}{bx}{n}{ %bold extended
+%\DeclareFontShape{TS1}{newtxttz}{m}{ui}{ %unslanted italic
+% <->ssub * newtxttz/m/it%
+%}{}
+\DeclareFontShape{TS1}{newtxttz}{b}{n}{ %bold
<-> \newtxtt@@scale tcxbttz%
}{}
-\DeclareFontShape{TS1}{newtxttz}{bx}{sc}{ %bold extended cap & small cap
- <->ssub * newtxttz/bx/n%
+\DeclareFontShape{TS1}{newtxttz}{b}{sc}{ %bold cap & small cap
+ <->ssub * newtxttz/b/n%
}{}
-\DeclareFontShape{TS1}{newtxttz}{bx}{sl}{ %bold extended slanted
+\DeclareFontShape{TS1}{newtxttz}{b}{sl}{ %bold slanted
<-> \newtxtt@@scale tcxbttzsl%
}{}
-\DeclareFontShape{TS1}{newtxttz}{bx}{it}{ %bold extended italic
- <->ssub * newtxttz/bx/sl%
-}{}
-\DeclareFontShape{TS1}{newtxttz}{bx}{ui}{ %bold extended unslanted italic
- <->ssub * newtxttz/bx/it%
+\DeclareFontShape{TS1}{newtxttz}{b}{it}{ %bold italic
+ <->ssub * newtxttz/b/sl%
}{}
-\DeclareFontShape{TS1}{newtxttz}{b}{n}{ %bold
- <->ssub * newtxttz/bx/n%
-}{}
-\DeclareFontShape{TS1}{newtxttz}{b}{sc}{ %bold cap & small cap
- <->ssub * newtxttz/bx/sc%
+%\DeclareFontShape{TS1}{newtxttz}{b}{ui}{ %bold unslanted italic
+% <->ssub * newtxttz/b/it%
+%}{}
+\DeclareFontShape{TS1}{newtxttz}{bx}{n}{ %bold extended
+ <->ssub * newtxttz/b/n%
}{}
-\DeclareFontShape{TS1}{newtxttz}{b}{sl}{ %bold slanted
- <->ssub * newtxttz/bx/sl%
+\DeclareFontShape{TS1}{newtxttz}{bx}{sc}{ %bold extended cap & small cap
+ <->ssub * newtxttz/b/sc%
}{}
-\DeclareFontShape{TS1}{newtxttz}{b}{it}{ %bold italic
- <->ssub * newtxttz/bx/it%
+\DeclareFontShape{TS1}{newtxttz}{bx}{sl}{ %bold extended slanted
+ <->ssub * newtxttz/b/sl%
}{}
-\DeclareFontShape{TS1}{newtxttz}{b}{ui}{ %bold unslanted italic
- <->ssub * newtxttz/bx/ui%
+\DeclareFontShape{TS1}{newtxttz}{bx}{it}{ %bold extended italic
+ <->ssub * newtxttz/b/it%
}{}
+%\DeclareFontShape{TS1}{newtxttz}{bx}{ui}{ %bold extended unslanted italic
+% <->ssub * newtxttz/b/ui%
+%}{}
\endinput