From b294a44f24410094addc2c6d6cc4a17471bb567e Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 11 Sep 2019 21:19:52 +0000 Subject: listings (11sep19) git-svn-id: svn://tug.org/texlive/trunk@52079 c570f23f-e606-0410-a88d-b1316a301751 --- .../doc/latex/listings/listings-devel.pdf | Bin 1140171 -> 1142824 bytes Master/texmf-dist/doc/latex/listings/listings.pdf | Bin 742942 -> 744403 bytes Master/texmf-dist/doc/latex/listings/lstdrvrs.pdf | Bin 571118 -> 565021 bytes Master/texmf-dist/source/latex/listings/Makefile | 12 ++- .../texmf-dist/source/latex/listings/listings.dtx | 115 +++++++++++++++------ .../texmf-dist/source/latex/listings/listings.ins | 1 + .../texmf-dist/source/latex/listings/lstdrvrs.dtx | 31 +++--- .../texmf-dist/source/latex/listings/lstdrvrs.ins | 2 +- Master/texmf-dist/source/latex/listings/ltxdoc.cfg | 11 ++ .../texmf-dist/tex/latex/listings/listings-acm.prf | 2 +- .../tex/latex/listings/listings-bash.prf | 2 +- .../tex/latex/listings/listings-fortran.prf | 2 +- .../tex/latex/listings/listings-hansl.prf | 2 +- .../texmf-dist/tex/latex/listings/listings-lua.prf | 2 +- .../tex/latex/listings/listings-python.prf | 2 +- Master/texmf-dist/tex/latex/listings/listings.cfg | 2 +- Master/texmf-dist/tex/latex/listings/listings.sty | 9 +- Master/texmf-dist/tex/latex/listings/lstdoc.sty | 4 +- Master/texmf-dist/tex/latex/listings/lstlang1.sty | 2 +- Master/texmf-dist/tex/latex/listings/lstlang2.sty | 2 +- Master/texmf-dist/tex/latex/listings/lstlang3.sty | 2 +- Master/texmf-dist/tex/latex/listings/lstmisc.sty | 4 +- 22 files changed, 140 insertions(+), 69 deletions(-) create mode 100644 Master/texmf-dist/source/latex/listings/ltxdoc.cfg diff --git a/Master/texmf-dist/doc/latex/listings/listings-devel.pdf b/Master/texmf-dist/doc/latex/listings/listings-devel.pdf index 06c8147ab63..72c41df9a61 100644 Binary files a/Master/texmf-dist/doc/latex/listings/listings-devel.pdf and b/Master/texmf-dist/doc/latex/listings/listings-devel.pdf differ diff --git a/Master/texmf-dist/doc/latex/listings/listings.pdf b/Master/texmf-dist/doc/latex/listings/listings.pdf index 5831599b09a..0a6b5f5fb31 100644 Binary files a/Master/texmf-dist/doc/latex/listings/listings.pdf and b/Master/texmf-dist/doc/latex/listings/listings.pdf differ diff --git a/Master/texmf-dist/doc/latex/listings/lstdrvrs.pdf b/Master/texmf-dist/doc/latex/listings/lstdrvrs.pdf index 823831c95d2..9abb3a1d005 100644 Binary files a/Master/texmf-dist/doc/latex/listings/lstdrvrs.pdf and b/Master/texmf-dist/doc/latex/listings/lstdrvrs.pdf differ diff --git a/Master/texmf-dist/source/latex/listings/Makefile b/Master/texmf-dist/source/latex/listings/Makefile index e93bffe666f..5792254ad4d 100644 --- a/Master/texmf-dist/source/latex/listings/Makefile +++ b/Master/texmf-dist/source/latex/listings/Makefile @@ -58,27 +58,29 @@ listings.sty: listings.ins listings.dtx lstdrvrs.dtx $(TEX) $< listings.pdf: listings.sty - rm -f ltxdoc.cfg + echo "\PassOptionsToClass{a4paper}{article}" > ltxdoc.cfg $(LATEX) ${<:.sty=.dtx} $(MAKEINDEX) -s gind.ist ${@:.pdf=} $(LATEX) ${<:.sty=.dtx} $(LATEX) ${<:.sty=.dtx} + rm -f ltxdoc.cfg listings-devel.pdf: listings.sty - rm -rf ltxdoc.cfg - echo "\AtBeginDocument{\AlsoImplementation}" > ltxdoc.cfg + echo "\PassOptionsToClass{a4paper}{article}" > ltxdoc.cfg + echo "\AtBeginDocument{\AlsoImplementation}" >> ltxdoc.cfg $(LATEX) -jobname=${@:.pdf=} ${<:.sty=.dtx} $(MAKEINDEX) -s gind.ist ${@:.pdf=} $(LATEX) -jobname=${@:.pdf=} ${<:.sty=.dtx} $(LATEX) -jobname=${@:.pdf=} ${<:.sty=.dtx} - rm -rf ltxdoc.cfg + rm -f ltxdoc.cfg lstdrvrs.pdf: lstdrvrs.dtx - rm -f ltxdoc.cfg + echo "\PassOptionsToClass{a4paper}{article}" > ltxdoc.cfg $(LATEX) ${<:.sty=.dtx} $(MAKEINDEX) -s gind.ist lstdrvrs $(LATEX) ${<:.sty=.dtx} $(LATEX) ${<:.sty=.dtx} + rm -f ltxdoc.cfg ## Testing targets acm-tests: diff --git a/Master/texmf-dist/source/latex/listings/listings.dtx b/Master/texmf-dist/source/latex/listings/listings.dtx index 2a9216744ab..c63ef2ffab3 100644 --- a/Master/texmf-dist/source/latex/listings/listings.dtx +++ b/Master/texmf-dist/source/latex/listings/listings.dtx @@ -96,13 +96,15 @@ %\lstisaspect[kernel]{basewidth,fontadjust,columns,flexiblecolumns,identifierstyle,^^A % tabsize,showtabs,tab,showspaces,keepspaces,formfeed,SelectCharTable,^^A % MoreSelectCharTable,extendedchars,alsoletter,alsodigit,alsoother,excludedelims,^^A -% literate,basicstyle,print,firstline,lastline,linerange,nolol,captionpos,abovecaptionskip,^^A -% belowcaptionskip,label,title,caption,\string\lstlistingname,boxpos,float,^^A +% literate,basicstyle,print,firstline,lastline,linerange,nolol,captionpos,^^A +% abovecaptionskip,^^A +% belowcaptionskip,label,title,caption,\string\lstlistingname,^^A +% \string\lstlistingnamestyle,boxpos,float,^^A % floatplacement,aboveskip,belowskip,everydisplay,showlines,emptylines,gobble,name,^^A % \string\lstname,\string\lstlistlistingname,\string\lstlistoflistings,^^A % \string\lstnewenvironment,\string\lstinline,\string\lstinputlisting,lstlisting,^^A % \string\lstloadaspects,\string\lstset,\string\thelstlisting,\string\lstaspectfiles,^^A -% inputencoding,delim,moredelim,deletedelim,upquote,numberbychapter,^^A +% inputencoding,inputpath,delim,moredelim,deletedelim,upquote,numberbychapter,^^A % \string\lstMakeShortInline,\string\lstDeleteShortInline} %\lstisaspect[doc]{lstsample,lstxsample}^^A environment %\lstisaspect[experimental]{includerangemarker,rangebeginprefix,rangebeginsuffix,^^A @@ -131,10 +133,13 @@ % Hoffmann became the maintainer of the \packagename{listings} % package in 2013; see the Preface for details.}~ % % \textless\lstemail\textgreater} -% \date{2019/02/27\enspace\enspace Version 1.8b\ \box\abstractbox} +% \date{2019/09/10\enspace\enspace Version 1.8c\ \box\abstractbox} % \def\lstemail{\href{mailto:j.hoffmann@fh-aachen.de}{\texttt{j.hoffmann(at)fh-aachen.de}}} % \ifhyper -% \hypersetup{pdfsubject=Package guide,pdfauthor=Jobst Hoffmann } +% \hypersetup{pdftitle=The Listings Package, +% pdfsubject=Package guide, +% pdfauthor=Jobst Hoffmann ,% +% pdfkeywords={source code formatter, programming languages}} % \fi % % \csname @twocolumntrue\endcsname @@ -1843,7 +1848,8 @@ % \item % There is one question `you' haven't asked all the last pages: who is to % blame. Carsten Heinz wrote the guides, coded the \packagename{listings} -% package and wrote some language drivers. Brooks Moses currently maintains +% package and wrote some language drivers. Brooks Moses took over the +% maintaining for several years, Jobst Hoffmann currently maintains % the package. Other people defined more languages % or contributed their ideas; many others made bug reports, but only the first % bug finder is listed. @@ -1870,6 +1876,7 @@ % Moreover we wish to thank % \begin{quote} % \hyphenpenalty=10000\relax \rightskip=0pt plus \linewidth +% \lstthanks{Nasser~M.~Abbasi}{nma@12000.org}, % \lstthanks{Bj{\o}rn~{\AA}dlandsvik}{bjorn@imr.no}, % \lstthanks{Omair-Inam~Abdul-Matin}{-}, % \lstthanks{Gaurav~Aggarwal}{gaurav@ics.uci.edu}, @@ -1883,6 +1890,7 @@ % \lstthanks{Michael~Bachmann}{-}, % \lstthanks{Luca~Balzerani}{-}, % \lstthanks{Peter~Bartke}{bartke@inf.fu-berlin.de} (big thankyou), ^^A beta tester +% \lstthanks{Jean-Yves~Baudais}{Jean-Yves.Baudais@insa-rennes.fr}, % \lstthanks{Heiko~Bauke}{-}, % \lstthanks{Oliver~Baum}{oli.baum@web.de}, % \lstthanks{Ralph~Becket}{rbeck@microsoft.com}, @@ -1892,6 +1900,7 @@ % \lstthanks{Javier~Bezos}{javier.bezos@bancoval.es}, % \lstthanks{Olaf~Trygve~Berglihn}{olafb@pvv.org}, % ^^A {1999/11/29}{3-char comment delimiter don't work (Python)} +% \lstthanks{Karl~Berry}{karl@freefriends.org}, % \lstthanks{Geraint~Paul~Bevan}{geraint@users.sf.net}, % \lstthanks{Peter~Biechele}{peter.biechele@physik.uni-freiburg.de}, % \lstthanks{Beat~Birkhofer}{beat@birkhofer.ch}, @@ -1919,6 +1928,7 @@ % \lstthanks{Norbert~Eisinger}{Norbert.Eisinger@informatik.uni-muenchen.de}, % \lstthanks{Brian~Elmegaard}{-}, % \lstthanks{Jon~Ericson}{Jon.Ericson@jpl.nasa.gov}, +% \lstthanks{Luc~Van~Eycken}{Luc.VanEycken@esat.kuleuven.be} % \lstthanks{Thomas~Esser}{te@dbs.uni-hannover.de}, % \lstthanks{Chris~Edwards}{edwch00p@infoscience.otago.ac.nz}, % \lstthanks{David~John~Evans}{Matrix.Software@dial.pipex.com}, @@ -1972,6 +1982,7 @@ % \lstthanks{Rene~H.~Larsen}{rhl@traceroute.dk}, % \lstthanks{Olivier~Lecarme}{ol@i3s.unice.fr}, % \lstthanks{Thomas~Leduc}{Thomas.Leduc@lsv.ens-cachan.fr}, +% \lstthanks{Qing~Lee}{-}, % \lstthanks{Dr.~Peter~Leibner}{Peter.Leibner@sta.siemens.de}, % \lstthanks{Thomas~Leonhardt}{leonhardt@informatik.tu-darmstadt.de} % (big thankyou), ^^A beta tester @@ -2004,6 +2015,7 @@ % \lstthanks{Michael~Piefel}{piefel@informatik.hu-berlin.de}, % \lstthanks{Michael~Piotrowski}{mxp@linguistik.uni-erlangen.de}, % \lstthanks{Manfred~Piringer}{sz0490@rrze.uni-erlangen.de}, +% \lstthanks{Ivo~Pletikosi\'c}{ivo.pletikosic@gmail.com}, % \lstthanks{Vincent~Poirriez}{Vincent.Poirriez@univ-valenciennes.fr}, % \lstthanks{Adam~Prugel-Bennett}{apb@ecs.soton.ac.uk}, % \lstthanks{Ralf~Quast}{rquast@hs.uni-hamburg.de}, @@ -2026,6 +2038,7 @@ % \lstthanks{Walter~Schmidt}{wschmi@arcor.de}, % \lstthanks{Christian~Schneider}{-}, % \lstthanks{Jochen~Schneider}{jschneider@ds3.etech.haw-hamburg.de}, +% \lstthanks{Sven~Schreiber}{svetosch@gmx.net}, % \lstthanks{Benjamin~Schubert}{benjamin.schubert@berlin.de}, % \lstthanks{Sebastian~Schubert}{-}, % \lstthanks{Uwe~Siart}{uwe.siart@ei.tum.de}, @@ -2689,7 +2702,7 @@ % \item[0.20] \rkeyname{caption}|={|\oarg{short}\meta{caption text}|}| % % The caption is made of \cs{lstlistingname} followed by a running -% number, a seperator, and \meta{caption text}. Either the caption text +% number, a separator, and \meta{caption text}. Either the caption text % or, if present, \meta{short} will be used for the list of listings. % % \item[0.21] \rkeyname{label}|=|\meta{name} @@ -2714,6 +2727,15 @@ % % The caption label for listings. % +% \item[,{{}},data] \rcmdname\lstlistingnamestyle +% +% customizes the style of the caption label for program listings in a +% simple way, something like |\small|, |\bfseries| or a combination +% of several commands. If there is a need for a complete +% customization of the label (justification, fonts, margins, \ldots), +% one should use the \textsf{caption} package by A.~Sommerfeldt +% \cite{Sommerfeldt:caption}. +% % \item[0.20,\arabic{lstlisting},data] \rcmdname\thelstlisting % % prints the running number of the caption. @@ -3465,7 +3487,7 @@ % \end{table} % % -% \paragraph{Strings} +% \paragraph{Strings}\label{uStrings} % \begin{syntax} % \item[0.12] % \rkeyname{string}|=|\oarg{\alternative{b,d,m,bd,s}}\marg{delimiter @@ -3645,6 +3667,7 @@ % Moreover, you might want to adjust % \icmdname\lstlistlistingname, % \icmdname\lstlistingname, +% \icmdname\lstlistingnamestyle, % \ikeyname{defaultdialect}, % \icmdname\lstalias, or % \icmdname\lstalias @@ -4390,13 +4413,17 @@ % \StopEventually{% % \begin{thebibliography}{MDB01} % +% \bibitem[DS13]{DanielSchubert:mdframed} +% Marco Daniel and Elke Schubert. +% \newblock{The \textsf{mdframed} package}, 2013. +% % \bibitem[Fai11]{Fairbairns:moreverb} % Robin Fairbairns. % \newblock{The \textsf{moreverb} package}, 2011. % -% \bibitem[DS13]{DanielSchubert:mdframed} -% Marco Daniel and Elke Schubert. -% \newblock{The \textsf{mdframed} package}, 2013. +% \bibitem[Som11]{Sommerfeldt:captions} +% Axel Sommerfeldt. +% \newblock{Customizing captions of floating environments}, 2011. % \end{thebibliography} % \setcounter{IndexColumns}{2}\PrintIndex} % @@ -5816,7 +5843,7 @@ % \part{Implementation} % % -% \CheckSum{12377} +% \CheckSum{12380} %^^A %^^A Don't index TeX-primitives. %^^A @@ -5960,8 +5987,8 @@ % All files will have same date and version. % \begin{macrocode} %<*kernel|misc|doc> -\def\filedate{2019/02/27} -\def\fileversion{1.8b} +\def\filedate{2019/09/10} +\def\fileversion{1.8c} % % \end{macrocode} % What we need and who we are. @@ -9751,7 +9778,8 @@ % \end{macrocode} % % \begin{macro}{\lst@stringtypes} -% is the list of \ldots\space string types? +% is the list of \ldots\space string types? The several valid string +% types are defined on page~\pageref{uStrings}. % \begin{macrocode} \gdef\lst@stringtypes{d,b,m,bd,db,s} % \end{macrocode} @@ -13607,8 +13635,16 @@ % \end{lstkey}\end{lstkey}\end{lstkey}\end{macro} % The following code is just copied from the current development version, and % from the |lstpatch.sty| file that Carsten left in version 1.3b for doing -% line ranges with numbers and range markers. +% line ranges with numbers and range markers. It uses some more keys: % +% \begin{lstkey}{linerange} +% \begin{lstkey}{rangeprefix} +% \begin{lstkey}{rangesuffix} +% \begin{lstkey}{rangebeginprefix} +% \begin{lstkey}{rangebeginsuffix} +% \begin{lstkey}{rangeendprefix} +% \begin{lstkey}{rangeendsuffix} +% \begin{lstkey}{includerangemarker} % First, the options that control the line-range handling. % \begin{macrocode} \lst@Key{linerange}\relax{\lstKV@OptArg[]{#1}{% @@ -13689,6 +13725,9 @@ % \begin{macrocode} \lst@AddToHookExe{DeInit}{\global\let\lst@DefRange\@empty} % \end{macrocode} +% \end{lstkey}\end{lstkey}\end{lstkey} +% \end{lstkey}\end{lstkey}\end{lstkey} +% \end{lstkey}\end{lstkey} % % Actually defining the marker (via |\lst@GLI@|, |\lst@DefRange|, % |\lst@CArgX| as seen above) is similar to |\lst@DefDelimB|---except that @@ -13865,6 +13904,7 @@ % % \begin{macro}{\thelstlisting} % \begin{macro}{\lstlistingname} +% \begin{macro}{\lstlistingnamestyle} % \begin{lstkey}{numberbychapter} % \ldots\space and how the caption numbers look like. I switched to % |\@ifundefined| (instead of |\ifx| |\@undefined|) after an error report from @@ -13888,6 +13928,7 @@ % \end{macrocode} % \begin{macrocode} \lst@UserCommand\lstlistingname{Listing} +\lst@UserCommand\lstlistingnamestyle{} % \end{macrocode} % \begin{macrocode} \lst@Key{numberbychapter}{true}[t]{\lstKV@SetIf{#1}\lst@ifnumberbychapter} @@ -13895,6 +13936,7 @@ % \end{lstkey} % \end{macro} % \end{macro} +% \end{macro} % % \begin{macro}{\lst@MakeCaption} % Before defining this macro, we ensure that some other control sequences @@ -13930,11 +13972,13 @@ % replacement text was used directly in |\lst@MakeCaption|. A |\noindent| has % been moved elsewhere and became |\@parboxrestore| after a bug report from % \lsthelper{Frank~Mittelbach}{2004/02/13}{Re: Info: Inkompatibilit\"at -% zwischen caption und listings}. +% zwischen caption und listings}. \lsthelper{Karl Berry}{bold "listings +% 1"?} asked for the ability of customizing the label. So +% |\lstlistingnamestyle| was introduced in front of |\lstlistingname|. % \begin{macrocode} \def\fnum@lstlisting{% - \lstlistingname - \ifx\lst@@caption\@empty\else~\thelstlisting\fi}% + {\lstlistingnamestyle\lstlistingname + \ifx\lst@@caption\@empty\else~\thelstlisting\fi}}% % \end{macrocode} % Captions are set only for display style listings -- thanks to % \lsthelper{Peter~L\"offler}{2004/04/24}{pdfTeX warning (dest): name{figure.1} @@ -14198,7 +14242,7 @@ \vspace\lst@aboveskip \fi \fi -% \end{macrocode} +% \end{macrocode} ^^A$ to make emacs font locking happy % Moved |\vspace| after |\par|---or we can get an empty line atop listings. % Bug reported by \lsthelper{Jim~Hefferon}{1999/08/27}{empty line before % listings with |\lstinputlisting|}. @@ -14589,7 +14633,7 @@ \lsthk@TextStyle \@ifnextchar\bgroup{% % \end{macrocode} -% \lsthelper{Luc~Van~Eycken}{2014/01/22}{Luc.VanEycken@esat.kuleuven.be} +% \lsthelper{Luc~Van~Eycken}{2014/01/22}{\rcmdname\lstinline{} in alignments} % reported, that the experimental implementation of |\lstinline| with % braces instead of characters surrounding the source code resulted in an % error if used in a tabular environment. He found that this error comes @@ -14599,7 +14643,7 @@ %\begin{verbatim} % \ifnum`{=0}\fi% %\end{verbatim} -% remedies the wrong behaviour. But \lsthelper{Qing Lee}{2014/06/28}{-} +% remedies the wrong behaviour. But \lsthelper{Qing~Lee}{2014/06/28}{-} % pointed out, that this breaks code like the one showed in % \ref{uListingsArguments} on \pageref{uListingsArguments} and proposed % another solution which in turn broke the code needed by Luc: @@ -15280,16 +15324,18 @@ }{% % \end{macrocode} % There is a problem with vertical space below a listing as pointed out by -% \lsthelper{Jean-Yves~Baudais}{2016/03/11}{some vertical space problem}. A -% similar problem arises with a listing beginning at the top of a -% |\paragraph| or at the beginning of an |example| environment. Jean-Yves -% provided a solution---|\let\if@nobreak\iffalse|---as has been discussed -% on |fr.comp.text.tex|. The assumption, that the problem vanishes if there -% is a top rule at the beginning of the listing or if |\leavevmode| -% introduces the listing, was wrong as \lsthelper{Karl -% Berry}{karl@freefriends.org}{2018/10/26} and \lsthelper{Sven -% Schreiber}{svetosch@gmx.net}{2018/10/23} reported independently, so the -% proposed code goes into the second part of the environment definition +% \lsthelper{Jean-Yves~Baudais}{2016/03/11}{some +% vertical space problem}. A similar problem arises with a listing +% beginning at the top of a |\paragraph| or at the beginning of an +% |example| environment. Jean-Yves provided a +% solution---|\let\if@nobreak\iffalse|---as has been discussed on +% |fr.comp.text.tex|. The assumption, that the problem vanishes if there is +% a top rule at the beginning of the listing or if |\leavevmode| introduces +% the listing, was wrong as +% \lsthelper{Karl~Berry}{2018/10/26}{listings 1.7 \rcmdname\leavevmode -> blank line} and +% \lsthelper{Sven~Schreiber}{2018/10/23}{Geändertes Verhalten in der neuen listings-Version} reported +% independently, so the proposed code goes into the second part of the +% environment definition % \begin{macrocode} \let\if@nobreak\iffalse% \csname\@lst @SaveFirstNumber\endcsname% @@ -16924,6 +16970,11 @@ % \item[1.7] 2018/09/02 % \item some new or updated language definitions. % \item several error corrections. +% \item[1.8] from 2019/02/27 on +% \item corrected and activated the option |inputpath|. +% \item some new or updated language definitions. +% \item several error corrections. +% \item introduced |\lstlistingnamestyle|. % \end{itemize} % \endgroup % diff --git a/Master/texmf-dist/source/latex/listings/listings.ins b/Master/texmf-dist/source/latex/listings/listings.ins index 29e790f2eb6..aa451ee768b 100644 --- a/Master/texmf-dist/source/latex/listings/listings.ins +++ b/Master/texmf-dist/source/latex/listings/listings.ins @@ -28,6 +28,7 @@ \file{lstdoc.sty}{\from{listings.dtx}{doc}} \file{lstdrvrs.ins}{\from{lstdrvrs.dtx}{install}} \file{listings.cfg}{\from{lstdrvrs.dtx}{config}} + \file{ltxdoc.cfg}{\from{listings.dtx}{ltx}} } % % generate language driver files diff --git a/Master/texmf-dist/source/latex/listings/lstdrvrs.dtx b/Master/texmf-dist/source/latex/listings/lstdrvrs.dtx index b185d4d7682..69c0af8b85b 100644 --- a/Master/texmf-dist/source/latex/listings/lstdrvrs.dtx +++ b/Master/texmf-dist/source/latex/listings/lstdrvrs.dtx @@ -33,10 +33,15 @@ % \title{Language, Style and Format drivers\\ for \textsf{Listings}\\ % {\large by Carsten Heinz and individual authors:}} % \author{\InputIfFileExists{lstdrvrs.tmp}{}{}} -% \date{2019/02/27\enspace\enspace Version 1.8b\ \box\abstractbox} -% -% \hypersetup{pdfsubject=Language definitions,pdfauthor=Jobst Hoffmann -% } +% \date{2019/09/10\enspace\enspace Version 1.8c\ \box\abstractbox} +% +% \ifhyper +% \hypersetup{pdftitle={Language, Style and Format drivers for the +% Listings package}, +% pdfsubject=Language definitions for the Listings package,% +% pdfauthor=Jobst Hoffmann ,% +% pdfkeywords={source code formatter, programming languages}} +% \fi % % \maketitle % @@ -132,7 +137,7 @@ % \endgroup % We mainly define default dialects. % \begin{macrocode} -\ProvidesFile{listings.cfg}[2019/02/27 1.8b listings configuration] +\ProvidesFile{listings.cfg}[2019/09/10 1.8c listings configuration] \def\lstlanguagefiles {lstlang0.sty,lstlang1.sty,lstlang2.sty,lstlang3.sty} \lstset{defaultdialect=[R/3 6.10]ABAP, @@ -179,7 +184,7 @@ %<+hansl-prf>\ProvidesFile{listings-hansl.prf} %<+lua-prf>\ProvidesFile{listings-lua.prf} %<+python-prf>\ProvidesFile{listings-python.prf} -%<-config> [2019/02/27 1.8b listings language file] +%<-config> [2019/09/10 1.8c listings language file] % \end{macrocode} % % @@ -2926,9 +2931,9 @@ morecomment=[l]!% % `one-word' functions and macros of Common Lisp, i.e.~words not containing a % minus. But I left out the \texttt{caaaar}, \ldots{} functions. % If anyone types them in, I'd like to get them. \lsthelper{Hilmar -% Preuße}{hille42@web.de}{2019/01/28} informed about an issue mentioned at -% \url{https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=499422}{sensitive -% is false}, the issue got corrected. +% Preuße}{hille42@web.de}{2019/01/28}{sensitive is false} informed about an +% issue mentioned at \url{https://bugs.debian.org/499422}, the issue got +% corrected. % \begingroup % \begin{macrocode} %<*lang2> @@ -8489,10 +8494,10 @@ literate=% % keywords, ditto \lsthelper{Torsten~Flatter}{Thorsten.Flatter@T-Systems.de} % {2002/10/15}{missing keywords}, \lsthelper{Robert~Frank}{rf7@ukc.ac.uk} % {2002/11/19}{missing keywords} and \lsthelper{Dirk~Jesko} -% {jesko@iti.cs.uni-magdeburg.de}{2003/06/03}{extended SQL definition}. \lsthelper{Hilmar -% Preuße}{hille42@web.de}{2019/01/28}{added keyword} informed about an issue mentioned at -% \url{https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=626521}, the issue -% got corrected. +% {jesko@iti.cs.uni-magdeburg.de}{2003/06/03}{extended SQL +% definition}. \lsthelper{Hilmar Preuße}{hille42@web.de}{2019/01/28}{added +% keyword} informed about an issue mentioned at +% \url{https://bugs.debian.org/626521}, the issue got corrected. % \begingroup % \begin{macrocode} %<*lang1> diff --git a/Master/texmf-dist/source/latex/listings/lstdrvrs.ins b/Master/texmf-dist/source/latex/listings/lstdrvrs.ins index b02f69b9a49..54201a41415 100644 --- a/Master/texmf-dist/source/latex/listings/lstdrvrs.ins +++ b/Master/texmf-dist/source/latex/listings/lstdrvrs.ins @@ -56,7 +56,7 @@ } \endbatchfile - [2019/02/27 1.8b listings language file] + [2019/09/10 1.8c listings language file] \endinput %% %% End of file `lstdrvrs.ins'. diff --git a/Master/texmf-dist/source/latex/listings/ltxdoc.cfg b/Master/texmf-dist/source/latex/listings/ltxdoc.cfg new file mode 100644 index 00000000000..62639fb32a8 --- /dev/null +++ b/Master/texmf-dist/source/latex/listings/ltxdoc.cfg @@ -0,0 +1,11 @@ +%% +%% This is file `ltxdoc.cfg', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% listings.dtx (with options: `ltx') +%% +\endinput +%% +%% End of file `ltxdoc.cfg'. diff --git a/Master/texmf-dist/tex/latex/listings/listings-acm.prf b/Master/texmf-dist/tex/latex/listings/listings-acm.prf index a2b01193226..ee75a1b4d2c 100644 --- a/Master/texmf-dist/tex/latex/listings/listings-acm.prf +++ b/Master/texmf-dist/tex/latex/listings/listings-acm.prf @@ -22,7 +22,7 @@ %% programming languages to Jobst Hoffmann at . %% \ProvidesFile{listings-acm.prf} - [2019/02/27 1.8b listings language file] + [2019/09/10 1.8c listings language file] \usepackage[rgb, x11names]{xcolor} \definecolor{Comments}{rgb}{0.00,0.50,0.00} diff --git a/Master/texmf-dist/tex/latex/listings/listings-bash.prf b/Master/texmf-dist/tex/latex/listings/listings-bash.prf index e5c3df7c3d0..e0e2cbbb9b7 100644 --- a/Master/texmf-dist/tex/latex/listings/listings-bash.prf +++ b/Master/texmf-dist/tex/latex/listings/listings-bash.prf @@ -22,7 +22,7 @@ %% programming languages to Jobst Hoffmann at . %% \ProvidesFile{listings-bash.prf} - [2019/02/27 1.8b listings language file] + [2019/09/10 1.8c listings language file] \usepackage[rgb, x11names]{xcolor} \lstset{% diff --git a/Master/texmf-dist/tex/latex/listings/listings-fortran.prf b/Master/texmf-dist/tex/latex/listings/listings-fortran.prf index 1fc22798d6c..36d5ac5bb2d 100644 --- a/Master/texmf-dist/tex/latex/listings/listings-fortran.prf +++ b/Master/texmf-dist/tex/latex/listings/listings-fortran.prf @@ -22,7 +22,7 @@ %% programming languages to Jobst Hoffmann at . %% \ProvidesFile{listings-fortran.prf} - [2019/02/27 1.8b listings language file] + [2019/09/10 1.8c listings language file] \usepackage[rgb, x11names]{xcolor} \lstset{% diff --git a/Master/texmf-dist/tex/latex/listings/listings-hansl.prf b/Master/texmf-dist/tex/latex/listings/listings-hansl.prf index 018bd68bdf8..5dabb52c222 100644 --- a/Master/texmf-dist/tex/latex/listings/listings-hansl.prf +++ b/Master/texmf-dist/tex/latex/listings/listings-hansl.prf @@ -22,7 +22,7 @@ %% programming languages to Jobst Hoffmann at . %% \ProvidesFile{listings-hansl.prf} - [2019/02/27 1.8b listings language file] + [2019/09/10 1.8c listings language file] \usepackage[rgb, x11names]{xcolor} \lstdefinestyle{hanslbw}{% diff --git a/Master/texmf-dist/tex/latex/listings/listings-lua.prf b/Master/texmf-dist/tex/latex/listings/listings-lua.prf index 55026ba5ef7..c52020d4059 100644 --- a/Master/texmf-dist/tex/latex/listings/listings-lua.prf +++ b/Master/texmf-dist/tex/latex/listings/listings-lua.prf @@ -22,7 +22,7 @@ %% programming languages to Jobst Hoffmann at . %% \ProvidesFile{listings-lua.prf} - [2019/02/27 1.8b listings language file] + [2019/09/10 1.8c listings language file] \usepackage[rgb, x11names]{xcolor} \lstdefinestyle{Lua}{% language=[5.2]Lua, diff --git a/Master/texmf-dist/tex/latex/listings/listings-python.prf b/Master/texmf-dist/tex/latex/listings/listings-python.prf index ac8a93dfc0c..74110def45e 100644 --- a/Master/texmf-dist/tex/latex/listings/listings-python.prf +++ b/Master/texmf-dist/tex/latex/listings/listings-python.prf @@ -22,7 +22,7 @@ %% programming languages to Jobst Hoffmann at . %% \ProvidesFile{listings-python.prf} - [2019/02/27 1.8b listings language file] + [2019/09/10 1.8c listings language file] \usepackage{xcolor} \usepackage{textcomp} diff --git a/Master/texmf-dist/tex/latex/listings/listings.cfg b/Master/texmf-dist/tex/latex/listings/listings.cfg index 5d35c356380..4fc94ce55ca 100644 --- a/Master/texmf-dist/tex/latex/listings/listings.cfg +++ b/Master/texmf-dist/tex/latex/listings/listings.cfg @@ -21,7 +21,7 @@ %% Send comments and ideas on the package, error reports and additional %% programming languages to Jobst Hoffmann at . %% -\ProvidesFile{listings.cfg}[2019/02/27 1.8b listings configuration] +\ProvidesFile{listings.cfg}[2019/09/10 1.8c listings configuration] \def\lstlanguagefiles {lstlang0.sty,lstlang1.sty,lstlang2.sty,lstlang3.sty} \lstset{defaultdialect=[R/3 6.10]ABAP, diff --git a/Master/texmf-dist/tex/latex/listings/listings.sty b/Master/texmf-dist/tex/latex/listings/listings.sty index 36b08b58cf5..b938be3b362 100644 --- a/Master/texmf-dist/tex/latex/listings/listings.sty +++ b/Master/texmf-dist/tex/latex/listings/listings.sty @@ -16,8 +16,8 @@ %% Send comments and ideas on the package, error reports and additional %% programming languages to Jobst Hoffmann at . %% -\def\filedate{2019/02/27} -\def\fileversion{1.8b} +\def\filedate{2019/09/10} +\def\fileversion{1.8c} \NeedsTeXFormat{LaTeX2e} \AtEndOfPackage{\ProvidesPackage{listings} [\filedate\space\fileversion\space(Carsten Heinz)]} @@ -1575,6 +1575,7 @@ \gdef\thelstlisting{\@arabic\c@lstlisting} \fi} \lst@UserCommand\lstlistingname{Listing} +\lst@UserCommand\lstlistingnamestyle{} \lst@Key{numberbychapter}{true}[t]{\lstKV@SetIf{#1}\lst@ifnumberbychapter} \@ifundefined{abovecaptionskip} {\newskip\abovecaptionskip @@ -1592,8 +1593,8 @@ \vskip\belowcaptionskip}% }{} \def\fnum@lstlisting{% - \lstlistingname - \ifx\lst@@caption\@empty\else~\thelstlisting\fi}% + {\lstlistingnamestyle\lstlistingname + \ifx\lst@@caption\@empty\else~\thelstlisting\fi}}% \def\lst@MakeCaption#1{% \lst@ifdisplaystyle \ifx #1t% diff --git a/Master/texmf-dist/tex/latex/listings/lstdoc.sty b/Master/texmf-dist/tex/latex/listings/lstdoc.sty index 8bc68eec5ed..e4ba3109c43 100644 --- a/Master/texmf-dist/tex/latex/listings/lstdoc.sty +++ b/Master/texmf-dist/tex/latex/listings/lstdoc.sty @@ -6,8 +6,8 @@ %% %% listings.dtx (with options: `doc') %% -\def\filedate{2019/02/27} -\def\fileversion{1.8b} +\def\filedate{2019/09/10} +\def\fileversion{1.8c} \ProvidesPackage{lstdoc} [\filedate\space\fileversion\space(Carsten Heinz)] \let\lstdoc@currversion\fileversion diff --git a/Master/texmf-dist/tex/latex/listings/lstlang1.sty b/Master/texmf-dist/tex/latex/listings/lstlang1.sty index bea732a8cf9..b53b79ff510 100644 --- a/Master/texmf-dist/tex/latex/listings/lstlang1.sty +++ b/Master/texmf-dist/tex/latex/listings/lstlang1.sty @@ -22,7 +22,7 @@ %% programming languages to Jobst Hoffmann at . %% \ProvidesFile{lstlang1.sty} - [2019/02/27 1.8b listings language file] + [2019/09/10 1.8c listings language file] %% %% ACSL definition (c) 2000 by Andreas Matthias %% diff --git a/Master/texmf-dist/tex/latex/listings/lstlang2.sty b/Master/texmf-dist/tex/latex/listings/lstlang2.sty index 24dfaf3274a..6d841c6bb2f 100644 --- a/Master/texmf-dist/tex/latex/listings/lstlang2.sty +++ b/Master/texmf-dist/tex/latex/listings/lstlang2.sty @@ -22,7 +22,7 @@ %% programming languages to Jobst Hoffmann at . %% \ProvidesFile{lstlang2.sty} - [2019/02/27 1.8b listings language file] + [2019/09/10 1.8c listings language file] %% %% Abap definition by Knut Lickert %% diff --git a/Master/texmf-dist/tex/latex/listings/lstlang3.sty b/Master/texmf-dist/tex/latex/listings/lstlang3.sty index 46b6facbba5..3482b3c4c3b 100644 --- a/Master/texmf-dist/tex/latex/listings/lstlang3.sty +++ b/Master/texmf-dist/tex/latex/listings/lstlang3.sty @@ -22,7 +22,7 @@ %% programming languages to Jobst Hoffmann at . %% \ProvidesFile{lstlang3.sty} - [2019/02/27 1.8b listings language file] + [2019/09/10 1.8c listings language file] \lst@definelanguage[68]{Algol}% {morekeywords={abs,and,arg,begin,bin,bits,bool,by,bytes,case,channel,% char,co,comment,compl,conj,divab,do,down,elem,elif,else,empty,% diff --git a/Master/texmf-dist/tex/latex/listings/lstmisc.sty b/Master/texmf-dist/tex/latex/listings/lstmisc.sty index 0fd0c697566..77514c532ff 100644 --- a/Master/texmf-dist/tex/latex/listings/lstmisc.sty +++ b/Master/texmf-dist/tex/latex/listings/lstmisc.sty @@ -16,8 +16,8 @@ %% Send comments and ideas on the package, error reports and additional %% programming languages to Jobst Hoffmann at . %% -\def\filedate{2019/02/27} -\def\fileversion{1.8b} +\def\filedate{2019/09/10} +\def\fileversion{1.8c} \ProvidesFile{lstmisc.sty} [\filedate\space\fileversion\space(Carsten Heinz)] \lst@CheckVersion\fileversion -- cgit v1.2.3