summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2008-12-16 00:54:53 +0000
committerKarl Berry <karl@freefriends.org>2008-12-16 00:54:53 +0000
commit4bb04da7638647ee48d6282ee8e7e7c012824362 (patch)
tree9cb01daa12bf7637017def89b2e9b5cad082de31 /Master
parent52c664adcaba5d606cd23141c7ed58faee2fb74e (diff)
leading 0.3 (15dec08)
git-svn-id: svn://tug.org/texlive/trunk@11626 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/doc/latex/leading/README4
-rw-r--r--Master/texmf-dist/doc/latex/leading/leading.pdfbin88903 -> 92500 bytes
-rw-r--r--Master/texmf-dist/source/latex/leading/leading.dtx149
-rw-r--r--Master/texmf-dist/source/latex/leading/leading.ins19
-rw-r--r--Master/texmf-dist/tex/latex/leading/leading.sty19
5 files changed, 55 insertions, 136 deletions
diff --git a/Master/texmf-dist/doc/latex/leading/README b/Master/texmf-dist/doc/latex/leading/README
index 7b5609063ba..0750f524faf 100644
--- a/Master/texmf-dist/doc/latex/leading/README
+++ b/Master/texmf-dist/doc/latex/leading/README
@@ -1,6 +1,6 @@
___________________
The LEADING package
-v0.2
+v0.3
Defines the \leading{<length>} command to set the
leading of the document to the length specified. In
@@ -9,4 +9,4 @@ useful in most cases.
______________
Will Robertson
-2007
+2007-2008
diff --git a/Master/texmf-dist/doc/latex/leading/leading.pdf b/Master/texmf-dist/doc/latex/leading/leading.pdf
index 564ed2c529f..61436426c3e 100644
--- a/Master/texmf-dist/doc/latex/leading/leading.pdf
+++ b/Master/texmf-dist/doc/latex/leading/leading.pdf
Binary files differ
diff --git a/Master/texmf-dist/source/latex/leading/leading.dtx b/Master/texmf-dist/source/latex/leading/leading.dtx
index 60522e1e7c2..56c1c3a650f 100644
--- a/Master/texmf-dist/source/latex/leading/leading.dtx
+++ b/Master/texmf-dist/source/latex/leading/leading.dtx
@@ -20,17 +20,13 @@
\input docstrip.tex
\keepsilent
\preamble
-
- __________________________________
- Copyright (C) 2007 Will Robertson
-
+ _______________________________________
+ Copyright (C) 2007-2008 Will Robertson
License information appended.
-
-
\endpreamble
\postamble
-Copyright (C) 2007 by Will Robertson <wspr81@gmail.com>
+Copyright (C) 2007-2008 by Will Robertson <wspr81@gmail.com>
Distributable under the LaTeX Project Public License,
version 1.3c or higher (your choice). The latest version of
@@ -85,7 +81,7 @@ This work consists of the file \jobname.dtx
%<*readme>
___________________
The LEADING package
-v0.2
+v0.3
Defines the \leading{<length>} command to set the
leading of the document to the length specified. In
@@ -94,7 +90,7 @@ useful in most cases.
______________
Will Robertson
-2007
+2007-2008
%</readme>
%
% \fi
@@ -109,59 +105,64 @@ Will Robertson
%
% \maketitle
%
-% \noindent
+% \section{Introduction}
+%
% \LaTeX\ defines two methods of specifying \emph{leading}\footnote{Pronounced to rhyme with `sledding'; the word arises from the spacers of lead used to separate lines of text in traditional metal press typesetting}, or the distance between successive lines of text:
-% \codeline {\cmd\linespread\marg{ratio to font size} , and}
-% \codeline {\cmd\renewcommand\cmd\baselinestretch\marg{ratio to original value} .}
+% \codeline {\cmd\linespread\marg{ratio to original} , and\DescribeMacro{\linespread}}
+% \codeline {\cmd\renewcommand\cmd\baselinestretch\marg{ratio to original} .\DescribeMacro{\baselinestretch}}
% (I've got no idea what the difference between the two methods actually is.)
%
% For example, in the \pkg{pracjourn} class,
% a font size and leading of 12\,pt/15.5\,pt was chosen, which required the preamble declaration
-% |\linespread{1.069}|, as $12\times 1.069\approx15.5$.
+% |\linespread{1.069}|, because the default leading for a 12\,pt document is 14.5\,pt and $14.5\times 1.069\approx15.5$.
%
% But this is not how most people define the typesetting of their paragraphs.
-% Instructions don't come from the designer: ``make the leading 1.069 times the font size''.
-% That's just silly. Instead, it's common to see ``give me a leading of 15.5\,pt''. And indeed, that's how
+% Instructions don't come from the designer: ``increase the leading 1.069 times the standard size in a 12\,pt document''. Instead, it's common to see ``give me a leading of 15.5\,pt''. And indeed, that's how
% \LaTeX's \cmd\fontsize\ command works.
%
-% This package defines the \cmd\leading\marg{length} command,
+% This package defines the \cmd\leading\marg{length}\DescribeMacro{\leading}\ command,
% which sets the leading immediately to the \meta{length} specified. Here's an example:\bigskip
%
% \noindent
% \begin{minipage}[t]{0.49\linewidth}
-% \leading{11pt}|\leading{11pt}|\\\small
+% |\leading{11pt}|\par\noindent\small\leading{11pt}
%Upon observing him more closely, I perceived that he wore a black silk
%apron over his small-clothes; and this was a thing which I thought very
%odd. Before I had time to make any remark, however, upon so singular a
%circumstance, he interrupted me with a second \emph{``ahem!''}
% \end{minipage}\hfill
% \begin{minipage}[t]{0.49\linewidth}
-% \leading{13pt}|\leading{5mm}|\\\small
+% |\leading{5mm}|\par\noindent\small\leading{5mm}
%Upon observing him more closely, I perceived that he wore a black silk
%apron over his small-clothes; and this was a thing which I thought very
%odd. Before I had time to make any remark, however, upon so singular a
%circumstance, he interrupted me with a second \emph{``ahem!''}
% \end{minipage}
-%
-% \bigskip\noindent
-% Because \cmd\leading\ uses \cmd\linespread\ internally, the results
+%
+% \section{Notes}
+%
+% The \cmd\leading\ command will ignore spaces after it.
+%
+% As \cmd\leading\ uses \cmd\linespread\ internally, the results
% of |\leading{15.5pt}| in a 12\,pt document and |\linespread{1.069}|
-% are identical. But because \cmd\leading\ uses a fixed length, if the
+% are identical. This means that the leading at other font sizes (\eg, |\small|, |\large|)
+% will also be adjusted by the same ratio.
+%
+% Since \cmd\leading\ uses a fixed length, if the
% font size of the document changes then its value will need to be
% adjusted. This isn't a problem in general, however, because it is common
% for different ratios of linespread to be used for different absolute
% font sizes anyway.
%
% \StopEventually{}
-% \clearpage
% \part{The \pkg{\jobname} package}
%\iffalse
%<*package>
%\fi
-% This is the package.
+%
% \begin{macrocode}
\ProvidesPackage{leading}
- [2007/05/06 v0.2 Define leading length]
+ [2008/12/11 v0.3 Define leading length]
% \end{macrocode}
%
% \PrintChanges
@@ -176,13 +177,12 @@ Will Robertson
% \begin{macrocode}
\newcommand\leading[1]{%
\begingroup
- \normalfont
- \@tempdima=\f@size pt\relax
+ \@tempdima=\f@baselineskip\relax
\@tempdimb=#1\relax
\setlength\@tempdimc{1pt*\ratio{\@tempdimb}{\@tempdima}}%
- \global\@tempdimc\@tempdimc
+ \global\@tempdimc=\@tempdimc
\endgroup
- \linespread{\strip@pt\@tempdimc}\normalfont}
+ \linespread{\strip@pt\@tempdimc}\selectfont\ignorespaces}
% \end{macrocode}
% \end{macro}
%
@@ -190,8 +190,6 @@ Will Robertson
%</package>
%\fi
%
-% \clearpage
-%
% \PrintIndex
%
% \Finale
@@ -202,15 +200,16 @@ Will Robertson
% \begin{macrocode}
\ProvidesPackage{dtx-style}
-\errorcontextlines=999
+\DoNotIndex{\begingroup,\endgroup,\global,\relax,\newcommand,\setlength,\ProvidesPackage}
-\def\@dotsep{1000}
-\setcounter{tocdepth}{2}
-\setlength\columnseprule{0.4pt}
-\renewcommand\tableofcontents{\relax
- \begin{multicols}{2}[\section*{\contentsname}]\relax
- \@starttoc{toc}\relax
- \end{multicols}}
+\usepackage[svgnames]{xcolor}
+\usepackage{calc,enumitem,fancyvrb,graphicx,\jobname}
+
+\usepackage[osf,sc]{mathpazo}
+\linespread{1.1} % A bit more space between lines
+\frenchspacing % Remove ugly extra space after punctuation
+\setlength\parindent{2em}
+\definecolor{niceblue}{rgb}{0.2,0.4,0.8}
\setcounter{IndexColumns}{2}
\renewenvironment{theglossary}
@@ -221,69 +220,12 @@ Will Robertson
\def\pfill{\hspace*{\fill}}}
{\endlist}
-\usepackage[svgnames]{xcolor}
-\usepackage{calc,enumitem,fancyvrb,graphicx,\jobname}
-
-\usepackage[osf,sc]{mathpazo}
-\linespread{1.069} % A bit more space between lines
-\frenchspacing % Remove ugly extra space after punctuation
-
-\definecolor{niceblue}{rgb}{0.2,0.4,0.8}
-\newenvironment{example}[1]
- {\VerbatimEnvironment
- \def\Options{#1}%
- \begin{VerbatimOut}[gobble=4]{\examplefilename}}
- {\end{VerbatimOut}\relax
- \typesetexample}
-
\def\theCodelineNo{\textcolor{niceblue}{\sffamily\tiny\arabic{CodelineNo}}}
-\let\examplesize\normalsize
-\let\auxwidth\relax
-
-\newlength\examplewidth\newlength\verbatimwidth
-\newlength\exoutdent \newlength\exverbgap
-\setlength\exverbgap{1em}
-\setlength\exoutdent{-0.15\textwidth}
-\newsavebox\verbatimbox
-\edef\examplefilename{\jobname.example}
-
-\newcommand\typesetexample{\relax
- \smallskip
- \noindent
- \begin{minipage}{\linewidth}
- \color{niceblue}
- \hrulefill\par
- \edef\@tempa{[gobble=0,fontsize=\noexpand\scriptsize,\Options]}%
- \begin{lrbox}{\verbatimbox}\relax
- \expandafter\BVerbatimInput\@tempa{\examplefilename}%
- \end{lrbox}
- \begin{list}{}{\setlength\itemindent{0pt}
- \setlength\leftmargin\exoutdent
- \setlength\rightmargin{0pt}}\item
- \ifx\auxwidth\relax
- \setlength\verbatimwidth{\wd\verbatimbox}%
- \else
- \setlength\verbatimwidth{\auxwidth}%
- \fi
- \begin{minipage}[c]{\textwidth-\exoutdent-\verbatimwidth-\exverbgap}
- \catcode`\%=14\centering\input\examplefilename\relax
- \end{minipage}\hfill
- \begin{minipage}[c]{\verbatimwidth}
- \usebox\verbatimbox
- \end{minipage}
- \end{list}
- \par\noindent\hrulefill
- \end{minipage}
- \smallskip}
-
-\newcommand*\setverbwidth[1]{\def\auxwidth{#1}}
-
\newcommand*\name[1]{{#1}}
\newcommand*\pkg[1]{\textsf{#1}}
\newcommand*\feat[1]{\texttt{#1}}
\newcommand*\opt[1]{\texttt{#1}}
-
\newcommand*\note[1]{\unskip\footnote{#1}}
\let\latin\textit
@@ -292,27 +234,16 @@ Will Robertson
\def\ie{\latin{i.e.}}
\def\etc{\@ifnextchar.{\latin{etc}}{\latin{etc.}\@}}
-\def\STIX{\textsc{stix}}
-\def\MacOSX{Mac~OS~X}
-\def\ascii{\textsc{ascii}}
-\def\OMEGA{Omega}
-
-\makeatletter
\newcounter{argument}
\g@addto@macro\endmacro{\setcounter{argument}{0}}
\newcommand*\darg[1]{%
\stepcounter{argument}%
- {\ttfamily\char`\#\theargument~:~}#1\par\noindent\ignorespaces}
+ {\ttfamily\makebox[0pt][r]{\char`\{}\char`\#\theargument\char`\}:~}#1\par\noindent\ignorespaces}
\newcommand*\doarg[1]{%
\stepcounter{argument}%
{\ttfamily\makebox[0pt][r]{[}\char`\#\theargument]:~}#1\par\noindent\ignorespaces}
-\makeatother
-\newcommand\codeline[1]{\par\noindent\hspace{2\parindent}#1\par\noindent\ignorespaces}
-
-\newcommand\unichar[2]{\textsc{\MakeLowercase{u+#1: #2}}}
-
-\setlength\parindent{2em}
+\newcommand\codeline[1]{\par\noindent\hspace{2\parindent}#1\par\noindent\ignorespaces}
% \end{macrocode}
%</dtx-style>
%\fi
diff --git a/Master/texmf-dist/source/latex/leading/leading.ins b/Master/texmf-dist/source/latex/leading/leading.ins
index cc59be64919..4f0a2f6e025 100644
--- a/Master/texmf-dist/source/latex/leading/leading.ins
+++ b/Master/texmf-dist/source/latex/leading/leading.ins
@@ -5,26 +5,19 @@
%% The original source files were:
%%
%% leading.dtx (with options: `batchfile')
-%%
-%% __________________________________
-%% Copyright (C) 2007 Will Robertson
-%%
+%% _______________________________________
+%% Copyright (C) 2007-2008 Will Robertson
%% License information appended.
-%%
-%%
\input docstrip.tex
\keepsilent
\preamble
-
- __________________________________
- Copyright (C) 2007 Will Robertson
-
+ _______________________________________
+ Copyright (C) 2007-2008 Will Robertson
License information appended.
-
\endpreamble
\postamble
-Copyright (C) 2007 by Will Robertson <wspr81@gmail.com>
+Copyright (C) 2007-2008 by Will Robertson <wspr81@gmail.com>
Distributable under the LaTeX Project Public License,
version 1.3c or higher (your choice). The latest version of
@@ -52,7 +45,7 @@ This work consists of the file \jobname.dtx
\Msg{*************************************************************}
\endbatchfile
%%
-%% Copyright (C) 2007 by Will Robertson <wspr81@gmail.com>
+%% Copyright (C) 2007-2008 by Will Robertson <wspr81@gmail.com>
%%
%% Distributable under the LaTeX Project Public License,
%% version 1.3c or higher (your choice). The latest version of
diff --git a/Master/texmf-dist/tex/latex/leading/leading.sty b/Master/texmf-dist/tex/latex/leading/leading.sty
index 89f1353c153..b060bf54f73 100644
--- a/Master/texmf-dist/tex/latex/leading/leading.sty
+++ b/Master/texmf-dist/tex/latex/leading/leading.sty
@@ -5,27 +5,22 @@
%% The original source files were:
%%
%% leading.dtx (with options: `package')
-%%
-%% __________________________________
-%% Copyright (C) 2007 Will Robertson
-%%
+%% _______________________________________
+%% Copyright (C) 2007-2008 Will Robertson
%% License information appended.
-%%
-%%
\ProvidesPackage{leading}
- [2007/05/06 v0.2 Define leading length]
+ [2008/12/11 v0.3 Define leading length]
\RequirePackage{calc}
\newcommand\leading[1]{%
\begingroup
- \normalfont
- \@tempdima=\f@size pt\relax
+ \@tempdima=\f@baselineskip\relax
\@tempdimb=#1\relax
\setlength\@tempdimc{1pt*\ratio{\@tempdimb}{\@tempdima}}%
- \global\@tempdimc\@tempdimc
+ \global\@tempdimc=\@tempdimc
\endgroup
- \linespread{\strip@pt\@tempdimc}\normalfont}
+ \linespread{\strip@pt\@tempdimc}\selectfont\ignorespaces}
%%
-%% Copyright (C) 2007 by Will Robertson <wspr81@gmail.com>
+%% Copyright (C) 2007-2008 by Will Robertson <wspr81@gmail.com>
%%
%% Distributable under the LaTeX Project Public License,
%% version 1.3c or higher (your choice). The latest version of