From cca6239e7726149706cc33f0eb5e025629e1655c Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 12 Jun 2010 23:34:35 +0000 Subject: termlist update (12jun10) git-svn-id: svn://tug.org/texlive/trunk@18923 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/termlist/README | 22 ++++-- Master/texmf-dist/doc/latex/termlist/termlist.pdf | Bin 87672 -> 169943 bytes .../texmf-dist/source/latex/termlist/termlist.dtx | 80 ++++++++++++--------- Master/texmf-dist/tex/latex/termlist/termlist.sty | 9 +-- Master/tlpkg/libexec/ctan2tds | 2 + 5 files changed, 71 insertions(+), 42 deletions(-) diff --git a/Master/texmf-dist/doc/latex/termlist/README b/Master/texmf-dist/doc/latex/termlist/README index d5cb91471aa..cdb51d00c79 100644 --- a/Master/texmf-dist/doc/latex/termlist/README +++ b/Master/texmf-dist/doc/latex/termlist/README @@ -1,5 +1,19 @@ -The termlist package provides environments to indent and label any -kind of terms with the equation counter, like mathematical terms are -indented and labelled inside an equation or eqnarray environment. +The termlist package provides environments to typeset lists of +numbered terms, where the "terms" may contain anything printable. +The list of terms is formatted to look consistent to a list of +mathematical equations inside an eqnarray environment. Also for +consistency, the same equation counter is used for numbering. You +may think of termlist as a generalisation of the eqnarray +environment, if you want to typeset more than just mathematics. -Copyright 2008 Bernd Rellermeyer +Copyright 2008, 2010 Bernd Rellermeyer + +This file may be distributed and/or modified under the conditions +of the LaTeX Project Public License, either version 1.3b 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.3b or later is part of all distributions of LaTeX +version 2005/12/01 or later. diff --git a/Master/texmf-dist/doc/latex/termlist/termlist.pdf b/Master/texmf-dist/doc/latex/termlist/termlist.pdf index 0f9eaa85e3b..2168183bc65 100644 Binary files a/Master/texmf-dist/doc/latex/termlist/termlist.pdf and b/Master/texmf-dist/doc/latex/termlist/termlist.pdf differ diff --git a/Master/texmf-dist/source/latex/termlist/termlist.dtx b/Master/texmf-dist/source/latex/termlist/termlist.dtx index 122ac553f45..48a9144e5ef 100644 --- a/Master/texmf-dist/source/latex/termlist/termlist.dtx +++ b/Master/texmf-dist/source/latex/termlist/termlist.dtx @@ -1,10 +1,14 @@ % \iffalse meta-comment % -% The termlist package provides environments to indent and label any -% kind of terms with the equation counter, like mathematical terms are -% indented and labelled inside an equation or eqnarray environment. +% The termlist package provides environments to typeset lists of +% numbered terms, where the "terms" may contain anything printable. +% The list of terms is formatted to look consistent to a list of +% mathematical equations inside an eqnarray environment. Also for +% consistency, the same equation counter is used for numbering. You +% may think of termlist as a generalisation of the eqnarray +% environment, if you want to typeset more than just mathematics. % -% Copyright 2008 Bernd Rellermeyer +% Copyright 2008, 2010 Bernd Rellermeyer % % This file may be distributed and/or modified under the conditions % of the LaTeX Project Public License, either version 1.3b of this @@ -45,7 +49,7 @@ % TDS:source/latex/termlist/termlist.dtx % %\NeedsTeXFormat{LaTeX2e} -%\ProvidesPackage{termlist}[2008/08/18 v1.0 First release] +%\ProvidesPackage{termlist}[2010/06/12 v1.1 Minor layout corrections] %<*ignore> \begingroup \def\x{LaTeX2e}% @@ -63,9 +67,9 @@ \preamble -Label any kind of terms with the equation counter. +Typeset lists of numbered terms. -Copyright 2008 Bernd Rellermeyer +Copyright 2008, 2010 Bernd Rellermeyer This file may be distributed and/or modified under the conditions of the LaTeX Project Public License, either version 1.3b of this @@ -112,7 +116,7 @@ version 2005/12/01 or later. % % \fi % -% \CheckSum{67} +% \CheckSum{73} % \CharacterTable % {Upper-case \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 % Lower-case \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 @@ -131,6 +135,7 @@ version 2005/12/01 or later. % % % \changes{v1.0}{2008/08/18}{First release} +% \changes{v1.1}{2010/06/12}{Minor layout corrections} % % \GetFileInfo{termlist.sty} % @@ -141,10 +146,14 @@ version 2005/12/01 or later. % \maketitle % % \begin{abstract}\noindent -% The \textsf{termlist} package provides environments to indent and -% label any kind of terms with the |equation| counter, like -% mathematical terms are indented and labelled inside an |equation| -% or |eqnarray| environment. +% The \textsf{termlist} package provides environments to typeset +% lists of numbered terms, where the ``terms'' may contain anything +% printable. The list of terms is formatted to look consistent to a +% list of mathematical equations inside an |eqnarray| environment. +% Also for consistency, the same |equation| counter is used for +% numbering. You may think of termlist as a generalisation of the +% |eqnarray| environment, if you want to typeset more than just +% mathematics. % \end{abstract} % % \section{Introduction} @@ -155,15 +164,16 @@ version 2005/12/01 or later. % math modes are intrinsic parts of \TeX\ and have left their marks on % the whole system. % -% The \textsf{termlist} package is a generalization of the |equation| -% and |eqnarray| environments, especially for non-mathematical texts. -% It provides environments to typeset any kind of non-mathematical -% terms, like propositions, hypotheses, or examples, in the same way -% mathematical terms are typesetted inside an |equation| or |eqnarray| -% environment. I.\,e.\, the terms are indented and labelled with a -% continuous number. For consistency with the |equation| and -% |eqnarray| environments, the same |equation| counter is used for -% labelling the terms. +% The \textsf{termlist} package may be seen as a generalization of the +% |equation| and |eqnarray| environments for non-mathematical texts. +% It provides environments to typeset any kinds of mathematical or +% non-mathematical terms, like propositions, hypotheses, examples, or +% linguistic terms, in the same way mathematical terms are typesetted +% inside an |equation| or |eqnarray| environment. I.\,e., the terms +% are indented and labelled with a continuous number---for consistency +% with the |equation| and |eqnarray| environments, the same |equation| +% counter is used for that---so that the look consistent to +% mathematical terms inside those environments. % % The \textsf{termlist} package is based on an idea of the % \textsf{covington} package. @@ -175,14 +185,14 @@ version 2005/12/01 or later. % % \DescribeEnv{termlist} The |termlist| environment is the fundamental % one of these environments. It is a list of terms, each indented and -% labelled with the |equation| counter on the left side of the page by -% default. The default label can be changed by the optional argument -% of the |\item| command. +% labelled with the |equation| counter on the left side by default. +% The default label can be changed by the optional argument of the +% |\item| command. % % For consistency with the |equation| and |eqnarray| environments, the -% \textsf{leqno} package or something similar should be used to print +% global |leqno| option or something similar should be used to print % the labels of mathematical terms inside these environments also on -% the left side of the page. +% the left side. % % \begin{demo}{termlist} % \begin{termlist} @@ -258,9 +268,8 @@ version 2005/12/01 or later. % |eqnarray| environments, its default value is |(\theequation)|. Use % one of the commands % \begin{termlist*} -% \item |\def\termlabel{|\meta{labeldescription}|}| (\TeX), or +% \item |\def\termlabel{|\meta{labeldescription}|}|, or % \item |\renewcommand{\termlabel}{|\meta{labeldescription}|}| -% (\LaTeX) % \end{termlist*} % to change its value. Note that even if the value of |\termlabel| % does not contain something like |\theequation|, the |equation| @@ -271,9 +280,8 @@ version 2005/12/01 or later. % |equation| and |eqnarray| environments, its default value is % |\normalfont\normalcolor|. Use one of the commands % \begin{termlist*} -% \item |\def\termlabelfont{|\meta{fontdescription}|}| (\TeX), or +% \item |\def\termlabelfont{|\meta{fontdescription}|}|, or % \item |\renewcommand{\termlabelfont}{|\meta{fontdescription}|}| -% (\LaTeX) % \end{termlist*} % to change its value. % @@ -291,8 +299,8 @@ version 2005/12/01 or later. % and |\mathindent| should always have the same values. Use on of the % commands % \begin{termlist*} -% \item |\termindent|\meta{dimension} (\TeX), or -% \item |\setlength{\termindent}{|\meta{dimension}|}| (\LaTeX) +% \item |\termindent|\meta{dimension}, or +% \item |\setlength{\termindent}{|\meta{dimension}|}| % \end{termlist*} % to change the value of |\termindent|. % @@ -347,14 +355,18 @@ version 2005/12/01 or later. % |\itemsep|. The extra amount of space |\itemsep| is set to such a % value, that the total amount of space between two list items is % the maximum of |\parsep| and the extra amount of space |\jot| -% between two lines inside an |eqnarray| environment. +% between two lines inside an |eqnarray| environment. To be further +% consistent to the |equation| and |eqnarray| environments, the +% amount of space above and below the list |\topsep| is set to +% |\abovedisplayskip|. % \begin{macrocode} \newenvironment{termlist}{% \list{\termlabel}{% \@nmbrlisttrue \def\@listctr{equation}% + \partopsep\z@\@plus\p@\@minus\p@ + \topsep\abovedisplayskip \leftmargin\termindent - \rightmargin\leftmargini \labelwidth\leftmargin \advance\labelwidth-\labelsep \listparindent\parindent diff --git a/Master/texmf-dist/tex/latex/termlist/termlist.sty b/Master/texmf-dist/tex/latex/termlist/termlist.sty index f4185cd56b8..07e06f018a7 100644 --- a/Master/texmf-dist/tex/latex/termlist/termlist.sty +++ b/Master/texmf-dist/tex/latex/termlist/termlist.sty @@ -6,9 +6,9 @@ %% %% termlist.dtx (with options: `package') %% -%% Label any kind of terms with the equation counter. +%% Typeset lists of numbered terms. %% -%% Copyright 2008 Bernd Rellermeyer +%% Copyright 2008, 2010 Bernd Rellermeyer %% %% This file may be distributed and/or modified under the conditions %% of the LaTeX Project Public License, either version 1.3b of this @@ -21,7 +21,7 @@ %% version 2005/12/01 or later. %% \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{termlist}[2008/08/18 v1.0 First release] +\ProvidesPackage{termlist}[2010/06/12 v1.1 Minor layout corrections] \def\termlabel{(\theequation)} \def\termlabelfont{\normalfont\normalcolor} \def\@termlistmklab#1{\termlabelfont #1\hfil} @@ -31,8 +31,9 @@ \list{\termlabel}{% \@nmbrlisttrue \def\@listctr{equation}% + \partopsep\z@\@plus\p@\@minus\p@ + \topsep\abovedisplayskip \leftmargin\termindent - \rightmargin\leftmargini \labelwidth\leftmargin \advance\labelwidth-\labelsep \listparindent\parindent diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds index 39c5ad32a7b..d186b198027 100755 --- a/Master/tlpkg/libexec/ctan2tds +++ b/Master/tlpkg/libexec/ctan2tds @@ -1387,6 +1387,7 @@ $standardsource='\.fdd|\.dtx|\.ins|\.c$|configure.*|install-sh|\.drv'; 'stmaryrd', 'stmaryrd.dtx', 'tablists', 'tablists.dtx', 'thesis', 'install.01|install.ndx', + 'termlist', 'termlist.dtx', 'turnstile', 'turnstile-en.ins', # skip pt 'ulqda', 'ulqda.dtx', 'xecjk', 'xeCJK.dtx', @@ -1430,6 +1431,7 @@ my $core_latex = "$Master/texmf-dist/tex/latex"; # 'seuthesis' => 'latex', # requires interaction 'silence' => 'latex -translate-file=empty.tcx', # no 8-bit 'svn-multi' => 'latex', # interaction for .pl + 'termlist' => 'tex', # interaction for .pl 'thumb' => 'latex -translate-file=empty.tcx', # no 8-bit 'todonotes' => 'latex', # requires interaction 'toptesi' => 'latex', # requires interaction -- cgit v1.2.3