From 7d9eca7c4eba55a60bd83933de4a4d5c9808e018 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 28 Oct 2011 23:42:51 +0000 Subject: jvlisting (28oct11) git-svn-id: svn://tug.org/texlive/trunk@24430 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/jvlisting/README | 25 +++--- Master/texmf-dist/doc/latex/jvlisting/examples.tex | 5 +- .../texmf-dist/doc/latex/jvlisting/jvlisting.pdf | Bin 193106 -> 192993 bytes Master/texmf-dist/doc/latex/jvlisting/test.tex | 6 +- .../source/latex/jvlisting/jvlisting.dtx | 86 ++++++++++----------- .../source/latex/jvlisting/jvlisting.ins | 13 ++-- .../texmf-dist/tex/latex/jvlisting/jvlisting.sty | 6 +- 7 files changed, 67 insertions(+), 74 deletions(-) (limited to 'Master/texmf-dist') diff --git a/Master/texmf-dist/doc/latex/jvlisting/README b/Master/texmf-dist/doc/latex/jvlisting/README index 0ed384d218c..eb0640b6c07 100644 --- a/Master/texmf-dist/doc/latex/jvlisting/README +++ b/Master/texmf-dist/doc/latex/jvlisting/README @@ -8,16 +8,9 @@ author Jochen Voss INSTALLATION ------------ -- For simple installation, just move "jvlisting.sty" in a directory - where LaTeX can find it. The jvlisting manual is in the file - "jvlisting.pdf". - -- The regenerate the manual: - - latex jvlisting.dtx - -- To regenerate "jvlisting.sty" and to create an additional file - with examples, you can run the following command: +- To generate "jvlisting.sty" and to create an additional file + "examples.tex" containing a few examples, you can run the following + command: tex jvlisting.ins @@ -26,6 +19,14 @@ INSTALLATION latex examples.tex +- For simple installation, just move "jvlisting.sty" in a directory + where LaTeX can find it. The jvlisting manual is in the file + "jvlisting.pdf". + +- The regenerate the manual: + + latex jvlisting.dtx + - A list of test cases which I use for debugging can be found in the file "test.tex". @@ -46,5 +47,5 @@ and version 1.3 or later is part of all distributions of LaTeX version This work has the LPPL maintenance status `maintained' and the current Maintainer of this work is Jochen Voss . -This work consists of the files jvlisting.dtx and the derived files -jvlisting.sty, jvlisting.ins and examples.tex. +This work consists of the files jvlisting.dtx, test.tex and the +derived files jvlisting.sty, jvlisting.ins and examples.tex. diff --git a/Master/texmf-dist/doc/latex/jvlisting/examples.tex b/Master/texmf-dist/doc/latex/jvlisting/examples.tex index 1a9ab1ead50..6c7e759a2e6 100644 --- a/Master/texmf-dist/doc/latex/jvlisting/examples.tex +++ b/Master/texmf-dist/doc/latex/jvlisting/examples.tex @@ -21,8 +21,8 @@ %% This work has the LPPL maintenance status `maintained' and the current %% Maintainer of this work is Jochen Voss . %% -%% This work consists of the files jvlisting.dtx and the derived files -%% jvlisting.sty, jvlisting.ins and examples.tex. +%% This work consists of the files jvlisting.dtx, test.tex and the +%% derived files jvlisting.sty, jvlisting.ins and examples.tex. \documentclass{article} @@ -76,7 +76,6 @@ \filelisting{listing1.c} \end{document} - \endinput %% %% End of file `examples.tex'. diff --git a/Master/texmf-dist/doc/latex/jvlisting/jvlisting.pdf b/Master/texmf-dist/doc/latex/jvlisting/jvlisting.pdf index 65fd47d333a..423cdbd8d71 100644 Binary files a/Master/texmf-dist/doc/latex/jvlisting/jvlisting.pdf and b/Master/texmf-dist/doc/latex/jvlisting/jvlisting.pdf differ diff --git a/Master/texmf-dist/doc/latex/jvlisting/test.tex b/Master/texmf-dist/doc/latex/jvlisting/test.tex index f863f324205..6f70c19f988 100644 --- a/Master/texmf-dist/doc/latex/jvlisting/test.tex +++ b/Master/texmf-dist/doc/latex/jvlisting/test.tex @@ -187,7 +187,7 @@ The columns should be of equal height (four rows each). \begin{test}{4.2} (page breaks, \verb|\listingpenalty|). -The column break should be before \verb|line1|. +The column break should be immediately before \verb|line1|. \setlength{\listingskipamount}{0pt}% \listingpenalty=10000 \begin{testpages}{6} @@ -206,7 +206,7 @@ The column break should be before \verb|line1|. \begin{test}{4.3} (page breaks, \verb|\prelistingpenalty|). -The column break should {\em not} be before \verb|line1|. +The column break should {\em not} be immediately before \verb|line1|. \setlength{\listingskipamount}{0pt}% \prelistingpenalty=10000 \begin{testpages}{3} @@ -222,7 +222,7 @@ The column break should {\em not} be before \verb|line1|. \begin{test}{4.4} (page breaks, \verb|\postlistingpenalty|). -The column break should {\em not} be after \verb|line3|. +The column break should {\em not} be immediately after \verb|line3|. \setlength{\listingskipamount}{0pt}% \postlistingpenalty=10000 \begin{testpages}{3} diff --git a/Master/texmf-dist/source/latex/jvlisting/jvlisting.dtx b/Master/texmf-dist/source/latex/jvlisting/jvlisting.dtx index 162eee6be56..d269491bb57 100644 --- a/Master/texmf-dist/source/latex/jvlisting/jvlisting.dtx +++ b/Master/texmf-dist/source/latex/jvlisting/jvlisting.dtx @@ -1,23 +1,35 @@ % \iffalse % jvlisting.dtx - docstrip archive for the jvlisting macro package -% -% Copyright (C) 2011 Jochen Voss -% -% This work may be distributed and/or modified under the conditions of -% the LaTeX Project Public License, either version 1.3 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.3 or later is part of all distributions of LaTeX version -% 2005/12/01 or later. -% -% This work has the LPPL maintenance status `maintained' and the current -% Maintainer of this work is Jochen Voss . -% -% This work consists of the files jvlisting.dtx and the derived files -% jvlisting.sty, jvlisting.ins and examples.tex. +%<*gobble> +\iffalse +% +%<*install> +\input docstrip.tex + +\preamble + +Copyright (C) 2011 Jochen Voss + +This work may be distributed and/or modified under the conditions of +the LaTeX Project Public License, either version 1.3 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.3 or later is part of all distributions of LaTeX version +2005/12/01 or later. + +This work has the LPPL maintenance status `maintained' and the current +Maintainer of this work is Jochen Voss . + +This work consists of the files jvlisting.dtx, test.tex and the +derived files jvlisting.sty, jvlisting.ins and examples.tex. +\endpreamble +% +%<*gobble> +\fi +% %<*driver> \documentclass{ltxdoc} \usepackage[text={6in,9in},centering]{geometry} @@ -113,8 +125,9 @@ document source. The following will work as expected: \end{xlist} \noindent The Python code will be typeset using the same indentation as in the -example above, despite the fact that they have different indentation -in the \LaTeX\ source code. +previous example, despite the fact that the code in the two +\verb|listing| environments has different indentation in the +\LaTeX\ source code. To make it easier to copy real program source code directly into your \LaTeX\ file, the code in listings can be indented by TAB characters @@ -124,7 +137,7 @@ columns. In addition to the \LaTeX\ environment described above, there is also a command \verb|\filelisting| to typeset source code contained in a file. The command takes one argument, the name of the file to -include, and behaves very similar to the the \verb|verbatim| +include, and behaves very similar to the the \verb|listing| environment. \medskip @@ -138,8 +151,8 @@ environment. \bigbreak There are various parameters to customise how listings are typeset. -These parameters apply both to the \verb|verbatim| environment and to -the \verb|\filelisting| command. +These parameters apply both to the \verb|listing| environment and +to the \verb|\filelisting| command. \begin{itemize} \item The amount of space inserted before and after a listing is given by \verb|\listingskipamount|. The default value is @@ -368,6 +381,7 @@ string. %<*package> % \fi +% \StopEventually{} % \section{Implementation} % % This section describes the internal implementation of the @@ -377,7 +391,7 @@ string. % for the package file. % \begin{macrocode} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{jvlisting}[2011/10/17 v0.5 Formatted Program Listings] +\ProvidesPackage{jvlisting}[2011/10/28 v0.6 Formatted Program Listings] % \end{macrocode} % \subsection{Processing the Lines of Input} @@ -590,34 +604,12 @@ string. \filelisting{listing1.c} \end{document} - % %<*install> -\input docstrip.tex + \keepsilent \askforoverwritefalse -\preamble - -Copyright (C) 2011 Jochen Voss - -This work may be distributed and/or modified under the conditions of -the LaTeX Project Public License, either version 1.3 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.3 or later is part of all distributions of LaTeX version -2005/12/01 or later. - -This work has the LPPL maintenance status `maintained' and the current -Maintainer of this work is Jochen Voss . - -This work consists of the files jvlisting.dtx and the derived files -jvlisting.sty, jvlisting.ins and examples.tex. -\endpreamble - \generate{% \file{jvlisting.ins}{\from{jvlisting.dtx}{install}}% \usedir{tex/latex/jvlisting}% diff --git a/Master/texmf-dist/source/latex/jvlisting/jvlisting.ins b/Master/texmf-dist/source/latex/jvlisting/jvlisting.ins index 8e568d1dff1..e7b4cb36f34 100644 --- a/Master/texmf-dist/source/latex/jvlisting/jvlisting.ins +++ b/Master/texmf-dist/source/latex/jvlisting/jvlisting.ins @@ -21,11 +21,9 @@ %% This work has the LPPL maintenance status `maintained' and the current %% Maintainer of this work is Jochen Voss . %% -%% This work consists of the files jvlisting.dtx and the derived files -%% jvlisting.sty, jvlisting.ins and examples.tex. +%% This work consists of the files jvlisting.dtx, test.tex and the +%% derived files jvlisting.sty, jvlisting.ins and examples.tex. \input docstrip.tex -\keepsilent -\askforoverwritefalse \preamble @@ -44,10 +42,13 @@ and version 1.3 or later is part of all distributions of LaTeX version This work has the LPPL maintenance status `maintained' and the current Maintainer of this work is Jochen Voss . -This work consists of the files jvlisting.dtx and the derived files -jvlisting.sty, jvlisting.ins and examples.tex. +This work consists of the files jvlisting.dtx, test.tex and the +derived files jvlisting.sty, jvlisting.ins and examples.tex. \endpreamble +\keepsilent +\askforoverwritefalse + \generate{% \file{jvlisting.ins}{\from{jvlisting.dtx}{install}}% \usedir{tex/latex/jvlisting}% diff --git a/Master/texmf-dist/tex/latex/jvlisting/jvlisting.sty b/Master/texmf-dist/tex/latex/jvlisting/jvlisting.sty index dffc5378215..89f9ce7cb97 100644 --- a/Master/texmf-dist/tex/latex/jvlisting/jvlisting.sty +++ b/Master/texmf-dist/tex/latex/jvlisting/jvlisting.sty @@ -22,11 +22,11 @@ %% This work has the LPPL maintenance status `maintained' and the current %% Maintainer of this work is Jochen Voss . %% -%% This work consists of the files jvlisting.dtx and the derived files -%% jvlisting.sty, jvlisting.ins and examples.tex. +%% This work consists of the files jvlisting.dtx, test.tex and the +%% derived files jvlisting.sty, jvlisting.ins and examples.tex. \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{jvlisting}[2011/10/17 v0.5 Formatted Program Listings] +\ProvidesPackage{jvlisting}[2011/10/28 v0.6 Formatted Program Listings] \def\jvl@iterlines#1{\expandafter\jvl@iterla\expandafter{#1}{\jvl@dropempty}} {\obeylines\gdef\jvl@iterla#1#2#3 -- cgit v1.2.3