summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Master/texmf-dist/doc/latex/upquote/README14
-rw-r--r--Master/texmf-dist/doc/latex/upquote/upquote.pdfbin0 -> 172176 bytes
-rw-r--r--Master/texmf-dist/source/latex/upquote/upquote.dtx126
-rw-r--r--Master/texmf-dist/source/latex/upquote/upquote.ins16
-rw-r--r--Master/texmf-dist/tex/latex/upquote/upquote.sty104
-rwxr-xr-xMaster/tlpkg/bin/tlpkg-ctan-check2
6 files changed, 192 insertions, 70 deletions
diff --git a/Master/texmf-dist/doc/latex/upquote/README b/Master/texmf-dist/doc/latex/upquote/README
new file mode 100644
index 00000000000..d8668677120
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/upquote/README
@@ -0,0 +1,14 @@
+
+upquote -- upright-quote and grave-accent glyphs in verbatim
+
+Authors: Michael A. Covington, Frank Mittelbach, Markus G. Kuhn
+
+Released under the LaTeX Project Public License v1.3c or later
+See http://www.latex-project.org/lppl.txt
+
+This upquote.sty LaTeX package changes the glyphs used by the \verb
+and \verb* macros and the "verbatim" and "verbatim*" environments for
+ASCII characters 27 and 60 to the "upright quotation mark" and "grave
+accent" ones required by Unicode, ISO 646, ISO 10646, and many other
+character set standards. This is particularly useful for typesetting
+software source code.
diff --git a/Master/texmf-dist/doc/latex/upquote/upquote.pdf b/Master/texmf-dist/doc/latex/upquote/upquote.pdf
new file mode 100644
index 00000000000..08f7df5b2fa
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/upquote/upquote.pdf
Binary files differ
diff --git a/Master/texmf-dist/source/latex/upquote/upquote.dtx b/Master/texmf-dist/source/latex/upquote/upquote.dtx
new file mode 100644
index 00000000000..cbe492778cf
--- /dev/null
+++ b/Master/texmf-dist/source/latex/upquote/upquote.dtx
@@ -0,0 +1,126 @@
+% \iffalse
+%<package>\NeedsTeXFormat{LaTeX2e}
+%<package>\ProvidesPackage{upquote}
+%<package> [2012/04/05 v1.2 upright-quote and grave-accent glyphs in verbatim]
+%
+%<*driver>
+\documentclass{ltxdoc}
+\usepackage{upquote}
+\usepackage{url}
+\DisableCrossrefs
+\RecordChanges
+\setcounter{secnumdepth}{-1} % suppress part and section numbers
+\begin{document}
+ \DocInput{upquote.dtx}
+\end{document}
+%</driver>
+% \fi
+%
+% \CheckSum{40}
+%
+%\GetFileInfo{upquote.sty}
+%
+%\title{\textsf{upquote} -- upright-quote and grave-accent glyphs\linebreak
+% in verbatim\thanks{This file describes version \fileversion,
+% last revised \filedate.}}
+%\author{Michael A. Covington\thanks{Artificial Intelligence Center,
+% The University of Georgia, \texttt{http://www.ai.uga.edu/\char126mc/}} ,
+% Frank Mittelbach,
+% Markus G.~Kuhn\thanks{University of Cambridge, Computer Laboratory,
+% \texttt{http://www.cl.cam.ac.uk/\char126mgk25/}}}
+%\date{\filedate}
+%
+%\maketitle
+%
+%\section{Introduction}
+%
+%By default, the \LaTeX\ \verb+\verb+ macro and \texttt{verbatim}
+%environment display ASCII characters 27 and 60 as \texttt{'} and
+%\texttt{`}, respectively, in line with how these two characters are
+%used to typeset opening and closing quotation marks elsewhere in
+%\TeX. However, the character-set standards define character 27 to
+%represent a straight single quotation mark \texttt{\char13} and
+%character 60 as a grave accent \texttt{\char18}. This is what most
+%modern fonts show, and what readers of software source code are now
+%likely to expect~\cite{Cov94,Kuh99}. The curly quotation mark
+%characters \texttt{`} and \texttt{'} are instead associated with
+%Unicode positions U+2018 and U+2019.
+%
+%\section{Usage}
+%
+%Add \verb+\usepackage{upquote}+ to the preamble (preferably after any
+%packages that change fonts or font encoding), and the behaviour of
+%the macros \verb+\verb+ and \verb+\verb*+ and the environments
+%\texttt{verbatim} and \texttt{verbatim*} will change such that ASCII
+%characters 27 and 60 appear as \texttt{\char13} and \texttt{\char18}
+%rather than \texttt{'} and \texttt{`}. This does not affect \verb+\tt+,
+%\verb+\texttt+, etc.
+%
+%When the Computer Modern typewriter font \texttt{cmtt} in Knuth's
+%original OT1 encoding is used (i.e., \verb+\encodingdefault=OT1+,
+%\verb+\ttdefault=cmtt+), then the two replacement glyphs are taken
+%from that same font, where they are already available at positions
+%13 and 18. If any other font or font encoding is used, then the
+%\texttt{textcomp} package is loaded and its \verb+\textquotesingle+
+%and \verb+\textasciigrave+ macros are used to typeset these characters.
+%
+%This package loads \texttt{textcomp.sty} only if the use of a
+%non-\texttt{cmtt} font or a non-OT1 font encoding was already evident
+%at the point where \texttt{upquote.sty} was loaded. If such changes
+%happen later, add |\usepackage{textcomp}| yourself.
+%
+%\StopEventually{
+% \begin{thebibliography}{1}
+% \bibitem{Cov94} M.~Covington, \emph{Computer Languages in Type},
+% Journal of Scholarly Publishing, 26.1:34--41, 1994.
+% \bibitem{Kuh99} M.~Kuhn, \emph{ASCII and Unicode quotation marks},
+% 1999.\\ \url{http://www.cl.cam.ac.uk/~mgk25/ucs/quotes.html}
+% \end{thebibliography}
+%}
+%
+% \part{Appendix}
+% \appendix
+% \section{Implementation}
+%
+%\changes{v1.0}{2000/12/11}{Fix bug that replaced '0 and `0}
+%\changes{v1.1}{2003/06/19}{Switched to textcomp package}
+%\changes{v1.2}{2012/04/04}{Use textcomp only with fonts other than the default cmtt with OT1}
+%
+%We check |\encodingdefault| and |\ttdefault| to see whether the
+%glyphs that are already in \texttt{cmtt} as |\char13|
+%(\texttt{\char13}) and |\char18| (\texttt{\char18}) can be used, or
+%whether textcomp has to be loaded to access such glyphs.
+%
+% \begin{macrocode}
+\newcommand\upquote@cmtt{cmtt}
+\newcommand\upquote@OTone{OT1}
+\ifx\encodingdefault\upquote@OTone
+ \ifx\ttdefault\upquote@cmtt\else\RequirePackage{textcomp}\fi
+\else
+ \RequirePackage{textcomp}
+\fi
+% \end{macrocode}
+%The |\@noligs| macro is called by |\verb| and |\begin{verbatim}| to
+%turn the characters \texttt{` < > , ' -} into active characters that
+%merely print themselves rather than activating ligatures.
+%
+%This package merely adds code to \verb+\@noligs+ that changes the
+%glyphs used for \texttt{`} and \texttt{'}.
+% \begin{macrocode}
+\begingroup
+\catcode`'=\active
+\catcode``=\active
+\g@addto@macro\@noligs
+ {\let'\textquotesingle
+ \let`\textasciigrave
+ \ifx\encodingdefault\upquote@OTone
+ \ifx\ttdefault\upquote@cmtt
+ \def'{\char13 }
+ \def`{\char18 }
+ \fi\fi}
+\endgroup
+% \end{macrocode}
+%We check |\encodingdefault| and |\ttdefault| again at each invocation
+%of |\verb| or |\begin{verbatim}|, such that users can change fonts
+%and encodings within a document.
+%\Finale
diff --git a/Master/texmf-dist/source/latex/upquote/upquote.ins b/Master/texmf-dist/source/latex/upquote/upquote.ins
new file mode 100644
index 00000000000..98daeac0c9a
--- /dev/null
+++ b/Master/texmf-dist/source/latex/upquote/upquote.ins
@@ -0,0 +1,16 @@
+\input docstrip.tex
+\preamble
+
+Copyright (C) 2000 by Michael A. Covington
+Copyright (C) 2003 by Frank Mittelbach
+Copyright (C) 2012 by Markus Kuhn (current maintainer)
+
+Released under the LaTeX Project Public License v1.3c or later
+See http://www.latex-project.org/lppl.txt
+
+\endpreamble
+\keepsilent
+\usedir{tex/latex/upquote}
+\askforoverwritefalse
+\generate{\file{\jobname.sty}{\from{\jobname.dtx}{package}}}
+\endbatchfile
diff --git a/Master/texmf-dist/tex/latex/upquote/upquote.sty b/Master/texmf-dist/tex/latex/upquote/upquote.sty
index 67b4703525a..251fe91ec70 100644
--- a/Master/texmf-dist/tex/latex/upquote/upquote.sty
+++ b/Master/texmf-dist/tex/latex/upquote/upquote.sty
@@ -1,76 +1,40 @@
-\NeedsTeXFormat{LaTeX2e}[1995/12/01]
-\ProvidesPackage{upquote}[2003/08/11 v1.1 Covington's upright-quote
- modification to verbatim and verb]
-
-%% Copyright 2000 Michael A. Covington.
-%% Copyright 2003 Michael A. Covington, Frank Mittelbach.
%%
-%% It may be distributed and/or modified under the
-%% conditions of the LaTeX Project Public License, either version 1.2
-%% of this license or (at your option) any later version.
-%% The latest version of this license is in
-%% http://www.latex-project.org/lppl.txt
-%% and version 1.2 or later is part of all distributions of LaTeX
-%% version 1999/12/01 or later.
+%% This is file `upquote.sty',
+%% generated with the docstrip utility.
%%
-
-% Problem: Computer Modern Typewriter is the best font for program listings,
-% *but* it prints ` ' as bent opening and closing single quotes.
-% Other fonts, and most programming languages, print ` as a grave
-% accent and ' upright; ' is used both to open and to close quoted
-% strings.
-
-% See also M. Covington, "Computer Languages in Type," Journal of
-% Scholarly Publishing 26.1:34-41 (1994).
-
-% Solution: This package switches the typewriter font to Computer Modern
-% Typewriter (regardless of other fonts in use, so long as this
-% package is called afterward) and modifies the behavior of
-% verbatim, verbatim*, verb, and verb* to print ` ' the desired way.
-% It does not affect \tt, \texttt, etc.
-
-% Author: Michael A. Covington
-% Artificial Intelligence Center
-% The University of Georgia
-% http://www.ai.uga.edu/~mc
-%
-% and
-%
-% Covington Innovations (Consulting and Typesetting)
-% http://www.CovingtonInnovations.com
-
-% The modification is done by adding instructions to \@noligs,
-% which is called by verbatim and verb in order to turn the
-% characters ` < > , ' - into active characters that merely
-% print themselves rather than activating ligatures.
-%
-% What is added is code to redefine ` as grave and ' as upright single quote.
-%
-
-% Bug fix, 2000/12/11: previously, '0 (or ' and any digit) would print as a
-% nonexistent character. (The reason: \char13 or \char18 was combining with
-% the digit to make \char130, etc.) Fixed by adding curly brackets.
-
-
-
-%% Rewritten by FMi 2003/06/19
-%
-%
-% Use textcomp official chars so that change works in various
-% encodings
-%
-% Extend \@noligs (this also works with the latest listings package
-% that recognizes that the package was loaded)
-
-\RequirePackage{textcomp}
-
+%% The original source files were:
+%%
+%% upquote.dtx (with options: `package')
+%%
+%% Copyright (C) 2000 by Michael A. Covington
+%% Copyright (C) 2003 by Frank Mittelbach
+%% Copyright (C) 2012 by Markus Kuhn (current maintainer)
+%%
+%% Released under the LaTeX Project Public License v1.3c or later
+%% See http://www.latex-project.org/lppl.txt
+%%
+\NeedsTeXFormat{LaTeX2e}
+\ProvidesPackage{upquote}
+ [2012/04/05 v1.2 upright-quote and grave-accent glyphs in verbatim]
+\newcommand\upquote@cmtt{cmtt}
+\newcommand\upquote@OTone{OT1}
+\ifx\encodingdefault\upquote@OTone
+ \ifx\ttdefault\upquote@cmtt\else\RequirePackage{textcomp}\fi
+\else
+ \RequirePackage{textcomp}
+\fi
\begingroup
-\catcode`'=\active
-\catcode``=\active
+\catcode`'=\active
+\catcode``=\active
\g@addto@macro\@noligs
- {\let`\textasciigrave
- \let'\textquotesingle}
+ {\let'\textquotesingle
+ \let`\textasciigrave
+ \ifx\encodingdefault\upquote@OTone
+ \ifx\ttdefault\upquote@cmtt
+ \def'{\char13 }
+ \def`{\char18 }
+ \fi\fi}
\endgroup
-
-
\endinput
+%%
+%% End of file `upquote.sty'.
diff --git a/Master/tlpkg/bin/tlpkg-ctan-check b/Master/tlpkg/bin/tlpkg-ctan-check
index ebcb8247484..7935929f323 100755
--- a/Master/tlpkg/bin/tlpkg-ctan-check
+++ b/Master/tlpkg/bin/tlpkg-ctan-check
@@ -477,6 +477,7 @@ my @TLP_no_check = (
"etex", # binary
"finbib", # missing on CTAN
"fontname", # tl-update-auto
+ "fontware", # binary
"garuda-c90", # part of cjk
"groff", # binary
"gsftopk", # binary
@@ -501,6 +502,7 @@ my @TLP_no_check = (
"powerdot", # stale generated files on CTAN
"ps2pkm", # binary
"pstools", # binary
+ "ptex", # binary
"seetexk", # binary
"synctex", # binary
"t1utils", # binary