summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Master/texmf-dist/doc/latex/moreenum/README5
-rw-r--r--Master/texmf-dist/doc/latex/moreenum/moreenum-doc.pdfbin0 -> 216731 bytes
-rw-r--r--Master/texmf-dist/doc/latex/moreenum/moreenum-doc.tex (renamed from Master/texmf-dist/doc/latex/moreenum/testcase-moreenum.tex)33
-rw-r--r--Master/texmf-dist/doc/latex/moreenum/testcase-moreenum.pdfbin147300 -> 0 bytes
-rw-r--r--Master/texmf-dist/tex/latex/moreenum/moreenum.sty26
-rwxr-xr-xMaster/tlpkg/libexec/ctan2tds6
6 files changed, 48 insertions, 22 deletions
diff --git a/Master/texmf-dist/doc/latex/moreenum/README b/Master/texmf-dist/doc/latex/moreenum/README
index d5ee9956e52..72063c144aa 100644
--- a/Master/texmf-dist/doc/latex/moreenum/README
+++ b/Master/texmf-dist/doc/latex/moreenum/README
@@ -52,6 +52,11 @@ TO DO:
CHANGELOG
See https://github.com/scmbradley/moreenum for a full changelog
+v1.02
+ Spacing issues fixed
+ \nwords and friends and \nthwords and friends are now the right way round.
+v1.01
+ NWORDS and friends now supported
v1.0
levelnth and raisenth work with fmtcount
fmtcount also replaces binhex.tex
diff --git a/Master/texmf-dist/doc/latex/moreenum/moreenum-doc.pdf b/Master/texmf-dist/doc/latex/moreenum/moreenum-doc.pdf
new file mode 100644
index 00000000000..f2e82e180a1
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/moreenum/moreenum-doc.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/moreenum/testcase-moreenum.tex b/Master/texmf-dist/doc/latex/moreenum/moreenum-doc.tex
index 5009a24de6a..a8d88497706 100644
--- a/Master/texmf-dist/doc/latex/moreenum/testcase-moreenum.tex
+++ b/Master/texmf-dist/doc/latex/moreenum/moreenum-doc.tex
@@ -29,14 +29,18 @@
%\usepackage{tgcursor}
\usepackage[ocr-a]{ocr}
+\newcounter{namespacer}
+\newcommand\namespace{\the\value{namespacer}}
+
\newcommand\testenumerate[1]{%
- \bigskip
+ \bigskip\stepcounter{namespacer}
\begin{minipage}{0.4\linewidth}
{\qquad\Large\texttt{\textbackslash #1}}
- \begin{enumerate}[label=\csname #1\endcsname*]
- \item Liberty
+ \begin{enumerate}[label={\csname #1\endcsname*.}]
+ \item Liberty: \expandafter\ref{\namespace}
\item Equality
- \item Fraternity\setcounter{enumi}{41}
+ \item Fraternity\expandafter\label{\namespace}
+ \setcounter{enumi}{41}
\item Meaning of life
\end{enumerate}
\end{minipage}
@@ -48,7 +52,11 @@
\begin{document}
\maketitle
-
+\begin{abstract}
+ This package provides more enumeration styles for |enumerate| environments.
+ The styles are supposed to work with |enumitem|.
+ This is |moreenum| version 1.03.
+\end{abstract}
\section{Basic procedure}
At the heart of each new enumeration is the following procedure:
@@ -142,7 +150,8 @@ In brackets are the |moreenum|-defined enumerations affected.
\begin{itemize}
\item |\binary| and friends break at 131072 [|\enumbinary|]
\item |\hexadecimal| and friends break at 1048576 [|\enumhex| and |\enumHex|]
-\item |\numberstring| and friends break at 100000 [|\nwords| and |\nthwords|]
+\item |\numberstring| and friends break at 100000 [|\nwords|,
+ |\nthwords| and friends]
\end{itemize}
None of these is a serious limitation.
@@ -152,11 +161,19 @@ straightforward to define yourself using |binhex| for the numbers and
limitations.\footnote{%
Why don't I just use those packages instead?
Because having |fmtcount| do most of the work means only loading one
- package instead of 3 (|numname|, |binhex| and |nth| or |engord|).}
+ package instead of 3 (|numname|, |binhex| and |nth| or |engord|).
+ Also, |fmtcount| can speak different languages,
+ and in future releases I'm tempted to try to get that working here.}
\section{Examples of the enumerations}
-Here are examples of all the kinds of enumeration that the package defines:
+Here are examples of all the kinds of enumeration that the package
+defines.
+The first item contains a reference to the third.
+This is to test if the referencing is working.
+The labels have dots after them, to check whether errant spaces are
+being added after the labels.\footnote{Thanks to Kevin Klement for
+ pointing this issue out to me.}
% \dotest{greek,Greek,enumHex,enumhex,enumbinary,raisenth,levelnth,nthwords,nwords}
\small\noindent
diff --git a/Master/texmf-dist/doc/latex/moreenum/testcase-moreenum.pdf b/Master/texmf-dist/doc/latex/moreenum/testcase-moreenum.pdf
deleted file mode 100644
index 0844f550378..00000000000
--- a/Master/texmf-dist/doc/latex/moreenum/testcase-moreenum.pdf
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/moreenum/moreenum.sty b/Master/texmf-dist/tex/latex/moreenum/moreenum.sty
index 00b93777c4d..4b486656fe5 100644
--- a/Master/texmf-dist/tex/latex/moreenum/moreenum.sty
+++ b/Master/texmf-dist/tex/latex/moreenum/moreenum.sty
@@ -18,7 +18,7 @@
% and README and the derived file testcase-moreenum.pdf
-\ProvidesPackage{moreenum}[2011/07/15 v1.01]
+\ProvidesPackage{moreenum}[2011/11/03 v1.03]
\RequirePackage{amsmath} % For Greek letters
@@ -44,21 +44,23 @@
% http://tex.stackexchange.com/questions/4058/greek-numbering/4063#4063
% And to Will Robertson's answer to the same question for pointing me to
% the alphalph package
+% Thanks to Kevin Klement for pointing out a spacing problem
+% with the Greek commands that is now fixed.
\newcommand*{\single@greek}[1]{%
- \expandafter\@single@greek\csname c@#1\endcsname
+ \expandafter\@single@greek\csname c@#1\endcsname%
}
\newcommand*{\@single@greek}[1]{%
$\ifcase#1\or\alpha\or\beta\or\gamma\or\delta\or\varepsilon
\or\zeta\or\eta\or\theta\or\iota\or\kappa\or\lambda
\or\mu\or\nu\or\xi\or o\or\pi\or\varrho\or\sigma
\or\tau\or\upsilon\or\phi\or\chi\or\psi\or\omega
- \else\@ctrerr\fi$
+ \else\@ctrerr\fi$%
}
\newalphalph{\@greek}[alph]{\@single@greek}{24}
\newcommand*{\greek}[1]{%
- \expandafter\@greek\csname c@#1\endcsname
+ \expandafter\@greek\csname c@#1\endcsname%
}
\AddEnumerateCounter{\greek}{\@greek}{$\omega$}
@@ -75,7 +77,7 @@
\or Z\or E\or\Theta\or I\or K\or\Lambda
\or M\or N\or \Xi\or O\or\Pi\or P\or\Sigma
\or T\or Y\or\Phi\or X\or\Psi\or\Omega
- \else\@ctrerr\fi$
+ \else\@ctrerr\fi$%
}
\newalphalph{\@Greek}[alph]{\@Single@Greek}{24}
@@ -140,7 +142,7 @@
}
%------------------------------
-% Binary
+% Octal
%------------------------------
\newcommand*{\enumoctal}[1]{%
@@ -196,7 +198,7 @@
\newcommand{\Nthwords}[1]{\expandafter\@Nthwords\csname c@#1\endcsname}
\newcommand*{\@Nthwords}[1]{%
- \protect\Numberstringnum{\number#1}}
+ \protect\Ordinalstringnum{\number#1}}
\AddEnumerateCounter{\Nthwords}{\@Nthwords}{Seventeenth}
%%-----------------------------
@@ -206,7 +208,7 @@
\newcommand*{\NTHWORDS}[1]{
\expandafter\@NTHWORDS\csname c@#1\endcsname}
\newcommand*{\@NTHWORDS}[1]{
- \protect\NUMBERstringnum{\number#1}}
+ \protect\ORDINALstringnum{\number#1}}
\AddEnumerateCounter{\NTHWORDS}{\@NTHWORDS}{FORTY-TWO}
%%-----------------------------
@@ -216,7 +218,7 @@
\newcommand*{\nthwords}[1]{
\expandafter\@nthwords\csname c@#1\endcsname}
\newcommand*{\@nthwords}[1]{
- \protect\numberstringnum{\number#1}}
+ \protect\ordinalstringnum{\number#1}}
\AddEnumerateCounter{\nthwords}{\@nthwords}{forty-two}
@@ -231,7 +233,7 @@
\newcommand{\Nwords}[1]{\expandafter\@Nwords\csname c@#1\endcsname}
\newcommand*{\@Nwords}[1]{%
- \protect\Ordinalstringnum{\number#1}}
+ \protect\Numberstringnum{\number#1}}
\AddEnumerateCounter{\Nwords}{\@Nwords}{Seventeen}
@@ -242,7 +244,7 @@
\newcommand{\NWORDS}[1]{\expandafter\@NWORDS\csname c@#1\endcsname}
\newcommand*{\@NWORDS}[1]{%
- \protect\ORDINALstringnum{\number#1}}
+ \protect\NUMBERstringnum{\number#1}}
\AddEnumerateCounter{\NWORDS}{\@NWORDS}{SEVENTEEN}
@@ -252,7 +254,7 @@
\newcommand{\nwords}[1]{\expandafter\@nwords\csname c@#1\endcsname}
\newcommand*{\@nwords}[1]{%
- \protect\ordinalstringnum{\number#1}}
+ \protect\numberstringnum{\number#1}}
\AddEnumerateCounter{\nwords}{\@nwords}{seventeen}
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index 7938994ead6..b13c1b9a696 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -158,7 +158,7 @@ chomp ($Build = `cd $Master/../Build/source && pwd`);
'borceux', "&MAKEborceux",
'bridge', "die 'skipping, latex 2.09'",
'burmese', "&MAKEflatten",
- 'business-research', "die 'skipping, noinfo license, w32 fonts'",
+ 'business-research', "die 'skipping, w32 fonts'",
'c90', "&MAKEc90",
'cachepic', "&MAKEcopy",
'calxxxx', "die 'skipping, nomodify license'",
@@ -813,7 +813,8 @@ chomp ($Build = `cd $Master/../Build/source && pwd`);
'texsis', "&MAKEtexsis",
'tfrupee', "&MAKEflatten",
'tgothic', "die 'skipping, use bookhands'",
- 'thaifonts-scalable', "die 'skipping, Thai, fontforge format only'",
+ 'thaifonts-arundina', "die 'skipping, fontforge format only'",
+ 'thaifonts-scalable', "die 'skipping, fontforge format only'",
'thesis-titlepage-fhAC',"die 'skipping, use ...fhac'",
'thsmc', "die 'skipping, requires nonfree font'",
'ticket', "&MAKEflatten",
@@ -885,6 +886,7 @@ chomp ($Build = `cd $Master/../Build/source && pwd`);
'wadalab', "&MAKEwadalab",
'wasy2', "&MAKEflatten",
'winedt', "die 'skipping, nonfree license'",
+ 'winfonts', "die 'skipping, support for nonfree fonts'",
'wntamil', "die 'skipping, nonfree license'",
'wordcount', "&MAKEwordcount",
'wp-conv', "die 'skipping, nonfree license'",