diff options
| -rw-r--r-- | Master/texmf-dist/doc/latex/fonttable/README | 19 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/latex/fonttable/fonttable.pdf | bin | 167649 -> 154284 bytes | |||
| -rw-r--r-- | Master/texmf-dist/source/latex/fonttable/fonttable.dtx | 179 | ||||
| -rw-r--r-- | Master/texmf-dist/source/latex/fonttable/fonttable.ins | 4 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/fonttable/fonttable.sty | 68 |
5 files changed, 247 insertions, 23 deletions
diff --git a/Master/texmf-dist/doc/latex/fonttable/README b/Master/texmf-dist/doc/latex/fonttable/README index 34ea0fb488e..d9696483e08 100644 --- a/Master/texmf-dist/doc/latex/fonttable/README +++ b/Master/texmf-dist/doc/latex/fonttable/README @@ -3,7 +3,20 @@ in a font (a font table), and/or some example text. This, in a package form, is a poor man's version of nfssfont.tex. - If there are any questions please ask them on the comp.text.tex newsgroup. + If there are any questions please ask them on the comp.text.tex newsgroup +as I am away more often than not. + +Changes in version 1.3 (2009/04/30) +o Fixed a major bug relating to redefining \: + +Changes in version 1.2 (2008/05/08) +o Minor extensions providing more text examples + +Changes in version 1.1 (2006/10/02) +o Minor extensions providing more text examples + +Changes in version 1.1 (2006/10/02) +o Minor extensions providing more text examples Changes in version 1.0a (2005/12/06) o Fixed bug preventing multiple unnumbered tables @@ -13,7 +26,7 @@ o First public release ------------------------------------------------------------------ Author: Peter Wilson (Herries Press) herries dot press at earthlink dot net - Copyright 2005 Peter R. Wilson + Copyright 2005--2009 Peter R. Wilson This work may be distributed and/or modified under the conditions of the Latex Project Public License, either @@ -54,7 +67,7 @@ o (for an index run: makeindex -s gind.ist fonttable.idx) o run: latex fonttable.dtx o Print *.dvi for a hardcopy of the package manual -2005/12/06 +2009/04/30 Peter Wilson herries dot press at earthlink dot net diff --git a/Master/texmf-dist/doc/latex/fonttable/fonttable.pdf b/Master/texmf-dist/doc/latex/fonttable/fonttable.pdf Binary files differindex cec27cf0a7e..83fdf4e5366 100644 --- a/Master/texmf-dist/doc/latex/fonttable/fonttable.pdf +++ b/Master/texmf-dist/doc/latex/fonttable/fonttable.pdf diff --git a/Master/texmf-dist/source/latex/fonttable/fonttable.dtx b/Master/texmf-dist/source/latex/fonttable/fonttable.dtx index 4336a9dfba9..a4cc3b5a187 100644 --- a/Master/texmf-dist/source/latex/fonttable/fonttable.dtx +++ b/Master/texmf-dist/source/latex/fonttable/fonttable.dtx @@ -3,7 +3,7 @@ % fonttable.dtx % % Author: Peter Wilson (Herries Press) herries dot press at earthlink dot net -% Copyright 2005 Peter R. Wilson +% Copyright 2005--2009 Peter R. Wilson % % This work may be distributed and/or modified under the % conditions of the Latex Project Public License, either @@ -55,7 +55,7 @@ % % \fi % -% \CheckSum{580} +% \CheckSum{640} % % \DoNotIndex{\',\.,\@M,\@@input,\@addtoreset,\@arabic,\@badmath} % \DoNotIndex{\@centercr,\@cite} @@ -100,9 +100,15 @@ % % \changes{v1.0}{2005/11/27}{First public release} % \changes{v1.0a}{2005/12/06}{Minor bug fix} +% \changes{v1.1}{2006/10/02}{Minor extensions} +% \changes{v1.2}{2006/10/02}{Minor extensions of texts} +% \changes{v1.3}{2009/04/30}{Fix serious bug} % % \def\fileversion{v1.0} \def\filedate{2005/11/27} % \def\fileversion{v1.0a} \def\filedate{2005/12/06} +% \def\fileversion{v1.1} \def\filedate{2006/10/02} +% \def\fileversion{v1.2} \def\filedate{2008/05/08} +% \def\fileversion{v1.3} \def\filedate{2009/04/30} % \newcommand*{\Lpack}[1]{\textsf {#1}} ^^A typeset a package % \newcommand*{\Lopt}[1]{\textsf {#1}} ^^A typeset an option % \newcommand*{\file}[1]{\texttt {#1}} ^^A typeset a file @@ -201,6 +207,32 @@ % The command \cs{regulartext}\marg{fontspec} typesets the example text % using \meta{fontspec}, for example \verb?\rmfamily\itshape?. % +% \DescribeMacro{\fonttexts} +% \DescribeMacro{\regulartexts} +% The macro \cs{fonttexts}\marg{testfont}\marg{text} typesets \meta{text} using +% the \meta{testfont} (e.g \texttt{cmr10}). Similarly the macro +% \cs{regulartexts}\marg{fontspec}\marg{text} typesets \meta{text} +% using \meta{fontspec} (e.g., \verb?\rmfamily\itshape?). +% +% \DescribeMacro{\germantext} +% \DescribeMacro{\latintext} +% \cs{germantext} expands to German language paragraph, borrowed from the +% \Lpack{blindtext} package~\cite{BLINDTEXT}. +% \cs{latintext} expands to one version of +% a paragraph of the traditional \textit{lorem ipsum} dummy Latin text. +% Either, or both, of these could be used as the \meta{text} argument +% to \cs{fonttexts} or \cs{regulartexts}. +% +% \DescribeMacro{\aztext} +% \DescribeMacro{\AZtext} +% \DescribeMacro{\digitstext} +% \DescribeMacro{\punctext} +% \cs{aztext} expands to the lowercase Latin alphabet a to z, and \cs{AZtext} +% is the corresponding command for the uppercase A to Z. +% The macros \cs{digitstext} and \cs{punctext} expand respectively to the +% digits 0 to 9, and to the typical punctuation marks. In all cases there +% is a space between each character. +% % % \StopEventually{ % \bibliographystyle{alpha} @@ -208,6 +240,13 @@ % \begin{thebibliography}{GMS94} % \addcontentsline{toc}{section}{\refname} % +% \bibitem[Lik05]{BLINDTEXT} +% Knut Lickert. +% \newblock \emph{Blindtext.sty: Creating text for testing / Texterzeugung +% zum testen}. +% \newblock October 2005. +% \newblock (Available from CTAN in \url{macros/latex/contrib/blindtext}) +% % \bibitem[MG04]{COMPANION} % Frank Mittelbach and Michel Goossens. % \newblock \emph{The LaTeX Companion}. @@ -231,7 +270,7 @@ % \begin{macrocode} %<*pack> \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{fonttable}[2005/12/06 v1.0a displays a font] +\ProvidesPackage{fonttable}[2009/04/30 v1.3 displays a font] % \end{macrocode} % @@ -467,9 +506,10 @@ % \cs{f@tchartline} does a line of the table, including external numbers, % and \cs{f@tsimpleline} does an unnumbered line. % \begin{macrocode} -\newcommand*{\f@tchartline}{&\f@toct{\0\1x}&&\:&&\:&&\:&&\:&&\:&&\:&&\:&&\:&&} +\newcommand*{\f@tchartline}{% + &\f@toct{\0\1x}&&\f@tpsg{}&&\f@tpsg{}&&\f@tpsg{}&&\f@tpsg{}&&\f@tpsg{}&&\f@tpsg{}&&\f@tpsg{}&&\f@tpsg{}&&} \newcommand*{\f@tsimpleline}{% - \:\f@tchartstrut& \: & \: & \: & \: & \: & \: & \:} + \f@tpsg{}\f@tchartstrut& \f@tpsg{} & \f@tpsg{} & \f@tpsg{} & \f@tpsg{} & \f@tpsg{} & \f@tpsg{} & \f@tpsg{}} % \end{macrocode} % \end{macro} @@ -547,21 +587,26 @@ % % \begin{macro}{\decimals} % \begin{macro}{\nodecimals} -% \begin{macro}{\:} +% \begin{macro}{\f@tpsg} % Following \cs{decimals}, which is the default, decimal numbers are % printed in the table. Following \cs{nodecimals} they are not printed. % -% \cs{:} typesets a single glyph, possibly with its decimal slot number. +% \cs{f@tpsg} typesets a single glyph, possibly with its decimal slot number. +% +% NOTE (2009/04/30): Initially \cs{f@tpsg} was called \cs{:}, which LaTeX +% defines to be a medium space. No doubt this was OK with the interactive +% version but can cause havoc when used in a package! +% \changes{v1.3}{2009/04/30}{Replaced redefinition of \cs{:} by \cs{f@tpsg}} % \begin{macrocode} \newcommand*{\nodecimals}{% %%% the original - \def\:{\setbox0=\hbox{\char\f@tn}% + \newcommand*{\f@tpsg}{\setbox0=\hbox{\char\f@tn}% \ifdim\ht0>7.5pt\f@treposition \else\ifdim\dp0>2.5pt\f@treposition\fi\fi \box0\global\advance\f@tn 1 }} \newcommand{\decimals}{% %%% mine - \def\:{\setbox0=\hbox{\char\f@tn\,\rlap{\tiny \the\f@tn}}% + \newcommand*{\f@tpsg}{\setbox0=\hbox{\char\f@tn\,\rlap{\tiny \the\f@tn}}% \ifdim\ht0>7.5pt\f@treposition \else\ifdim\dp0>2.5pt\f@treposition\fi\fi \box0\global\advance\f@tn 1 }} @@ -582,7 +627,7 @@ % \end{macro} % % \begin{macro}{\fonttext} -% \cs{fonttext}\marg{font} typesets \cs{text} using \meta{font} (e.g. +% \cs{fonttext}\marg{font} typesets \cs{knutext} using \meta{font} (e.g. % auncl10). % \begin{macrocode} \def\fonttext#1{% @@ -672,6 +717,71 @@ official r\^ole in fluffy souffl\'es? } % \end{macrocode} % \end{macro} % +% \begin{macro}{\guillemotleft} +% \begin{macro}{\guillemotright} +% \begin{macro}{\flqq} +% \begin{macro}{\frqq} +% Just in case the french quotes are not defined, as they are called for in +% the subsequent \cs{germantext}. +% \changes{v1.2}{2008/05/08}{Replaced \cs{providecommand} for guillemots +% by \cs{DeclareTextSymbol}} +% \begin{macrocode} +\DeclareTextSymbol{\guillemotleft}{OT1}{`\'} +\DeclareTextSymbol{\guillemotright}{OT1}{`\`} +\providecommand{\flqq}{\guillemotleft} +\providecommand{\frqq}{\guillemotright} + +% \end{macrocode} +% \end{macro} +% \end{macro} +% \end{macro} +% \end{macro} +% +% \begin{macro}{\germantext} +% Text from the \Lpack{Blindtext} package. +% \changes{v1.1}{2006/10/02}{Added \cs{germantext}} +% \begin{macrocode} +\newcommand*{\germantext}{% +Dies hier ist ein Blindtext zum Testen von Textausgaben. Wer +diesen Text liest, ist selbst schuld. Der Text gibt lediglich den +Grauwert der Schrift an. Ist das wirklich so? Ist es +gleich\-g\"ul\-tig ob ich schreibe: \frqq Dies ist ein +Blindtext\flqq\ oder \frqq Huardest gefburn\flqq? Kjift -- +mitnichten! Ein Blindtext bietet mir wichtige Informationen. An +ihm messe ich die Lesbarkeit einer Schrift, ihre Anmutung, wie +harmonisch die Figuren zueinander stehen und pr\"u\-fe, wie breit +oder schmal sie l\"auft. Ein Blindtext sollte m\"og\-lichst viele +verschiedene Buchstaben enthalten und in der Originalsprache +gesetzt sein. Er mu\ss\ keinen Sinn ergeben, sollte aber lesbar +sein. Fremdsprachige Texte wie \frqq Lorem ipsum\flqq\ dienen +nicht dem eigentlichen Zweck, da sie eine +falsche Anmutung vermitteln.\par} + +% \end{macrocode} +% \end{macro} +% +% \begin{macro}{\latintext} +% The traditional printers' text. +% \changes{v1.1}{2006/10/02}{Added \cs{latintext}} +% \begin{macrocode} +\newcommand*{\latintext}{% +Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam +lobortis facilisis sem. Nullam nec mi et neque pharetra +sollicitudin. Praesent imperdiet mi nec ante. Donec ullamcorper, +felis non sodales commodo, lectus velit ultrices augue, a +dignissim nibh lectus placerat pede. Vivamus nunc nunc, molestie +ut, ultricies vel, semper in, velit. Ut porttitor. Praesent in +sapien. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. +Duis fringilla tristique neque. Sed interdum libero ut metus. +Pellentesque placerat. Nam rutrum augue a leo. Morbi sed elit sit +amet ante lobortis sollicitudin. Praesent blandit blandit mauris. +Praesent lectus tellus, aliquet aliquam, luctus a, egestas a, +turpis. Mauris lacinia lorem sit amet ipsum. Nunc quis urna dictum +turpis accumsan semper.\par} + +% \end{macrocode} +% \end{macro} +% % \begin{macro}{\simpletext} % \begin{macro}{\fulltext} % \begin{macro}{\moreknutext} @@ -682,7 +792,54 @@ official r\^ole in fluffy souffl\'es? } % \begin{macrocode} \newcommand*{\simpletext}{\let\moreknutext\relax \let\knunames\relax} \newcommand*{\fulltext}{\let\moreknutext\@moreknutext \let\knunames\@knunames} -\simpletext +\fulltext + +% \end{macrocode} +% \end{macro} +% \end{macro} +% \end{macro} +% \end{macro} +% +% \begin{macro}{fonttexts} +% \cs{fonttexts}\marg{font}\marg{text} typesets \meta{text} using \meta{font} (e.g. +% auncl10). +% \changes{v1.1}{2006/10/02}{Added \cs{fonttexts}} +% \begin{macrocode} +\def\fonttexts#1#2{% + \def\f@tfontname{#1}% + \bgroup + \f@tstartfont + #2 + \egroup} + +% \end{macrocode} +% \end{macro} +% +% \begin{macro}{\regulartexts} +% \cs{regulartext}\marg{fontspec}\marg{text} typesets \meta{text} using \meta{fontspec} +% (e.g., \cs{aunclfamily}). +% \changes{v1.1}{2006/10/02}{Added \cs{regulartexts}} +% \begin{macrocode} +\def\regulartexts#1#2{% + \bgroup + #1 #2 + \egroup} + +% \end{macrocode} +% \end{macro} +% +% \begin{macro}{\aztext} +% \begin{macro}{\AZtext} +% \begin{macro}{\digitstext} +% \begin{macro}{\punctext} +% The various characters used for Latin texts. +% \changes{v1.2}{2008/05/08}{Added \cs{aztext}, \cs{AZtext}, \cs{digitstext} +% and \cs{punctext}} +% \begin{macrocode} +\newcommand*{\aztext}{a b c d e f g h i j k l m n o p q r s t u v w x y z} +\newcommand*{\AZtext}{A B C D E F G H I J K L M N O P Q R S T U V W X Y Z} +\newcommand*{\digitstext}{0 1 2 3 4 5 6 7 8 9} +\newcommand*{\punctext}{` ! @ \$ \& * ( ) \_ - + = [ ] < > \{ \} : ; ' , . ? /} % \end{macrocode} % \end{macro} diff --git a/Master/texmf-dist/source/latex/fonttable/fonttable.ins b/Master/texmf-dist/source/latex/fonttable/fonttable.ins index eab35370c5b..d2dd2a6cc6e 100644 --- a/Master/texmf-dist/source/latex/fonttable/fonttable.ins +++ b/Master/texmf-dist/source/latex/fonttable/fonttable.ins @@ -1,6 +1,6 @@ %% fonttable.ins %% Author: Peter Wilson (Herries Press) herries dot press at earthlink dot net -%% Copyright 2005 Peter R. Wilson +%% Copyright 2005--2009 Peter R. Wilson %% %% This work may be distributed and/or modified under the %% conditions of the Latex Project Public License, either @@ -25,7 +25,7 @@ \preamble ------------------------------------------------------------------ Author: Peter Wilson (Herries Press) herries dot press at earthlink dot net - Copyright 2005 Peter R. Wilson + Copyright 2005--2009 Peter R. Wilson This work may be distributed and/or modified under the conditions of the Latex Project Public License, either diff --git a/Master/texmf-dist/tex/latex/fonttable/fonttable.sty b/Master/texmf-dist/tex/latex/fonttable/fonttable.sty index c18b34bf2ed..dd740fde031 100644 --- a/Master/texmf-dist/tex/latex/fonttable/fonttable.sty +++ b/Master/texmf-dist/tex/latex/fonttable/fonttable.sty @@ -7,7 +7,7 @@ %% fonttable.dtx (with options: `pack') %% ------------------------------------------------------------------ %% Author: Peter Wilson (Herries Press) herries dot press at earthlink dot net -%% Copyright 2005 Peter R. Wilson +%% Copyright 2005--2009 Peter R. Wilson %% %% This work may be distributed and/or modified under the %% conditions of the Latex Project Public License, either @@ -23,7 +23,7 @@ %% This work consists of the files listed in the README file. %% ------------------------------------------------------------------ \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{fonttable}[2005/12/06 v1.0a displays a font] +\ProvidesPackage{fonttable}[2009/04/30 v1.3 displays a font] \providecommand*{\sevenrm}{\fontsize{7}{9pt}\rmfamily} \newcount\f@tm \newcount\f@tn \newcount\f@tp \newdimen\f@tdim @@ -122,9 +122,10 @@ \f@tsimpleline \\ \hline \f@tsimpleline \f@tevenlinenonum} -\newcommand*{\f@tchartline}{&\f@toct{\0\1x}&&\:&&\:&&\:&&\:&&\:&&\:&&\:&&\:&&} +\newcommand*{\f@tchartline}{% + &\f@toct{\0\1x}&&\f@tpsg{}&&\f@tpsg{}&&\f@tpsg{}&&\f@tpsg{}&&\f@tpsg{}&&\f@tpsg{}&&\f@tpsg{}&&\f@tpsg{}&&} \newcommand*{\f@tsimpleline}{% - \:\f@tchartstrut& \: & \: & \: & \: & \: & \: & \:} + \f@tpsg{}\f@tchartstrut& \f@tpsg{} & \f@tpsg{} & \f@tpsg{} & \f@tpsg{} & \f@tpsg{} & \f@tpsg{} & \f@tpsg{}} \newcommand*{\f@tchartstrut}{\lower4.5pt\vbox to14pt{}} \newdimen\ftablewidth @@ -158,13 +159,13 @@ \newcommand*{\nodecimals}{% %%% the original - \def\:{\setbox0=\hbox{\char\f@tn}% + \newcommand*{\f@tpsg}{\setbox0=\hbox{\char\f@tn}% \ifdim\ht0>7.5pt\f@treposition \else\ifdim\dp0>2.5pt\f@treposition\fi\fi \box0\global\advance\f@tn 1 }} \newcommand{\decimals}{% %%% mine - \def\:{\setbox0=\hbox{\char\f@tn\,\rlap{\tiny \the\f@tn}}% + \newcommand*{\f@tpsg}{\setbox0=\hbox{\char\f@tn\,\rlap{\tiny \the\f@tn}}% \ifdim\ht0>7.5pt\f@treposition \else\ifdim\dp0>2.5pt\f@treposition\fi\fi \box0\global\advance\f@tn 1 }} @@ -223,9 +224,62 @@ official r\^ole in fluffy souffl\'es? } Pauline Qu\^eneau Roxanne Sabine T\~a{\'\j}a Ur\v{s}ula Vivian Wendy Xanthippe Yv{\o}nne Z\"azilie\par} +\DeclareTextSymbol{\guillemotleft}{OT1}{`\'} +\DeclareTextSymbol{\guillemotright}{OT1}{`\`} +\providecommand{\flqq}{\guillemotleft} +\providecommand{\frqq}{\guillemotright} + +\newcommand*{\germantext}{% +Dies hier ist ein Blindtext zum Testen von Textausgaben. Wer +diesen Text liest, ist selbst schuld. Der Text gibt lediglich den +Grauwert der Schrift an. Ist das wirklich so? Ist es +gleich\-g\"ul\-tig ob ich schreibe: \frqq Dies ist ein +Blindtext\flqq\ oder \frqq Huardest gefburn\flqq? Kjift -- +mitnichten! Ein Blindtext bietet mir wichtige Informationen. An +ihm messe ich die Lesbarkeit einer Schrift, ihre Anmutung, wie +harmonisch die Figuren zueinander stehen und pr\"u\-fe, wie breit +oder schmal sie l\"auft. Ein Blindtext sollte m\"og\-lichst viele +verschiedene Buchstaben enthalten und in der Originalsprache +gesetzt sein. Er mu\ss\ keinen Sinn ergeben, sollte aber lesbar +sein. Fremdsprachige Texte wie \frqq Lorem ipsum\flqq\ dienen +nicht dem eigentlichen Zweck, da sie eine +falsche Anmutung vermitteln.\par} + +\newcommand*{\latintext}{% +Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam +lobortis facilisis sem. Nullam nec mi et neque pharetra +sollicitudin. Praesent imperdiet mi nec ante. Donec ullamcorper, +felis non sodales commodo, lectus velit ultrices augue, a +dignissim nibh lectus placerat pede. Vivamus nunc nunc, molestie +ut, ultricies vel, semper in, velit. Ut porttitor. Praesent in +sapien. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. +Duis fringilla tristique neque. Sed interdum libero ut metus. +Pellentesque placerat. Nam rutrum augue a leo. Morbi sed elit sit +amet ante lobortis sollicitudin. Praesent blandit blandit mauris. +Praesent lectus tellus, aliquet aliquam, luctus a, egestas a, +turpis. Mauris lacinia lorem sit amet ipsum. Nunc quis urna dictum +turpis accumsan semper.\par} + \newcommand*{\simpletext}{\let\moreknutext\relax \let\knunames\relax} \newcommand*{\fulltext}{\let\moreknutext\@moreknutext \let\knunames\@knunames} -\simpletext +\fulltext + +\def\fonttexts#1#2{% + \def\f@tfontname{#1}% + \bgroup + \f@tstartfont + #2 + \egroup} + +\def\regulartexts#1#2{% + \bgroup + #1 #2 + \egroup} + +\newcommand*{\aztext}{a b c d e f g h i j k l m n o p q r s t u v w x y z} +\newcommand*{\AZtext}{A B C D E F G H I J K L M N O P Q R S T U V W X Y Z} +\newcommand*{\digitstext}{0 1 2 3 4 5 6 7 8 9} +\newcommand*{\punctext}{` ! @ \$ \& * ( ) \_ - + = [ ] < > \{ \} : ; ' , . ? /} \endinput %% |