summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Master/texmf-dist/doc/latex/asciilist/README.md13
-rw-r--r--Master/texmf-dist/doc/latex/asciilist/asciilist.pdfbin378360 -> 379757 bytes
-rw-r--r--Master/texmf-dist/source/latex/asciilist/asciilist.dtx42
-rw-r--r--Master/texmf-dist/tex/latex/asciilist/asciilist.sty26
4 files changed, 53 insertions, 28 deletions
diff --git a/Master/texmf-dist/doc/latex/asciilist/README.md b/Master/texmf-dist/doc/latex/asciilist/README.md
index c1063d2e78f..c5345e9bb74 100644
--- a/Master/texmf-dist/doc/latex/asciilist/README.md
+++ b/Master/texmf-dist/doc/latex/asciilist/README.md
@@ -1,11 +1,11 @@
-The asciilist package
+The asciilist Package
=====================
Copyright (C) 2014-2016 Richard Gay
Released under the [LaTeX Project Public License](http://www.latex-project.org/lppl/) version 1.2 or later
-# PURPOSE
+## Purpose
This package provides the environments `AsciiList` and `AsciiDocList`,
which enable quickly typesetting nested lists in LaTeX without having to
@@ -14,14 +14,15 @@ The package provides auxiliary functionality for loading such lists from
files and provides macros for configuring the use of the list
environments and the appearance of the typeset results.
-# AVAILABILITY
+## Availability
The `asciilist` package is on [CTAN](http://www.ctan.org/pkg/asciilist),
-where you can also find the [documentation](http://mirrors.ctan.org/macros/latex/contrib/asciilist/asciilist.pdf).
+where you can also find the [documentation](http://mirrors.ctan.org/macros/latex/contrib/asciilist/asciilist.pdf),
+as well as on [github](https://github.com/Ri-Ga/asciilist).
Since November 2015, `asciilist` is part of TeX Live (package `texlive-latex-extra`) and
is included in [MiKTeX](http://miktex.org/packages/asciilist).
-# MANUAL INSTALLATION
+## Manual Installation
The `asciilist` package comes with (at least) the following files
* asciilist.ins
@@ -46,7 +47,7 @@ Put the resulting `asciilist.sty` somewhere where LaTeX can find it.
Read the documentation of your LaTeX system to find out where this
might be.
-# BUILDING DOCUMENTATION
+## Building Documentation
To build the documentation of the `asciilist` package, you additionally
need
diff --git a/Master/texmf-dist/doc/latex/asciilist/asciilist.pdf b/Master/texmf-dist/doc/latex/asciilist/asciilist.pdf
index 4989540962a..d1fb1db2909 100644
--- a/Master/texmf-dist/doc/latex/asciilist/asciilist.pdf
+++ b/Master/texmf-dist/doc/latex/asciilist/asciilist.pdf
Binary files differ
diff --git a/Master/texmf-dist/source/latex/asciilist/asciilist.dtx b/Master/texmf-dist/source/latex/asciilist/asciilist.dtx
index 0df6d947d13..29366bd96e8 100644
--- a/Master/texmf-dist/source/latex/asciilist/asciilist.dtx
+++ b/Master/texmf-dist/source/latex/asciilist/asciilist.dtx
@@ -22,7 +22,7 @@
%<package>\NeedsTeXFormat{LaTeX2e}[1999/12/01]
%<package>\ProvidesPackage{asciilist}
%<*package>
- [2016/03/05 v2.1 Package for quickly creating nested lists]
+ [2016/03/31 v2.1b Package for quickly creating nested lists]
%</package>
%
%<*driver>
@@ -212,6 +212,10 @@
% - item number 2.
% \end{AsciiList}
% \end{LTXexample}
+% Care has to be taken when the optional argument contains a comma. In
+% this case, the optional argument must be enclosed in parentheses such
+% that \LaTeX{} does not confuse the comma with a comma that separates
+% the list environments.
%
% \subsubsection{Automatic Item Detection}
%
@@ -570,15 +574,18 @@
% of environments to be used to create the lists at the individual
% levels.
% \changes{v1.2}{2014/09/18}{Allow auto-detection of item-chars}
+% \changes{v2.1b}{2016/03/31}{Eliminated expansion of optional argument}
% \begin{macrocode}
-\newenvironment{AsciiList}[2][\asclst@defaultenvs]{%
+\newenvironment{AsciiList}[2][]{%
\bgroup
% \end{macrocode}
% Setup the environment by storing the list \meta{environments} to use
% and -- most importantly -- setting up the newline character such
% that it scans for the \meta{item-chars} to find new list items.
% \begin{macrocode}
- \edef\asclst@listenv{#1}%
+ \ifstrempty{#1}%
+ {\let\asclst@listenv=\asclst@defaultenvs}%
+ {\def\asclst@listenv{#1}}%
% \end{macrocode}
% Convert the given \meta{item-chars} to an internal list of
% \textsf{etoolbox}, because this makes working with the list easier.
@@ -622,7 +629,7 @@
% but takes the content of the list from \meta{file-name}.
% \changes{v1.8}{2015/08/19}{Added this macro}
% \begin{macrocode}
-\newcommand\AsciiListFromFile[3][\asclst@defaultenvs]{%
+\newcommand\AsciiListFromFile[3][]{%
\AsciiList[#1]{#2}%
% \end{macrocode}
% The following is a bit of a hack to ensure that there is some
@@ -647,7 +654,7 @@
% \meta{file-list}.
% \changes{v1.8b}{2015/08/24}{Added this macro}
% \begin{macrocode}
-\newcommand\AsciiListFromFiles[3][\asclst@defaultenvs]{%
+\newcommand\AsciiListFromFiles[3][]{%
\AsciiList[#1]{#2}%
% \end{macrocode}
% We do the same here as for the |\AsciiListFromFile| macro,
@@ -1275,7 +1282,7 @@
% \changes{v1.8b}{2015/08/24}{Registered list environments can now be
% loaded from files}
% \begin{macrocode}
-\newcommand*\NewAsciiListEnv[3][\asclst@defaultenvs]{%
+\newcommand*\NewAsciiListEnv[3][]{%
\newenvironment{#3}%
{\begin{AsciiList}[#1]{#2}}%
{\end{AsciiList}}%
@@ -1366,10 +1373,12 @@
% \changes{v1.6}{2014/10/12}{Robustified ignoring initial spaces}
% \changes{v1.6b}{2014/10/14}{Robustified ignoring initial spaces}
% \changes{v1.6c}{2014/10/16}{Robustified ignoring initial spaces}
+% \changes{v2.1b}{2016/03/31}{Robustified ignoring initial spaces}
% \begin{macrocode}
\begingroup%
- \protected@edef\asclst@@result{%
- \endgroup\unexpanded{#1}{\trim@pre@space{#2}}}%
+ \def\asclst@@result{#2}\trim@pre@space@in{\asclst@@result}%
+ \edef\asclst@@result{%
+ \endgroup\unexpanded{#1}{\expandonce{\asclst@@result}}}%
\asclst@@result
}%
% \end{macrocode}
@@ -1383,11 +1392,13 @@
% \changes{v1.6}{2014/10/12}{Robustified ignoring initial spaces}
% \changes{v1.6b}{2014/10/14}{Robustified ignoring initial spaces}
% \changes{v1.6c}{2014/10/16}{Robustified ignoring initial spaces}
+% \changes{v2.1b}{2016/03/31}{Robustified against nested square brackets}
% \begin{macrocode}
\gdef\AsciiListEndOArg#1#2^^M{%
\begingroup%
- \protected@edef\asclst@@result{%
- \endgroup\unexpanded{#1}[\trim@pre@space{#2}]}%
+ \def\asclst@@result{#2}\trim@pre@space@in{\asclst@@result}%
+ \edef\asclst@@result{%
+ \endgroup\unexpanded{#1}[{\expandonce{\asclst@@result}}]}%
\asclst@@result
}%
}
@@ -1431,12 +1442,21 @@
% \changes{v1.5b}{2014/09/24}{Added alternative description
% environments}
% \begin{macrocode}
-\newcommand\asclst@BreakingDescItem[1][]{\item[#1]\leavevmode}
\AsciiListRegisterEnv{Description}{\description}{\enddescription}%
{\AsciiListEndOArg{\asclst@BreakingDescItem}}
\AsciiListRegisterEnv{CompactDesc}{\compactdesc}{\endcompactdesc}%
{\AsciiListEndOArg{\asclst@BreakingDescItem}}
% \end{macrocode}
+% \begin{macro}{\asclst@BreakingDescItem}
+% The |\asclst@BreakingDescItem|\oarg{item} macro is the same as
+% |\item[|\meta{item}|]| except that it is additionally ensured that
+% the first item of a contained list environment is not displayed on
+% the same line.
+% \changes{v2.1b}{2016/03/31}{Robustified against nested square brackets}
+% \begin{macrocode}
+\newcommand\asclst@BreakingDescItem[1][]{\item[{#1}]\leavevmode}
+% \end{macrocode}
+% \end{macro}
%\iffalse
%</package>
%\fi
diff --git a/Master/texmf-dist/tex/latex/asciilist/asciilist.sty b/Master/texmf-dist/tex/latex/asciilist/asciilist.sty
index 3d4c65b254a..bbfc13c3ffc 100644
--- a/Master/texmf-dist/tex/latex/asciilist/asciilist.sty
+++ b/Master/texmf-dist/tex/latex/asciilist/asciilist.sty
@@ -20,12 +20,14 @@
%%
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesPackage{asciilist}
- [2016/03/05 v2.1 Package for quickly creating nested lists]
+ [2016/03/31 v2.1b Package for quickly creating nested lists]
\RequirePackage{etoolbox}
\RequirePackage{trimspaces}
-\newenvironment{AsciiList}[2][\asclst@defaultenvs]{%
+\newenvironment{AsciiList}[2][]{%
\bgroup
- \edef\asclst@listenv{#1}%
+ \ifstrempty{#1}%
+ {\let\asclst@listenv=\asclst@defaultenvs}%
+ {\def\asclst@listenv{#1}}%
\gdef\asclst@itemchars{}%
\ifstrequal{#2}{auto}%
{\asclst@autocharstrue}%
@@ -39,12 +41,12 @@
\asclst@changelistlevel{\asclst@curlevel}{0}%
\asclst@restorenewline%
\egroup}
-\newcommand\AsciiListFromFile[3][\asclst@defaultenvs]{%
+\newcommand\AsciiListFromFile[3][]{%
\AsciiList[#1]{#2}%
\everyeof{\relax}%
\expandafter\asclst@newline\@@input #3\relax
\endAsciiList}
-\newcommand\AsciiListFromFiles[3][\asclst@defaultenvs]{%
+\newcommand\AsciiListFromFiles[3][]{%
\AsciiList[#1]{#2}%
\everyeof{\relax}%
\def\asclst@@load##1{\expandafter\asclst@newline\@@input ##1\relax}%
@@ -233,7 +235,7 @@
\newcommand*\AsciiDocListSetEnvironments[1]{%
\def\asclst@docdefaultenvs{#1}}
\AsciiDocListSetEnvironments{*=itemize,+=enumerate,;=Description}
-\newcommand*\NewAsciiListEnv[3][\asclst@defaultenvs]{%
+\newcommand*\NewAsciiListEnv[3][]{%
\newenvironment{#3}%
{\begin{AsciiList}[#1]{#2}}%
{\end{AsciiList}}%
@@ -259,14 +261,16 @@
{\catcode`\^^M=\active%
\gdef\AsciiListEndArg#1#2^^M{%
\begingroup%
- \protected@edef\asclst@@result{%
- \endgroup\unexpanded{#1}{\trim@pre@space{#2}}}%
+ \def\asclst@@result{#2}\trim@pre@space@in{\asclst@@result}%
+ \edef\asclst@@result{%
+ \endgroup\unexpanded{#1}{\expandonce{\asclst@@result}}}%
\asclst@@result
}%
\gdef\AsciiListEndOArg#1#2^^M{%
\begingroup%
- \protected@edef\asclst@@result{%
- \endgroup\unexpanded{#1}[\trim@pre@space{#2}]}%
+ \def\asclst@@result{#2}\trim@pre@space@in{\asclst@@result}%
+ \edef\asclst@@result{%
+ \endgroup\unexpanded{#1}[{\expandonce{\asclst@@result}}]}%
\asclst@@result
}%
}
@@ -282,11 +286,11 @@
\AsciiListRegisterEnv{paragraph}{}{}{\AsciiListEndArg{\paragraph}}
\AsciiListRegisterDescEnv{description}
\AsciiListRegisterDescEnv{compactdesc}
-\newcommand\asclst@BreakingDescItem[1][]{\item[#1]\leavevmode}
\AsciiListRegisterEnv{Description}{\description}{\enddescription}%
{\AsciiListEndOArg{\asclst@BreakingDescItem}}
\AsciiListRegisterEnv{CompactDesc}{\compactdesc}{\endcompactdesc}%
{\AsciiListEndOArg{\asclst@BreakingDescItem}}
+\newcommand\asclst@BreakingDescItem[1][]{\item[{#1}]\leavevmode}
\endinput
%%
%% End of file `asciilist.sty'.
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-05 19:10:05 +0000