From 8dfefaf0b70d00685bc9b450a00f5015e7849497 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 1 Mar 2016 23:36:06 +0000 Subject: asciilist (28feb16) git-svn-id: svn://tug.org/texlive/trunk@39906 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/asciilist/README.md | 77 +++++++++++++++ Master/texmf-dist/doc/latex/asciilist/README.txt | 70 -------------- .../texmf-dist/doc/latex/asciilist/asciilist.pdf | Bin 369601 -> 371202 bytes .../source/latex/asciilist/asciilist.dtx | 105 +++++---------------- .../source/latex/asciilist/asciilist.ins | 1 - .../texmf-dist/tex/latex/asciilist/asciilist.sty | 7 +- 6 files changed, 103 insertions(+), 157 deletions(-) create mode 100644 Master/texmf-dist/doc/latex/asciilist/README.md delete mode 100644 Master/texmf-dist/doc/latex/asciilist/README.txt (limited to 'Master/texmf-dist') diff --git a/Master/texmf-dist/doc/latex/asciilist/README.md b/Master/texmf-dist/doc/latex/asciilist/README.md new file mode 100644 index 00000000000..c1063d2e78f --- /dev/null +++ b/Master/texmf-dist/doc/latex/asciilist/README.md @@ -0,0 +1,77 @@ +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 + +This package provides the environments `AsciiList` and `AsciiDocList`, +which enable quickly typesetting nested lists in LaTeX without having to +type individual item macros or opening/closing list environments. +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 + +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). +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 + +The `asciilist` package comes with (at least) the following files +* asciilist.ins +* asciilist.dtx +* README.md + +and possibly also with +* Makefile +* asciilist.pdf (generated from asciilist.dtx) +* asciilist.sty (generated from asciilist.dtx) + +To install the `asciilist` package, you additionally need +* docstrip.tex + +To build the package (`asciilist.sty`), run one of the following +``` + latex asciilist.ins + make package (needs Makefile) +``` + +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 + +To build the documentation of the `asciilist` package, you additionally +need +* ltxdoc.cls +* idxlayout.sty +* xcolor.sty +* showexpl.sty +* paralist.sty +* trimspaces.sty +* etoolbox.sty +* hypdoc.sty +* makeindex +* pdflatex + +To build the documentation (`asciilist.pdf`), either run +``` + make docs +``` +or the following sequence of commands +``` + pdflatex asciilist.dtx + makeindex -s gind.ist -o asciilist.ind asciilist.idx + makeindex -s gglo.ist -o asciilist.gls asciilist.glo + pdflatex asciilist.dtx + pdflatex asciilist.dtx +``` + +Happy TeX'ing diff --git a/Master/texmf-dist/doc/latex/asciilist/README.txt b/Master/texmf-dist/doc/latex/asciilist/README.txt deleted file mode 100644 index d816f9ca4ec..00000000000 --- a/Master/texmf-dist/doc/latex/asciilist/README.txt +++ /dev/null @@ -1,70 +0,0 @@ -The asciilist package -===================== - -Copyright (C) 2014-2015 Richard Gay - -Released under the LaTeX Project Public License 1.2 or later - -PURPOSE -------- - -This package provides the environments AsciiList and AsciiDocList, which -enable quickly typesetting nested lists in LaTeX without having to type -individual item macros or opening/closing list environments. -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. - -INSTALLATION ------------- - -The `asciilist' package comes with (at least) the following files - asciilist.ins - asciilist.dtx -and possibly also with - Makefile - README.txt - asciilist.pdf - asciilist.sty - -To install the `asciilist' package, you additionally need - docstrip.tex - -To build the package (asciilist.sty), run one of the following - latex asciilist.ins - make package (needs Makefile) - -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. - -DOCUMENTATION -------------- - -To build the documentation of the `asciilist' package, you additionally -need - ltxdoc.cls - idxlayout.sty - xcolor.sty - showexpl.sty - paralist.sty - trimspaces.sty - etoolbox.sty - hypdoc.sty - makeindex - pdflatex - -To build the documentation (asciilist.pdf), either run - make docs (needs Makefile) -or the following sequence of commands - pdflatex asciilist.dtx - makeindex -s gind.ist -o asciilist.ind asciilist.idx - makeindex -s gglo.ist -o asciilist.gls asciilist.glo - pdflatex asciilist.dtx - pdflatex asciilist.dtx - -To build the README (README.txt), run one of the following - latex asciilist.ins - make package (needs Makefile) - -Happy TeX'ing diff --git a/Master/texmf-dist/doc/latex/asciilist/asciilist.pdf b/Master/texmf-dist/doc/latex/asciilist/asciilist.pdf index 47e0dab1a7a..795c67f9f04 100644 Binary files a/Master/texmf-dist/doc/latex/asciilist/asciilist.pdf and b/Master/texmf-dist/doc/latex/asciilist/asciilist.pdf differ diff --git a/Master/texmf-dist/source/latex/asciilist/asciilist.dtx b/Master/texmf-dist/source/latex/asciilist/asciilist.dtx index d149d65f71c..f0012cf4010 100644 --- a/Master/texmf-dist/source/latex/asciilist/asciilist.dtx +++ b/Master/texmf-dist/source/latex/asciilist/asciilist.dtx @@ -1,6 +1,6 @@ % \iffalse meta-comment % -% Copyright (C) 2014-2015 by Richard Gay +% Copyright (C) 2014-2016 by Richard Gay % ------------------------------------------------------- % % This file may be distributed and/or modified under the @@ -22,7 +22,7 @@ %\NeedsTeXFormat{LaTeX2e}[1999/12/01] %\ProvidesPackage{asciilist} %<*package> - [2015/11/13 v2.0 Package for quickly creating nested lists] + [2016/02/23 v2.0a Package for quickly creating nested lists] % % %<*driver> @@ -81,10 +81,13 @@ % \GetFileInfo{asciilist.dtx} % % \DoNotIndex{\newcommand,\newenvironment,\def,\gdef,\edef} -% +% % % \title{The \textsf{asciilist} package\thanks{This document -% corresponds to \textsf{asciilist}~\fileversion, dated \filedate.}} +% corresponds to \textsf{asciilist}~\fileversion, dated \filedate. +% The package is available online at +% \url{http://www.ctan.org/pkg/asciilist} and +% \url{https://github.com/Ri-Ga/asciilist}.}} % \author{Richard Gay \\ \texttt{gay@mais.informatik.tu-darmstadt.de}} % % \maketitle @@ -553,8 +556,9 @@ % \end{macrocode} % Ensure that the scanning for an item char starts with the very first % line of the environment. +% \changes{v2.0a}{2016/02/23}{Improved first-line handling.} % \begin{macrocode} - \asclst@newline% + \asclst@ifnextnewline{}{\asclst@newline}% }{% % \end{macrocode} % Ensure that all remaining open list environments are closed before @@ -700,6 +704,17 @@ \fi\asclst@@do}% % \end{macrocode} % \end{macro} +% +% \begin{macro}{\asclst@ifnextnewline} +% The |\asclst@ifnextnewline|\marg{iftrue}\marg{iffalse} macro checks +% whether the next character is a newline. If the check succeeds, then +% the macro expands to \meta{iftrue}. Otherwise, the macro expands to +% \meta{iffalse}. +% \begin{macrocode} + \gdef\asclst@ifnextnewline{\@ifnextchar^^M} +% \end{macrocode} +% \end{macro} +% % The following ends the group with active line break catcode. % \begin{macrocode} } @@ -854,8 +869,9 @@ % \end{macrocode} % Ensure that the scanning for an item char starts with the very first % line of the environment. +% \changes{v2.0a}{2016/02/23}{Improved first-line handling.} % \begin{macrocode} - \asclst@docnewline% + \asclst@ifnextnewline{}{\asclst@docnewline}% }{% % \end{macrocode} % Ensure that all remaining open list environments are closed before the @@ -1372,82 +1388,5 @@ %\iffalse % %\fi -% -%\iffalse -%<*readme> -The asciilist package -===================== - -Copyright (C) 2014-2015 Richard Gay - -Released under the LaTeX Project Public License 1.2 or later - -PURPOSE -------- - -This package provides the environments AsciiList and AsciiDocList, which -enable quickly typesetting nested lists in LaTeX without having to type -individual item macros or opening/closing list environments. -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. - - -INSTALLATION ------------- - -The `asciilist' package comes with (at least) the following files - asciilist.ins - asciilist.dtx -and possibly also with - Makefile - README.txt - asciilist.pdf - asciilist.sty - -To install the `asciilist' package, you additionally need - docstrip.tex - -To build the package (asciilist.sty), run one of the following - latex asciilist.ins - make package (needs Makefile) - -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. - -DOCUMENTATION -------------- - -To build the documentation of the `asciilist' package, you additionally -need - ltxdoc.cls - idxlayout.sty - xcolor.sty - showexpl.sty - paralist.sty - trimspaces.sty - etoolbox.sty - hypdoc.sty - makeindex - pdflatex - -To build the documentation (asciilist.pdf), either run - make docs (needs Makefile) -or the following sequence of commands - pdflatex asciilist.dtx - makeindex -s gind.ist -o asciilist.ind asciilist.idx - makeindex -s gglo.ist -o asciilist.gls asciilist.glo - pdflatex asciilist.dtx - pdflatex asciilist.dtx - -To build the README (README.txt), run one of the following - latex asciilist.ins - make package (needs Makefile) - - -Happy TeX'ing -% -%\fi % \Finale \endinput diff --git a/Master/texmf-dist/source/latex/asciilist/asciilist.ins b/Master/texmf-dist/source/latex/asciilist/asciilist.ins index 02c319aa382..2a3c5dd417a 100644 --- a/Master/texmf-dist/source/latex/asciilist/asciilist.ins +++ b/Master/texmf-dist/source/latex/asciilist/asciilist.ins @@ -34,7 +34,6 @@ and version 1.2 or later is part of all distributions of LaTeX version \generate{\file{asciilist.sty}{\from{asciilist.dtx}{package}}} \nopreamble\nopostamble -\generate{\file{README.txt}{\from{asciilist.dtx}{readme}}} \generate{\file{AsciiList.example}{\from{asciilist.dtx}{ALexample}}} \generate{\file{AsciiDocList.example}{\from{asciilist.dtx}{ADLexample}}} diff --git a/Master/texmf-dist/tex/latex/asciilist/asciilist.sty b/Master/texmf-dist/tex/latex/asciilist/asciilist.sty index 40a745ed517..e485f0890a9 100644 --- a/Master/texmf-dist/tex/latex/asciilist/asciilist.sty +++ b/Master/texmf-dist/tex/latex/asciilist/asciilist.sty @@ -20,7 +20,7 @@ %% \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesPackage{asciilist} - [2015/11/13 v2.0 Package for quickly creating nested lists] + [2016/02/23 v2.0a Package for quickly creating nested lists] \RequirePackage{etoolbox} \RequirePackage{trimspaces} \newenvironment{AsciiList}[2][\asclst@defaultenvs]{% @@ -34,7 +34,7 @@ \global\asclst@curlevel=0\relax% \let\UP=\asclst@levelsup% \let\UPTO=\asclst@levelsupto% - \asclst@newline% + \asclst@ifnextnewline{}{\asclst@newline}% }{% \asclst@changelistlevel{\asclst@curlevel}{0}% \asclst@restorenewline% @@ -74,6 +74,7 @@ \def\asclst@@do{\par #1}% \else\def\asclst@@do{\space #1}\fi% \fi\asclst@@do}% + \gdef\asclst@ifnextnewline{\@ifnextchar^^M} } \newcount\asclst@curlevel \newcount\asclst@newlevel @@ -136,7 +137,7 @@ \ifstrempty{#1}% {\expandafter\docsvlist\expandafter{\asclst@docdefaultenvs}}% {\docsvlist{#1}}% - \asclst@docnewline% + \asclst@ifnextnewline{}{\asclst@docnewline}% }{% \asclst@changedoclistlevel{}% \asclst@restorenewline% -- cgit v1.2.3