summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/listings
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2015-06-14 17:53:48 +0000
committerKarl Berry <karl@freefriends.org>2015-06-14 17:53:48 +0000
commit6a598465f500d8ac3a87b812b16358ba0835b1bf (patch)
tree01f1bbce0a210482743e08ff9c13cc145bde7056 /Master/texmf-dist/source/latex/listings
parent02f01f7ec631cb85a67d59c9be5ab48e9d936d30 (diff)
listings (5jun15)
git-svn-id: svn://tug.org/texlive/trunk@37534 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/listings')
-rw-r--r--Master/texmf-dist/source/latex/listings/listings.dtx187
-rw-r--r--Master/texmf-dist/source/latex/listings/lstdrvrs.dtx364
-rw-r--r--Master/texmf-dist/source/latex/listings/lstdrvrs.ins2
3 files changed, 363 insertions, 190 deletions
diff --git a/Master/texmf-dist/source/latex/listings/listings.dtx b/Master/texmf-dist/source/latex/listings/listings.dtx
index 4c715bef717..5b897a2968a 100644
--- a/Master/texmf-dist/source/latex/listings/listings.dtx
+++ b/Master/texmf-dist/source/latex/listings/listings.dtx
@@ -13,7 +13,7 @@
% or simply `the package'. lstdrvrs.dtx and the files generated from
% that file are `drivers'.
%
-% The listings package is copyright 1996--2004 Carsten Heinz, and
+% The listings package is copyright 1996--2004 Carsten Heinz, and
% continued maintenance on the package is copyright 2006--2007 Brooks
% Moses. From 2013 on copyright is Jobst Hoffmann, who is the maintainer
% since july 2013. The drivers are copyright 1997/1998/1999/2000/2001/
@@ -30,7 +30,7 @@
%
% The package has the LPPL maintenance status "maintained".
%
-% $Id: listings.dtx 149 2014-09-06 17:17:38Z j_hoffmann $
+% $Id: listings.dtx 201 2015-06-04 20:25:39Z j_hoffmann $
%
% The Current Maintainer is Jobst Hoffmann <j.hoffmann(at)fh-aachen.de>.
%
@@ -43,6 +43,10 @@
\OnlyDescription
\usepackage{lstdoc,textcomp}
+\usepackage{mdframed} % frames for external files
+\usepackage{moreverb} % writing external files
+\usepackage{xcolor} % because of colouring the background
+
\makeindex
\begin{document}
@@ -115,7 +119,7 @@
% Hoffmann became the maintainer of the \packagename{listings}
% package in 2013; see the Preface for details.}~ %
% \textless\lstemail\textgreater}
-% \date{2014/09/06\enspace\enspace Version 1.5e\ \box\abstractbox}
+% \date{2015/06/04\enspace\enspace Version 1.6\ \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 <j.hoffmann(at)fh-aachen.de>}
@@ -131,7 +135,7 @@
% \section*{Preface}
%
% \paragraph{Transition of package maintenance}
-% The \TeX\ world lost contact with Carsten Heinz in late 2004, shortly after
+% The \TeX\ world lost contact with Carsten Heinz in late 2004, shortly after
% he released version 1.3b of the \packagename{listings} package. After many
% attempts to reach him had failed, Hendri Adriaens took over maintenance of
% the package in accordance with the LPPL's procedure for abandoned packages.
@@ -139,7 +143,7 @@
% volunteered for the position while this procedure was going through. The
% result is known as listings version 1.4.
%
-% This release, version 1.5, is a minor maintenance release since
+% This release, version 1.5, is a minor maintenance release since
% I accepted maintainership of the package. I would like to thank Stephan
% Hennig who supported the Lua language definitions. He is the one who
% asked for the integration of a new language and gave the impetus to me to
@@ -203,7 +207,7 @@
% applies, you should spend more time on reading (good) books about
% programming, (good) documentations, and (good) source code from other
% people. Of course you should also make your own experiments.
-% You will learn a lot. However, running the example through \LaTeX\
+% You will learn a lot. However, running the example through \LaTeX\
% shows whether the \packagename{listings} package is installed correctly.
% \item The example doesn't work.
% \advisespace
@@ -993,7 +997,7 @@
% If you type in such characters directly as characters of codes 128--255 and
% use them also in listings, let the package know it---or you'll get really
% funny results. {\rstyle\ikeyname{extendedchars}}|=true| allows and
-% |extendedchars=false| prohibits \packagename{listings} from handling
+% |extendedchars=false| prohibits \packagename{listings} from handling
% extended characters in listings. If you use them, you should load
% \packagename{fontenc}, \packagename{inputenc} and/or
% any other package which defines the characters.
@@ -1008,7 +1012,7 @@
% on---specifically, any encoding which uses multiple bytes per character.
%
% Thus, if you use the a package that supports multibyte characters, such as
-% the \packagename{CJK} or \packagename {ucs} packages for Chinese and
+% the \packagename{CJK} or \packagename {ucs} packages for Chinese and
% UTF-8 characters, you must avoid letting \packagename{listings}
% process the extended characters. It is generally best to also specify
% |extendedchars=false| to avoid having \packagename{listings} get entangled
@@ -1123,7 +1127,7 @@
% For example, begin with `|framerule=10mm|'. If the rules are
% misaligned by the same (small) amount as before, the problem does not
% come from the rule width. So continue with the next parameter. Also,
-% Adobe Acrobat sometimes has single-pixel rounding errors which can
+% Adobe Acrobat sometimes has single-pixel rounding errors which can
% cause small misalignments at the corners when PDF files are displayed
% on screen; these are unfortunately normal.
% \end{advise}
@@ -1387,7 +1391,7 @@
% listings inside paragraphs, but you must force the package to do this by
% enclosing the listing in |\hbox{| and |}|.
% \begin{advise}
-% \item Is it good form to use the \TeX-primitive `|\hbox|' in a \LaTeX\
+% \item Is it good form to use the \TeX-primitive `|\hbox|' in a \LaTeX\
% document?
% \advisespace
% No, it's not. But \LaTeX's `|\mbox|' does not work in this example:
@@ -1535,8 +1539,8 @@
% and space-flexible formats try to fix the column alignment if a character
% string needs less space than `reserved'. The normal flexible format will
% insert make-up space to fix the alignment at spaces, before and after
-% identifiers, and before and after sequences of other characters; the
-% space-flexible format will only insert make-up space by stretching
+% identifiers, and before and after sequences of other characters; the
+% space-flexible format will only insert make-up space by stretching
% existing spaces. In the flexible example above, the two MENs are vertically
% aligned since some space has been inserted in the fourth line to fix the
% alignment. In the full flexible format, the two MENs are not aligned.
@@ -2127,7 +2131,12 @@
% you want and report success and failure. A known limitation is that
% inside another argument the last source code token must not be an
% explicit space token---and, of course, using a listing inside another
-% argument is itself experimental, see section \ref{rListingsInsideArguments}.
+% argument is itself experimental, see section
+% \ref{rListingsInsideArguments}.
+%
+% Another limitation is that this feature can't be used in cells of a
+% |tabular|-environment. See \section{uListingsArguments} for a
+% workaround.
%
% See also section \ref{rShortInline} for commands to create short analogs
% for the |\lstinline| command.
@@ -2487,7 +2496,7 @@
% \item[0.16,1] \rkeyname{stepnumber}|=|\meta{number}
%
% All lines with ``line number $\equiv 0$ modulo \meta{number}'' get a
-% line number.
+% line number.
% If you turn line numbers on and off with \keyname{numbers}, the
% parameter \keyname{stepnumber} will keep its value. Alternatively you
% can turn them off via |stepnumber=0| and on with a nonzero number, and
@@ -3675,7 +3684,7 @@
% interface, a powerful `format definition' parser, and lots of code lines
% behind the scenes. Currently, format definitions aren't flexible enough
% (possibly not the definitions but the results). A single `format item' has
-% the form
+% the form
% \begin{itemize}\item[]
% \meta{input chars}|=|\oarg{exceptional chars}\meta{pre}\oarg{\texttt{\string\string}}\meta{post}
% \end{itemize}
@@ -3900,6 +3909,68 @@
% \end{enumerate}
%
%
+% \section{Bugs and workarounds}\label{uBugsWorkarounds}
+%
+% \subsection{Listings inside arguments}\label{uListingsArguments}
+%
+% At the moment it isn't possible to use \verb-\lstinline{...}- in a cell
+% of a table\makeatletter\@ifundefined{r@uProcessingInline}{}{%
+% (see section \ref{uProcessingInline} on page \pageref{uProcessingInline}
+% for more information)},%
+% \makeatother%
+% but it is possible to define a wrapper macro
+% which can be used instead of \verb-\lstinline{...}-:
+% \begin{lstsample}[lstlisting]{}{}
+% \newcommand\foo{\lstinline{t}}
+% \newcommand\foobar[2][]{\lstinline[#1]{#2}}
+%
+% \begin{tabular}{ll}
+% \foo & a variable\\
+% \foobar[language=java]{int u;} & a declaration
+% \end{tabular}
+% \end{lstsample}
+%
+%
+% \subsection{Listings with a background colour and \LaTeX{} escaped
+% formulas}
+% \label{uListingsBackgroundColour}
+%
+% If there is any text escaped to \LaTeX{} with some coloured background
+% and surrounding frames, then there are gaps in the background as well as
+% in the lines making up the frame.
+% \begin{lstsample}[lstlisting]{}{}
+% \begin{lstlisting}[language=C, mathescape,
+% backgroundcolor=\color{yellow!10}, frame=tlb]
+% /* the following code computes $\displaystyle\sum_{i=1}^{n}i$ */
+% for (i = 1; i <= limit; i++) {
+% sum += i;
+% }
+% \end{lstlisting}
+% \end{lstsample}
+%
+% At the moment there is only one workaround:
+% \begin{itemize}
+% \item Write your code into an external file \meta{filename}.
+% \item Input your code by |\lstinputlisting|\meta{filename} into your
+% document and surround it with a frame generated by |\begin{mdframed}|
+% \ldots{} |\end{mdframed}|.
+% \end{itemize}
+% \begin{lstsample}[lstlisting]{}{}
+% \begin{verbatimwrite}{temp.c}
+% /* the following code computes $\displaystyle\sum_{i=1}^{n}i$ */
+% for (i = 1; i <= limit; i++) {
+% sum += i;
+% }
+% \end{verbatimwrite}
+% \begin{mdframed}[backgroundcolor=yellow!10, rightline=false]
+% \lstinputlisting[language=C,mathescape,frame={}]{./temp.c}
+% \end{mdframed}
+% \end{lstsample}
+% For more information about the |verbatimwrite| environment have a look at
+% \cite{Fairbairns:moreverb}, the |mdframed| environment is deeply discussed in
+% \cite{DanielSchubert:mdframed}.
+%
+%
% \section{How tos}\label{uHowTos}
%
%
@@ -4030,7 +4101,7 @@
% \subsubsection*{How to print national characters with $\Lambda$ and \packagename{listings}}\label{uNationalCharacters}
%
% Apart from typing in national characters directly, you can use the `escape'
-% feature described in section \ref{rEscapingToLaTeX}.
+% feature described in section \ref{rEscapingToLaTeX}.
% The keys \ikeyname{escapechar}, \ikeyname{escapeinside}, and \ikeyname{texcl}
% allow partial usage of \LaTeX\ code.
%
@@ -4072,7 +4143,7 @@
%
% \subsubsection*{How to get bold typewriter type keywords}
% Use the \href{http://www.ctan.org/tex-archive/fonts/luximono}{\packagename{LuxiMono}} package.
-%
+%
% \iffalse
% Many people asked for bold typewriter fonts since they aren't included in
% the \LaTeX\ standard distribution. Here now one answer on how to use them
@@ -4140,7 +4211,18 @@
% \def\index@prologue{\part{Index}\markboth{Index}{Index}}
% \makeatother
%^^A \StopEventually{\lstcheckreference\setcounter{IndexColumns}{2}\PrintIndex}
-% \StopEventually{\setcounter{IndexColumns}{2}\PrintIndex}
+% \StopEventually{%
+% \begin{thebibliography}{MDB01}
+%
+% \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.
+% \end{thebibliography}
+% \setcounter{IndexColumns}{2}\PrintIndex}
%
%
% \part{Developer's guide}
@@ -5165,7 +5247,7 @@
% three characters. All characters of \meta{1st}\meta{2nd}\meta{rest}
% must already be active (if not empty).
% That's not a problem since the macro |\lst@CArgX| does this job.
-%
+%
% \item[1.0] \cs{lst@DefDelimE}
%
% |{|\meta{1st}\meta{2nd}\marg{rest}|}|\\
@@ -5534,7 +5616,7 @@
% \part{Implementation}
%
%
-% \CheckSum{12367}
+% \CheckSum{12365}
%^^A
%^^A Don't index TeX-primitives.
%^^A
@@ -5675,8 +5757,8 @@
% \paragraph{Identification}
% All files will have same date and version.
% \begin{macrocode}
-\def\filedate{2014/09/06}
-\def\fileversion{1.5e}
+\def\filedate{2015/06/04}
+\def\fileversion{1.6}
% \end{macrocode}
% What we need and who we are.
% \begin{macrocode}
@@ -6142,7 +6224,7 @@
%
% \begin{macro}{\lst@for}
% A for-loop with expansion of the loop-variable. This was improved due to
-% a suggestion by \lsthelper{Hendri~Adriaens}{2006/03/31}{speedup of
+% a suggestion by \lsthelper{Hendri~Adriaens}{2006/03/31}{speedup of
% \lst@for}.
% \begin{macrocode}
\def\lst@for#1\do#2{%
@@ -6160,7 +6242,7 @@
%
% \subsection{Catcode changes}\label{iCatcodeChanges}
%
-% A character gets its catcode right after reading it and \TeX\ has no
+% A character gets its catcode right after reading it and \TeX\ has no
% primitive command to change attached catcodes. However, we can replace these
% characters by characters with same ASCII codes and different catcodes.
% It's not the same but suffices since the result is the same.
@@ -6453,7 +6535,7 @@
%
% \item[0.20] |\lst@DefDriver|\marg{name}\marg{prefix}\meta{interface macro}|\if|\alternative{true,false}
%
-%
+%
%
% \item[0.21] |\lst@IfRequired|\oarg{sub}\marg{feature}\marg{then}\marg{else}
%
@@ -7268,7 +7350,7 @@
% \end{macro}
%
% \begin{macro}{\lst@CalcColumn}
-% sets |\@tempcnta| to the current column.
+% sets |\@tempcnta| to the current column.
% Note that |\lst@pos| will be nonpositive.
% \begin{macrocode}
\def\lst@CalcColumn{%
@@ -7610,7 +7692,7 @@
\lst@UseLostSpace
\fi
\else
- \lst@ifnewline \lst@UseLostSpace\fi
+ \lst@ifnewline \lst@UseLostSpace\fi
\fi}%
\let\lst@leftinsert\@empty
\let\lst@rightinsert\@empty}
@@ -7621,7 +7703,7 @@
%
% \begin{macro}{\lst@outputpos}
% This macro sets the `output-box-positioning' parameter (the old key
-% \keyname{outputpos}). We test for |l|, |c| and |r|.
+% \keyname{outputpos}). We test for |l|, |c| and |r|.
% The fixed formats use |\lst@lefthss| and |\lst@righthss|, whereas the
% flexibles need |\lst@leftinsert| and |\lst@rightinsert|.
% \begin{macrocode}
@@ -8305,7 +8387,7 @@
% \subsubsection{The standard table}
%
% The standard character table is selected by |\lst@SelectStdCharTable|, which
-% expands to a token sequence
+% expands to a token sequence
% \ldots|\def| |A{\lst@ProcessLetter| |A}|\ldots\space
% where the first A is active and the second has catcode 12. We use the
% following macros to build the character table.
@@ -9316,7 +9398,7 @@
\expandafter\lst@next
\fi}
% \end{macrocode}
-% Then we can check whether (the following) |\lst@|\meta{delimiter name}\ldots\
+% Then we can check whether (the following) |\lst@|\meta{delimiter name}\ldots\
% matches the delimiter class given by |\lst@delim|.
% \begin{macrocode}
\def\lst@Delim@delall@do#1#2\@empty#3#4#5{%
@@ -10202,7 +10284,7 @@
% fourth right before ending it. We use the same mechanism as for \TeX\ comment
% lines. The |\lst@ifdropinput| test has been added after a bug report by
% \lsthelper{Michael~Weber}{2002/03/26}{escape on lines < firstline corrupts
-% output}. The |\lst@newlines\z@| was added due to a bug report by
+% output}. The |\lst@newlines\z@| was added due to a bug report by
% \lsthelper{Frank~Atanassow}{2004/10/07}{space after mathescape is not
% preserved}.
% \begin{macrocode}
@@ -11210,7 +11292,7 @@
% \end{macrocode}
% To make the backslash belong to the control sequence, it is merged with
% the following token. This option was suggested by \lsthelper{Morten~H\o gholm}
-% {2004/07/16}{defining new (colored) texcs}.
+% {2004/07/16}{defining new (colored) texcs}.
% \lsthelper{Christian~Schneider}{-}{2006/09/08} pointed out that the original
% implementation was broken when the identifier was preceded by an ``other''
% character. To fix this (and other bugs), we first output whatever is in the
@@ -12502,7 +12584,7 @@
% \begin{macrocode}
\lst@AddToHook{Init}
{\lst@ifbreaklines
- \hbadness\@M \pretolerance\@M
+ \hbadness\@M \pretolerance\@M
\@rightskip\@flushglue \rightskip\@rightskip % \raggedright
\leftskip\z@skip \parindent\z@
% \end{macrocode}
@@ -13228,7 +13310,7 @@
% \begin{macro}{\lst@MakeSCT}
% If `macro use' is on, the opening |$(| prints preceding characters, enters
% the special mode and merges the two characters with the following output.
-%
+%
% \begin{macrocode}
\gdef\lst@MakeSCT{%
\lst@ifmakemacrouse
@@ -13303,7 +13385,7 @@
% from the |lstpatch.sty| file that Carsten left in version 1.3b for doing
% line ranges with numbers and range markers.
%
-% First, the options that control the line-range handling.
+% First, the options that control the line-range handling.
% \begin{macrocode}
\lst@Key{linerange}\relax{\lstKV@OptArg[]{#1}{%
\def\lst@interrange{##1}\def\lst@linerange{##2,}}}
@@ -14194,7 +14276,7 @@
% \end{macrocode}
% For KOMA-script classes, we define it a la KOMA thanks to a bug report by
% \lsthelper{Tino~Langer}{2003/11/01}{koma-script's listsleft option does not
-% affect lol}. \lsthelper{Markus~Kohm}{2006/08/12}{koma-script support is
+% affect lol}. \lsthelper{Markus~Kohm}{2006/08/12}{koma-script support is
% broken} suggested a much-improved version of this, which also works with
% the \packagename{float} package. The following few comments are from Markus.
%
@@ -14243,7 +14325,7 @@
% for the suggestion.
%
% Unfortunately, \packagename{float} defines this with |\newcommand|; thus,
-% to avoid conflict, we have to redefine it after \packagename{float} is
+% to avoid conflict, we have to redefine it after \packagename{float} is
% loaded. |\AtBeginDocument| is the easiest way to do this. Again, thanks
% to Markus for the advice.
% \begin{macrocode}
@@ -14261,7 +14343,7 @@
%
% \subsection{Inline listings}\label{iInlineListings}
%
-% \subsubsection{Processing inline listings}
+% \subsubsection{Processing inline listings}\label{uProcessingInline}
%
% \begin{macro}{\lstinline}
% In addition to |\lsthk@PreSet|, we use |boxpos=b| and flexiblecolumns.
@@ -14285,10 +14367,31 @@
% braces instead of characters surrounding the source code resulted in an
% error if used in a tabular environment. He found that this error comes
% from the master counter (cf. appendix D (Dirty Tricks), item 5. (Brace
-% hacks), of the TeXbook (p. 385-386)). Adding the following line remedies
-% the wrong behaviour.
+% hacks), of the TeXbook (p. 385-386)). Adding the following line at this
+% point
+% \begin{verbatim}
+% \ifnum`{=0}\fi%
+% \end{verbatim}
+% remedies the wrong behaviour. But \lstthanks{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:
+% \begin{verbatim}
+% % \renewcommand\lstinline[1][]{%
+% % \leavevmode\bgroup % \hbox\bgroup --> \bgroup
+% % \def\lst@boxpos{b}%
+% % \lsthk@PreSet\lstset{flexiblecolumns,#1}%
+% % \lsthk@TextStyle
+% % \ifnum\iffalse{\fi`}=\z@\fi
+% % \@ifnextchar\bgroup{%
+% % \ifnum`{=\z@}\fi%
+% % \afterassignment\lst@InlineG \let\@let@token}{%
+% % \ifnum`{=\z@}\fi\lstinline@}}
+% \end{verbatim}
+% So finally the old code comes back and the people, who need a
+% |\lstinline| with braces, should use the workaround from section
+% \ref{uListingsArguments} on page \pageref{uListingsArguments}.
% \begin{macrocode}
- \ifnum`{=0}\fi%
\afterassignment\lst@InlineG \let\@let@token}%
\lstinline@}
\def\lstinline@#1{%
@@ -14486,7 +14589,7 @@
\xdef\dospecials{\dospecials}%
% \end{macrocode}
% Fixing |\@sanitize| is the same except that we need to re-define
-% |\@makeother| which obviously needs to be done in a group.
+% |\@makeother| which obviously needs to be done in a group.
% \begin{macrocode}
\begingroup
\def\@makeother##1{%
diff --git a/Master/texmf-dist/source/latex/listings/lstdrvrs.dtx b/Master/texmf-dist/source/latex/listings/lstdrvrs.dtx
index 3dd876c7aa2..ffccc55440f 100644
--- a/Master/texmf-dist/source/latex/listings/lstdrvrs.dtx
+++ b/Master/texmf-dist/source/latex/listings/lstdrvrs.dtx
@@ -1,6 +1,6 @@
% \iffalse
%
-% $Id: lstdrvrs.dtx 151 2014-09-06 17:21:33Z j_hoffmann $
+% $Id: lstdrvrs.dtx 200 2015-06-04 18:59:32Z j_hoffmann $
%
%<*driver>
\documentclass{ltxdoc}
@@ -32,7 +32,7 @@
%
% \title{Language, Style and Format drivers\\ for \textsf{Listings}\\ {\large by Carsten Heinz and individual authors:}}
% \author{\InputIfFileExists{lstdrvrs.tmp}{}{}}
-% \date{2014/09/06\enspace\enspace Version 1.5e\ \box\abstractbox}
+% \date{2015/06/04\enspace\enspace Version 1.6\ \box\abstractbox}
%
% \hypersetup{pdfsubject=Language definitions,pdfauthor=Jobst Hoffmann
% <j.hoffmann-(at)-fh-aachen.de>}
@@ -61,7 +61,7 @@
%
% \begingroup
% \begin{macrocode}
-%% The listings package is copyright 1996--2004 Carsten Heinz, and
+%% The listings package is copyright 1996--2004 Carsten Heinz, and
%% continued maintenance on the package is copyright 2006--2007 Brooks
%% Moses. From 2013 on the maintenance is done by Jobst Hoffmann.
%% The drivers are copyright 1997/1998/1999/2000/2001/2002/2003/2004/2006/
@@ -129,7 +129,7 @@
% \endgroup
% We mainly define default dialects.
% \begin{macrocode}
-\ProvidesFile{listings.cfg}[2014/09/06 1.5e listings configuration]
+\ProvidesFile{listings.cfg}[2015/06/04 1.6 listings configuration]
\def\lstlanguagefiles
{lstlang0.sty,lstlang1.sty,lstlang2.sty,lstlang3.sty}
\lstset{defaultdialect=[R/3 6.10]ABAP,
@@ -175,7 +175,7 @@
%<+fortran-prf>\ProvidesFile{listings-fortran.prf}
%<+lua-prf>\ProvidesFile{listings-lua.prf}
%<+python-prf>\ProvidesFile{listings-python.prf}
-%<-config> [2014/09/06 1.5e listings language file]
+%<-config> [2015/06/04 1.6 listings language file]
% \end{macrocode}
%
%
@@ -279,6 +279,8 @@
% (\url{http://www.aspentech.com/products/aspen-custom-modeler.aspx}), the
% language definition was provided by \lstthanks{Stefan Pinnow}{Stefan
% Pinnow <Mo-Gul@gmx.net>}{2013/09/08}. It is intended for writing models.
+% \lsthelper{Maximilian~Dammann}{maximilian.dammann@tu-clausthal.de}
+% {2014/09/16}{missing keyword} pointed out the missing keyword ``Description''.
% \begingroup
% \begin{macrocode}
%<*lang2>
@@ -291,9 +293,9 @@
\lst@definelanguage{ACM}{
morekeywords={
abs,After,acos,And,As,asin,atan,At,Call,Compatibility,Connect,cos,cosh,%
- Create,Delay,Difference,Do,Else,ElseIf,End,EndFor,EndIf,EndParallel,%
- EndState,EndSwitch,EndText,EndWith,exp,External,Fixed,For,ForEach,Free,%
- Global,Hidden,If,Implementation,In,Initial,Input,InterSection,%
+ Create,Delay,Description,Difference,Do,Else,ElseIf,End,EndFor,EndIf,%
+ EndParallel,EndState,EndSwitch,EndText,EndWith,exp,External,Fixed,For,%
+ ForEach,Free,Global,Hidden,If,Implementation,In,Initial,Input,InterSection,%
IntegerSet,Invoke,Is,Language,Library,Link,Log10,LogE,Max,Min,Model,Of,%
Once,Options,Output,Parallel,Parameter,Pause,Port,Print,Private,%
Procedure,Product,Ramp,Repeat,Restart,Return,Round,Runs,Sigma,sin,sinh,%
@@ -311,7 +313,7 @@
%</lang2>
% \end{macrocode}
% \endgroup
-%
+%
% In addition to writing models there is a language ACMscript, which is
% similar to VBScript. According to Stefan Pinnow this language is used for
% writing scripts for the models.
@@ -336,7 +338,7 @@
% \endgroup
%
% \begingroup
-% Stefan Pinnow also supplied a definition of a style for printing ACM code:
+% Stefan Pinnow also supplied a definition of a style for printing ACM code:
% \begin{macrocode}
%<*acm-prf>
% \end{macrocode}
@@ -369,7 +371,7 @@
}%
% \end{macrocode}
% This code is provided in the file |listings-acm.prf|, see section
-% 2.4.1 (Preferences) of the \packagename{listings} documentation.
+% 2.4.1 (Preferences) of the \packagename{listings} documentation.
% \begin{macrocode}
%</acm-prf>
% \end{macrocode}
@@ -834,7 +836,7 @@ SUBX,SWAP,TAS,TRAP,TRAPV,TST,UNLK},%
%<*lang1>
% \end{macrocode}
% \lstthanks{Michael Fiedler}{post@michael-fiedler.net}{2014/09/04}
-% provided the following list of new introduced keywords for C++11.
+% provided the following list of new introduced keywords for C++11.
% \begin{macrocode}
\lst@definelanguage[11]{C++}[ISO]{C++}%
{morekeywords={alignas,alignof,char16_t,char32_t,constexpr,%
@@ -885,7 +887,7 @@ SUBX,SWAP,TAS,TRAP,TRAPV,TST,UNLK},%
% \end{macrocode}
% \begin{macrocode}
%%
-%% Objective-C definition (c) 1997 Detlev Droege
+%% Objective-C definition (c) 1997 Detlev Droege
%%
\lst@definelanguage[Objective]{C}[ANSI]{C}
{morekeywords={bycopy,id,in,inout,oneway,out,self,super,%
@@ -1024,16 +1026,19 @@ SUBX,SWAP,TAS,TRAP,TRAPV,TST,UNLK},%
%
% \subsection{Common Intermediate Language}
%
-% This langauge definition for CIL (Common Intermediate Language, part
-% of Microsoft's .NET interface) was provided by
-% \lsthelper{Olaf~Conradi}{-}{2006/08/23}.
+% This language definition for CIL (Common Intermediate Language, part of
+% Microsoft's .NET interface) was provided by
+% \lsthelper{Olaf~Conradi}{-}{2006/08/23}. \lsthelper{Akim
+% Demaille}{akim@lrde.epita.fr}{2014/07/09}{Algol broken} pointed out that
+% the support for Algol was broken, but that came from a long missing `@'
+% in the following |lst@definelanguage|.
%
% \begingroup
% \begin{macrocode}
%<*lang3>
% \end{macrocode}
% \begin{macrocode}
-\lstdefinelanguage{CIL}%
+\lst@definelanguage{CIL}%
{morekeywords=[1]{assembly,beforefieldinit,class,default,cdecl,cil,corflags,%
culture,custom,data,entrypoint,fastcall,field,file,%
hidebysig,hash,il,imagebase,locals,managed,marshall,%
@@ -1237,7 +1242,7 @@ SUBX,SWAP,TAS,TRAP,TRAPV,TST,UNLK},%
%
% \subsection{Comsol Multiphysics}
%
-% Comsol Multiphysics (Prior to version 3.2 known as Femlab) can be used
+% Comsol Multiphysics (Prior to version 3.2 known as Femlab) can be used
% standalone or as an extension to MatLab. This definition is due to
% \lstthanks{Martin~Heller}{-}{2006/05/10}.
%
@@ -1414,7 +1419,7 @@ SUBX,SWAP,TAS,TRAP,TRAPV,TST,UNLK},%
%
% \begingroup
% Jobst Hoffmann copied the definition of a style for printing Fortran code
-% to a style for printing shell programs:
+% to a style for printing shell programs:
% \begin{macrocode}
%<*bash-prf>
% \end{macrocode}
@@ -1462,7 +1467,7 @@ SUBX,SWAP,TAS,TRAP,TRAPV,TST,UNLK},%
}%
% \end{macrocode}
% This code is provided in the file |listings-bash.prf|, see section
-% 2.4.1 (Preferences) of the \packagename{listings} documentation.
+% 2.4.1 (Preferences) of the \packagename{listings} documentation.
% \begin{macrocode}
%</bash-prf>
% \end{macrocode}
@@ -1697,14 +1702,14 @@ SUBX,SWAP,TAS,TRAP,TRAPV,TST,UNLK},%
% \end{itemize}
% Another source for Fortran keywords is
% \url{http://fortranwiki.org/fortran/show/Keywords} where the keywords for
-% Fortran 2003 and 2008 are taken from.
+% Fortran 2003 and 2008 are taken from.
% \begingroup
% \begin{macrocode}
%<*lang1>
% \end{macrocode}
% The current version of Fortran (Fortran 2008) is defined by ISO/IEC
% 1539-1:2010. It contains nine new keywords, four of them consisting of
-% two words: ^^A
+% two words: ^^A
% |ERROR STOP|, |SYNC ALL|, |SYNC IMAGES|, |SYNC MEMORY|, so
% the list of keywords contains the single parts |ALL|, |ERROR|, |IMAGES|,
% |MEMORY|, and |SYNC|.
@@ -1840,7 +1845,7 @@ SUBX,SWAP,TAS,TRAP,TRAPV,TST,UNLK},%
% \endgroup
%
% \begingroup
-% Jobst Hoffmann supplied a definition of a style for printing Fortran code:
+% Jobst Hoffmann supplied a definition of a style for printing Fortran code:
% \begin{macrocode}
%<*fortran-prf>
% \end{macrocode}
@@ -1888,7 +1893,7 @@ SUBX,SWAP,TAS,TRAP,TRAPV,TST,UNLK},%
}%
% \end{macrocode}
% This code is provided in the file |listings-fortran.prf|, see section
-% 2.4.1 (Preferences) of the \packagename{listings} documentation.
+% 2.4.1 (Preferences) of the \packagename{listings} documentation.
% \begin{macrocode}
%</fortran-prf>
% \end{macrocode}
@@ -2535,12 +2540,12 @@ SUBX,SWAP,TAS,TRAP,TRAPV,TST,UNLK},%
% \end{macrocode}
% \begin{macrocode}
\lst@definelanguage{Scala}%
- {morekeywords={abstract,case,catch,class,def,%
+ {morekeywords={abstract,case,catch,class,def,%
do,else,extends,false,final,finally,%
for,if,implicit,import,lazy,match,mixin,%
- new,null,object,override,package,%
- private,protected,requires,return,sealed,%
- super,this,trait,true,try,%
+ new,null,object,override,package,%
+ private,protected,requires,return,sealed,%
+ super,this,trait,true,try,%
type,val,var,while,with,yield},%+
% otherkeywords={_,:,=,=>,<<:,<\%,>:,\#,@},%
otherkeywords={=,=>,<-,<\%,<:,>:,\#,@},%
@@ -2956,7 +2961,7 @@ SUBX,SWAP,TAS,TRAP,TRAPV,TST,UNLK},%
write-char,write-line,xdroom,xdsize,zerop},%
alsodigit=->,%
otherkeywords={1+,1-},%
- sensitive=false,%
+ sensitive=false,%
morecomment=[l];,%
morecomment=[l];;,%
morestring=[b]"%
@@ -3313,7 +3318,8 @@ SUBX,SWAP,TAS,TRAP,TRAPV,TST,UNLK},%
}[keywords,comments,strings]%
% \end{macrocode}
% \endgroup
-% Lua 5.2 also has some changed features. These are
+%
+% Lua 5.2 again has some changed features. These are
% \begingroup
% \begin{macrocode}
\lst@definelanguage[5.2]{Lua}[5.1]{Lua}{%
@@ -3395,13 +3401,73 @@ SUBX,SWAP,TAS,TRAP,TRAPV,TST,UNLK},%
moredelim=[s][keywordstyle3]{::}{::},%
}[keywords,comments,strings]%
% \end{macrocode}
+% \endgroup
+%
+% In January 2015 Lua 5.3 was released, \lstthanks{Stephan
+% Hennig}{sh2d@posteo.net}{2015/03/28} again contributed the Lua
+% keywords.
+% \begingroup
+% \begin{macrocode}
+\lst@definelanguage[5.3]{Lua}[5.2]{Lua}{%
+% \end{macrocode}
+% \begin{itemize}
+% \item some libraries are deprecated, so the following identifiers
+% are deleted
+% \begin{macrocode}
+ deletekeywords=[2]{%
+% \end{macrocode}
+% \begin{itemize}
+% \item the |bit32| library
+% \begin{macrocode}
+ bit32, bit32.arshift, bit32.band, bit32.bnot, bit32.bor,%
+ bit32.btest, bit32.bxor, bit32.extract, bit32.lrotate,%
+ bit32.lshift, bit32.replace, bit32.rrotate, bit32.rshift,%
+% \end{macrocode}
+% \item the mathematical library
+% \begin{macrocode}
+ math.atan2, math.cosh, math.frexp, math.ldexp, math.pow,%
+ math.sinh, math.tanh,%
+ },%
+% \end{macrocode}
+% \end{itemize}
+% \end{itemize}
+% Again there are some new identifiers in the standard libraries
+% \begin{macrocode}
+ morekeywords=[2]{%
+% \end{macrocode}
+% like
+% \begin{itemize}
+% \item the coroutine library
+% \begin{macrocode}
+ coroutine.isyieldable,%
+% \end{macrocode}
+% \item the mathematical library
+% \begin{macrocode}
+ math.maxinteger, math.mininteger, math.tointeger, math.type,%
+ math.ult,%
+% \end{macrocode}
+% \item the string library
+% \begin{macrocode}
+ string.pack, string.packsize, string.unpack,%
+% \end{macrocode}
+% \item the table library
+% \begin{macrocode}
+ table.move,%
+% \end{macrocode}
+% \item the utf-8 library
+% \begin{macrocode}
+ utf8, utf8.char, utf8.charpattern, utf8.codepoint, utf8.codes,%
+ utf8.len, utf8.offset,%
+ },%
+}[keywords,comments,strings]%
+% \end{macrocode}
% \begin{macrocode}
%</lang2>
% \end{macrocode}
% \endgroup
%
% \begingroup
-% Stephan Hennig also supplied a definition of a style for printing Lua code:
+% Stephan Hennig also supplied a definition of a style for printing Lua code:
% \begin{macrocode}
%<*lua-prf>
% \end{macrocode}
@@ -3419,7 +3485,7 @@ SUBX,SWAP,TAS,TRAP,TRAPV,TST,UNLK},%
}
% \end{macrocode}
% This code is provided in the file |listings-lua.prf|, see section
-% 2.4.1 (Preferences) of the \packagename{listings} documentation.
+% 2.4.1 (Preferences) of the \packagename{listings} documentation.
% \begin{macrocode}
%</lua-prf>
% \end{macrocode}
@@ -3447,7 +3513,7 @@ SUBX,SWAP,TAS,TRAP,TRAPV,TST,UNLK},%
endif,vpath,subst,patsubst,strip,findstring,filter,filter-out,%
sort,dir,notdir,suffix,basename,addsuffix,addprefix,join,word,%
words,firstword,wildcard,shell,origin,foreach,%
- @D,@F,*D,*F,\%D,\%F,<D,<F,^D,^F,+D,+F,?D,?F,%
+ @D,@F,*D,*F,\%D,\%F,<D,<F,^D,^F,+D,+F,?D,?F,%
AR,AS,CC,CXX,CO,CPP,FC,GET,LEX,PC,YACC,YACCR,MAKEINFO,TEXI2DVI,%
WEAVE,CWEAVE,TANGLE,CTANGLE,RM,M2C,LINT,COMPILE,LINK,PREPROCESS,%
CHECKOUT,%
@@ -4189,7 +4255,7 @@ SUBX,SWAP,TAS,TRAP,TRAPV,TST,UNLK},%
% \begin{macrocode}
%%
%% Miranda definition (c) 1998 Peter Bartke
-%%
+%%
%% Miranda: pure lazy functional language with polymorphic type system,
%% garbage collection and functions as first class citizens
%%
@@ -4458,7 +4524,7 @@ SUBX,SWAP,TAS,TRAP,TRAPV,TST,UNLK},%
asSequence,asBag,asSequence,asSet,append,prepend,subSequence,at,%
first,last,true,false,isQuery}%
}%
-% \end{macrocode}
+% \end{macrocode}
% Remark: "isQuery" is not real OCL, but a important attribute of the
% underlying UML model.
%
@@ -4469,13 +4535,13 @@ SUBX,SWAP,TAS,TRAP,TRAPV,TST,UNLK},%
% \begin{macrocode}
\lst@definelanguage[OMG]{OCL}%
{morekeywords={context,pre,inv,post},%
-% \end{macrocode}
+% \end{macrocode}
% Second order keywords are the operation which are defined for type
% Boolean (see pages 7-34/35 of the OMG standard) and the let-operation
% (in principle these are the infix operations):
% \begin{macrocode}
ndkeywords={or,xor,and,not,implies,if,then,else,endif},%
-% \end{macrocode}
+% \end{macrocode}
% Third order keywords are the basic data types as declared in section 7.4 of
% the OMG standard:
% \begin{macrocode}
@@ -4770,10 +4836,10 @@ SUBX,SWAP,TAS,TRAP,TRAPV,TST,UNLK},%
<?,?>,::,break,case,continue,default,do,else,%
elseif,for,foreach,if,include,require,phpinfo,%
switch,while,false,FALSE,true,TRUE,%
- %--- apache functions
+ %--- apache functions
apache_lookup_uri,apache_note,ascii2ebcdic,ebcdic2ascii,%
virtual,apache_child_terminate,apache_setenv,%
- %--- array functions
+ %--- array functions
array,array_change_key_case,array_chunk,array_count_values,%
array_filter,array_flip,array_fill,array_intersect,%
array_keys,array_map,array_merge,array_merge_recursive,%
@@ -4783,29 +4849,29 @@ SUBX,SWAP,TAS,TRAP,TRAPV,TST,UNLK},%
extract,in_array,array_search,key,krsort,ksort,list,natsort,%
next,pos,prev,range,reset,rsort,shuffle,sizeof,sort,uasort,%
usort,%
- %--- aspell functions
+ %--- aspell functions
aspell_new,aspell_check,aspell_check_raw,aspell_suggest,%
- %--- bc functions
+ %--- bc functions
bcadd,bccomp,bcdiv,bcmod,bcmul,bcpow,bcscale,bcsqrt,bcsub,%
- %--- bzip2 functions
+ %--- bzip2 functions
bzclose,bzcompress,bzdecompress,bzerrno,bzerror,bzerrstr,%
bzopen,bzread,bzwrite,%
- %--- calendar functions
+ %--- calendar functions
JDToGregorian,GregorianToJD,JDToJulian,JulianToJD,JDToJewish,%
JDToFrench,FrenchToJD,JDMonthName,JDDayOfWeek,easter_date,%
unixtojd,jdtounix,cal_days_in_month,cal_to_jd,cal_from_jd,%
- %--- ccvs functions
+ %--- ccvs functions
ccvs_init,ccvs_done,ccvs_new,ccvs_add,ccvs_delete,ccvs_auth,%
ccvs_reverse,ccvs_sale,ccvs_void,ccvs_status,ccvs_count,%
ccvs_report,ccvs_command,ccvs_textvalue,%
- %--- classobj functions
+ %--- classobj functions
call_user_method,call_user_method_array,class_exists,get_class,%
get_class_vars,get_declared_classes,get_object_vars,%
is_a,is_subclass_of,method_exists,%
- %--- com functions
+ %--- com functions
COM,VARIANT,com_load,com_invoke,com_propget,com_get,com_propput,%
com_set,com_addref,com_release,com_isenum,com_load_typelib,%
- %--- cpdf functions
+ %--- cpdf functions
cpdf_add_annotation,cpdf_add_outline,cpdf_arc,cpdf_begin_text,%
cpdf_clip,cpdf_close,cpdf_closepath,cpdf_closepath_fill_stroke,%
cpdf_continue_text,cpdf_curveto,cpdf_end_text,cpdf_fill,%
@@ -4823,49 +4889,49 @@ SUBX,SWAP,TAS,TRAP,TRAPV,TST,UNLK},%
cpdf_show_xy,cpdf_stringwidth,cpdf_set_font_directories,%
cpdf_set_viewer_preferences,cpdf_stroke,cpdf_text,%
cpdf_set_action_url,%
- %--- crack functions
+ %--- crack functions
crack_opendict,crack_closedict,crack_check,crack_getlastmessage,%
- %--- ctype functions
+ %--- ctype functions
ctype_alnum,ctype_alpha,ctype_cntrl,ctype_digit,ctype_lower,%
ctype_print,ctype_punct,ctype_space,ctype_upper,ctype_xdigit,%
- %--- curl functions
+ %--- curl functions
curl_init,curl_setopt,curl_exec,curl_close,curl_version,%
curl_error,curl_getinfo,%
- %--- cybercash functions
+ %--- cybercash functions
cybercash_encr,cybercash_decr,cybercash_base64_encode,%
- %--- cybermut functions
+ %--- cybermut functions
cybermut_creerformulairecm,cybermut_testmac,%
- %--- cyrus functions
+ %--- cyrus functions
cyrus_connect,cyrus_authenticate,cyrus_bind,cyrus_unbind,%
cyrus_close,%
- %--- datetime functions
+ %--- datetime functions
checkdate,date,getdate,gettimeofday,gmdate,gmmktime,gmstrftime,%
microtime,mktime,strftime,time,strtotime,%
- %--- dbase functions
+ %--- dbase functions
dbase_create,dbase_open,dbase_close,dbase_pack,dbase_add_record,%
dbase_delete_record,dbase_get_record,%
dbase_numfields,dbase_numrecords,%
- %--- dba functions
+ %--- dba functions
dba_close,dba_delete,dba_exists,dba_fetch,dba_firstkey,%
dba_nextkey,dba_popen,dba_open,dba_optimize,dba_replace,%
- %--- dbm functions
+ %--- dbm functions
dbmopen,dbmclose,dbmexists,dbmfetch,dbminsert,dbmreplace,%
dbmfirstkey,dbmnextkey,dblist,%
- %--- dbx functions
+ %--- dbx functions
dbx_close,dbx_connect,dbx_error,dbx_query,dbx_sort,dbx_compare,%
- %--- dio functions
+ %--- dio functions
dio_open,dio_read,dio_write,dio_truncate,dio_stat,dio_seek,%
dio_close,%
- %--- dir functions
+ %--- dir functions
chroot,chdir,dir,closedir,getcwd,opendir,readdir,rewinddir,%
- %--- dotnet functions
+ %--- dotnet functions
dotnet_load,%
- %--- errorfunc functions
+ %--- errorfunc functions
error_log,error_reporting,restore_error_handler,%
trigger_error,user_error,%
- %--- exec functions
+ %--- exec functions
escapeshellarg,escapeshellcmd,exec,passthru,system,shell_exec,%
- %--- fbsql functions
+ %--- fbsql functions
fbsql_affected_rows,fbsql_autocommit,fbsql_change_user,%
fbsql_commit,fbsql_connect,fbsql_create_db,fbsql_create_blob,%
fbsql_database_password,fbsql_data_seek,fbsql_db_query,%
@@ -4879,15 +4945,15 @@ SUBX,SWAP,TAS,TRAP,TRAPV,TST,UNLK},%
fbsql_start_db,fbsql_stop_db,fbsql_tablename,fbsql_warnings,%
fbsql_get_autostart_info,fbsql_hostname,fbsql_password,%
fbsql_username,%
- %--- fdf functions
+ %--- fdf functions
fdf_open,fdf_close,fdf_create,fdf_save,fdf_get_value,%
fdf_next_field_name,fdf_set_ap,fdf_set_status,fdf_get_status,%
fdf_get_file,fdf_set_flags,fdf_set_opt,%
fdf_set_javascript_action,fdf_set_encoding,fdf_add_template,%
- %--- filepro functions
+ %--- filepro functions
filepro,filepro_fieldname,filepro_fieldtype,filepro_fieldwidth,%
filepro_fieldcount,filepro_rowcount,%
- %--- filesystem functions
+ %--- filesystem functions
basename,chgrp,chmod,chown,clearstatcache,copy,delete,dirname,%
diskfreespace,disk_total_space,fclose,feof,fflush,fgetc,fgetcsv,%
fgetss,file_get_contents,file,file_exists,fileatime,filectime,%
@@ -4897,30 +4963,30 @@ SUBX,SWAP,TAS,TRAP,TRAPV,TST,UNLK},%
is_writable,is_writeable,is_uploaded_file,link,linkinfo,mkdir,%
parse_ini_file,pathinfo,pclose,popen,readfile,readlink,rename,%
rmdir,stat,lstat,realpath,symlink,tempnam,tmpfile,touch,umask,%
- %--- fribidi functions
+ %--- fribidi functions
fribidi_log2vis,%
- %--- ftp functions
+ %--- ftp functions
ftp_connect,ftp_login,ftp_pwd,ftp_cdup,ftp_chdir,ftp_mkdir,%
ftp_nlist,ftp_rawlist,ftp_systype,ftp_pasv,ftp_get,ftp_fget,%
ftp_fput,ftp_size,ftp_mdtm,ftp_rename,ftp_delete,ftp_site,%
ftp_quit,ftp_exec,ftp_set_option,ftp_get_option,%
- %--- funchand functions
+ %--- funchand functions
call_user_func_array,call_user_func,create_function,%
func_get_args,func_num_args,function_exists,%
register_shutdown_function,register_tick_function,%
- %--- gettext functions
+ %--- gettext functions
bindtextdomain,bind_textdomain_codeset,dcgettext,dcngettext,%
dngettext,gettext,ngettext,textdomain,%
- %--- gmp functions
+ %--- gmp functions
gmp_init,gmp_intval,gmp_strval,gmp_add,gmp_sub,gmp_mul,%
gmp_div_r,gmp_div_qr,gmp_div,gmp_mod,gmp_divexact,gmp_cmp,%
gmp_com,gmp_abs,gmp_sign,gmp_fact,gmp_sqrt,gmp_sqrtrm,%
gmp_pow,gmp_powm,gmp_prob_prime,gmp_gcd,gmp_gcdext,gmp_invert,%
gmp_jacobi,gmp_random,gmp_and,gmp_or,gmp_xor,gmp_setbit,%
gmp_scan0,gmp_scan1,gmp_popcount,gmp_hamdist,%
- %--- http functions
+ %--- http functions
header,headers_sent,setcookie,%
- %--- hw functions
+ %--- hw functions
hw_Array2Objrec,hw_Children,hw_ChildrenObj,hw_Close,hw_Connect,%
hw_Deleteobject,hw_DocByAnchor,hw_DocByAnchorObj,%
hw_Document_BodyTag,hw_Document_Content,hw_Document_SetContent,%
@@ -4934,20 +5000,20 @@ SUBX,SWAP,TAS,TRAP,TRAPV,TST,UNLK},%
hw_Output_Document,hw_pConnect,hw_PipeDocument,hw_Root,%
hw_Who,hw_getusername,hw_stat,hw_setlinkroot,hw_connection_info,%
hw_insertanchors,hw_getrellink,hw_changeobject,%
- %--- ibase functions
+ %--- ibase functions
ibase_connect,ibase_pconnect,ibase_close,ibase_query,%
ibase_fetch_row,ibase_fetch_object,ibase_field_info,%
ibase_free_result,ibase_prepare,ibase_execute,ibase_trans,%
ibase_rollback,ibase_timefmt,ibase_num_fields,ibase_blob_add,%
ibase_blob_close,ibase_blob_create,ibase_blob_echo,%
ibase_blob_import,ibase_blob_info,ibase_blob_open,%
- %--- icap functions
+ %--- icap functions
icap_open,icap_close,icap_fetch_event,icap_list_events,%
icap_delete_event,icap_snooze,icap_list_alarms,%
icap_rename_calendar,icap_delete_calendar,icap_reopen,%
- %--- iconv functions
+ %--- iconv functions
iconv,iconv_get_encoding,iconv_set_encoding,ob_iconv_handler,%
- %--- ifx functions
+ %--- ifx functions
ifx_connect,ifx_pconnect,ifx_close,ifx_query,ifx_prepare,ifx_do,%
ifx_errormsg,ifx_affected_rows,ifx_getsqlca,ifx_fetch_row,%
ifx_fieldtypes,ifx_fieldproperties,ifx_num_fields,ifx_num_rows,%
@@ -4956,12 +5022,12 @@ SUBX,SWAP,TAS,TRAP,TRAPV,TST,UNLK},%
ifx_textasvarchar,ifx_byteasvarchar,ifx_nullformat,%
ifxus_free_slob,ifxus_close_slob,ifxus_open_slob,%
ifxus_seek_slob,ifxus_read_slob,ifxus_write_slob,%
- %--- iisfunc functions
+ %--- iisfunc functions
iis_get_server_by_path,iis_get_server_by_comment,iis_add_server,%
iis_set_dir_security,iis_get_dir_security,iis_set_server_rights,%
iis_set_script_map,iis_get_script_map,iis_set_app_settings,%
iis_stop_server,iis_stop_service,iis_start_service,%
- %--- image functions
+ %--- image functions
exif_imagetype,exif_read_data,exif_thumbnail,getimagesize,%
imagealphablending,imagearc,imagefilledarc,imageellipse,%
imagechar,imagecharup,imagecolorallocate,imagecolordeallocate,%
@@ -4981,7 +5047,7 @@ SUBX,SWAP,TAS,TRAP,TRAPV,TST,UNLK},%
imagesetstyle,imagesettile,imagesetthickness,imagestring,%
imagesx,imagesy,imagettfbbox,imageftbbox,imagettftext,%
imagetypes,jpeg2wbmp,png2wbmp,iptcembed,read_exif_data,%
- %--- imap functions
+ %--- imap functions
imap_8bit,imap_alerts,imap_append,imap_base64,imap_binary,%
imap_bodystruct,imap_check,imap_clearflag_full,imap_close,%
imap_delete,imap_deletemailbox,imap_errors,imap_expunge,%
@@ -4995,7 +5061,7 @@ SUBX,SWAP,TAS,TRAP,TRAPV,TST,UNLK},%
imap_search,imap_setacl,imap_set_quota,imap_setflag_full,%
imap_status,imap_subscribe,imap_uid,imap_undelete,%
imap_utf7_decode,imap_utf7_encode,imap_utf8,imap_thread,%
- %--- info functions
+ %--- info functions
assert,assert_options,extension_loaded,dl,getenv,get_cfg_var,%
get_defined_constants,get_extension_funcs,getmygid,%
get_loaded_extensions,get_magic_quotes_gpc,%
@@ -5003,16 +5069,16 @@ SUBX,SWAP,TAS,TRAP,TRAPV,TST,UNLK},%
ini_alter,ini_get,ini_get_all,ini_restore,ini_set,phpcredits,%
phpversion,php_logo_guid,php_sapi_name,php_uname,putenv,%
set_time_limit,version_compare,zend_logo_guid,zend_version,%
- %--- ircg functions
+ %--- ircg functions
ircg_pconnect,ircg_fetch_error_msg,ircg_set_current,ircg_join,%
ircg_msg,ircg_notice,ircg_nick,ircg_topic,ircg_channel_mode,%
ircg_whois,ircg_kick,ircg_ignore_add,ircg_ignore_del,%
ircg_is_conn_alive,ircg_lookup_format_messages,%
ircg_set_on_die,ircg_set_file,ircg_get_username,%
ircg_nickname_unescape,%
- %--- java functions
+ %--- java functions
java_last_exception_clear,java_last_exception_get,%
- %--- ldap functions
+ %--- ldap functions
ldap_add,ldap_bind,ldap_close,ldap_compare,ldap_connect,%
ldap_delete,ldap_dn2ufn,ldap_err2str,ldap_errno,ldap_error,%
ldap_first_attribute,ldap_first_entry,ldap_free_result,%
@@ -5022,15 +5088,15 @@ SUBX,SWAP,TAS,TRAP,TRAPV,TST,UNLK},%
ldap_set_option,ldap_unbind,ldap_8859_to_t61,%
ldap_next_reference,ldap_parse_reference,ldap_parse_result,%
ldap_sort,ldap_start_tls,ldap_t61_to_8859,%
- %--- mail functions
+ %--- mail functions
mail,ezmlm_hash,%
- %--- math functions
+ %--- math functions
abs,acos,acosh,asin,asinh,atan,atanh,atan2,base_convert,bindec,%
cos,cosh,decbin,dechex,decoct,deg2rad,exp,expm1,floor,%
hexdec,hypot,is_finite,is_infinite,is_nan,lcg_value,log,log10,%
max,min,mt_rand,mt_srand,mt_getrandmax,number_format,octdec,pi,%
rad2deg,rand,round,sin,sinh,sqrt,srand,tan,tanh,%
- %--- mbstring functions
+ %--- mbstring functions
mb_language,mb_parse_str,mb_internal_encoding,mb_http_input,%
mb_detect_order,mb_substitute_character,mb_output_handler,%
mb_strlen,mb_strpos,mb_strrpos,mb_substr,mb_strcut,mb_strwidth,%
@@ -5040,7 +5106,7 @@ SUBX,SWAP,TAS,TRAP,TRAPV,TST,UNLK},%
mb_ereg,mb_eregi,mb_ereg_replace,mb_eregi_replace,mb_split,%
mb_ereg_search,mb_ereg_search_pos,mb_ereg_search_regs,%
mb_ereg_search_getregs,mb_ereg_search_getpos,%
- %--- mcal functions
+ %--- mcal functions
mcal_open,mcal_popen,mcal_reopen,mcal_close,%
mcal_rename_calendar,mcal_delete_calendar,mcal_fetch_event,%
mcal_append_event,mcal_store_event,mcal_delete_event,%
@@ -5052,7 +5118,7 @@ SUBX,SWAP,TAS,TRAP,TRAPV,TST,UNLK},%
mcal_event_set_recur_daily,mcal_event_set_recur_weekly,%
mcal_event_set_recur_monthly_wday,mcal_event_set_recur_yearly,%
mcal_event_add_attribute,mcal_expunge,mcal_week_of_year,%
- %--- mcrypt functions
+ %--- mcrypt functions
mcrypt_get_cipher_name,mcrypt_get_block_size,%
mcrypt_create_iv,mcrypt_cbc,mcrypt_cfb,mcrypt_ecb,mcrypt_ofb,%
mcrypt_list_modes,mcrypt_get_iv_size,mcrypt_encrypt,%
@@ -5064,26 +5130,26 @@ SUBX,SWAP,TAS,TRAP,TRAPV,TST,UNLK},%
mcrypt_enc_get_modes_name,mcrypt_module_self_test,%
mcrypt_module_is_block_algorithm,mcrypt_module_is_block_mode,%
mcrypt_module_get_algo_key_size,%
- %--- mhash functions
+ %--- mhash functions
mhash_get_hash_name,mhash_get_block_size,mhash_count,mhash,%
- %--- misc functions
+ %--- misc functions
connection_aborted,connection_status,connection_timeout,%
define,defined,die,eval,exit,get_browser,highlight_file,%
ignore_user_abort,iptcparse,leak,pack,show_source,sleep,uniqid,%
usleep,%
- %--- mnogosearch functions
+ %--- mnogosearch functions
udm_add_search_limit,udm_alloc_agent,udm_api_version,%
udm_cat_list,udm_clear_search_limits,udm_errno,udm_error,%
udm_free_agent,udm_free_ispell_data,udm_free_res,%
udm_get_res_field,udm_get_res_param,udm_load_ispell_data,%
udm_check_charset,udm_check_stored,udm_close_stored,udm_crc32,%
- %--- msession functions
+ %--- msession functions
msession_connect,msession_disconnect,msession_count,%
msession_destroy,msession_lock,msession_unlock,msession_set,%
msession_uniq,msession_randstr,msession_find,msession_list,%
msession_set_array,msession_listvar,msession_timeout,%
msession_getdata,msession_setdata,msession_plugin,%
- %--- msql functions
+ %--- msql functions
msql,msql_affected_rows,msql_close,msql_connect,msql_create_db,%
msql_data_seek,msql_dbname,msql_drop_db,msql_dropdb,msql_error,%
msql_fetch_field,msql_fetch_object,msql_fetch_row,%
@@ -5092,7 +5158,7 @@ SUBX,SWAP,TAS,TRAP,TRAPV,TST,UNLK},%
msql_list_dbs,msql_listdbs,msql_list_tables,msql_listtables,%
msql_num_rows,msql_numfields,msql_numrows,msql_pconnect,%
msql_regcase,msql_result,msql_select_db,msql_selectdb,%
- %--- mssql functions
+ %--- mssql functions
mssql_close,mssql_connect,mssql_data_seek,mssql_fetch_array,%
mssql_fetch_object,mssql_fetch_row,mssql_field_length,%
mssql_field_seek,mssql_field_type,mssql_free_result,%
@@ -5100,9 +5166,9 @@ SUBX,SWAP,TAS,TRAP,TRAPV,TST,UNLK},%
mssql_num_fields,mssql_num_rows,mssql_pconnect,mssql_query,%
mssql_select_db,mssql_bind,mssql_execute,mssql_fetch_assoc,%
mssql_guid_string,mssql_init,mssql_rows_affected,%
- %--- muscat functions
+ %--- muscat functions
muscat_setup,muscat_setup_net,muscat_give,muscat_get,%
- %--- mysql functions
+ %--- mysql functions
mysql_affected_rows,mysql_change_user,mysql_character_set_name,%
mysql_connect,mysql_create_db,mysql_data_seek,mysql_db_name,%
mysql_drop_db,mysql_errno,mysql_error,mysql_escape_string,%
@@ -5114,16 +5180,16 @@ SUBX,SWAP,TAS,TRAP,TRAPV,TST,UNLK},%
mysql_ping,mysql_query,mysql_unbuffered_query,%
mysql_result,mysql_select_db,mysql_tablename,mysql_thread_id,%
mysql_get_host_info,mysql_get_proto_info,mysql_get_server_info,%
- %--- network functions
+ %--- network functions
checkdnsrr,closelog,debugger_off,debugger_on,%
fsockopen,gethostbyaddr,gethostbyname,gethostbynamel,getmxrr,%
getprotobynumber,getservbyname,getservbyport,ip2long,long2ip,%
pfsockopen,socket_get_status,socket_set_blocking,%
syslog,%
- %--- nis functions
+ %--- nis functions
yp_get_default_domain,yp_order,yp_master,yp_match,yp_first,%
yp_errno,yp_err_string,yp_all,yp_cat,%
- %--- oci8 functions
+ %--- oci8 functions
OCIDefineByName,OCIBindByName,OCILogon,OCIPLogon,OCINLogon,%
OCIExecute,OCICommit,OCIRollback,OCINewDescriptor,OCIRowCount,%
OCIResult,OCIFetch,OCIFetchInto,OCIFetchStatement,%
@@ -5134,28 +5200,28 @@ SUBX,SWAP,TAS,TRAP,TRAPV,TST,UNLK},%
OCIColumnTypeRaw,OCINewCollection,OCIFreeCollection,%
OCICollAppend,OCICollAssignElem,OCICollGetElem,OCICollMax,%
OCICollTrim,%
- %--- oracle functions
+ %--- oracle functions
Ora_Bind,Ora_Close,Ora_ColumnName,Ora_ColumnSize,Ora_ColumnType,%
Ora_CommitOff,Ora_CommitOn,Ora_Do,Ora_Error,Ora_ErrorCode,%
Ora_Fetch,Ora_Fetch_Into,Ora_GetColumn,Ora_Logoff,Ora_Logon,%
Ora_Numcols,Ora_Numrows,Ora_Open,Ora_Parse,Ora_Rollback,%
- %--- outcontrol functions
+ %--- outcontrol functions
flush,ob_start,ob_get_contents,ob_get_length,ob_get_level,%
ob_flush,ob_clean,ob_end_flush,ob_end_clean,ob_implicit_flush,%
- %--- ovrimos functions
+ %--- ovrimos functions
ovrimos_connect,ovrimos_close,ovrimos_longreadlen,%
ovrimos_execute,ovrimos_cursor,ovrimos_exec,ovrimos_fetch_into,%
ovrimos_result,ovrimos_result_all,ovrimos_num_rows,%
ovrimos_field_name,ovrimos_field_type,ovrimos_field_len,%
ovrimos_free_result,ovrimos_commit,ovrimos_rollback,%
- %--- pcntl functions
+ %--- pcntl functions
pcntl_fork,pcntl_signal,pcntl_waitpid,pcntl_wexitstatus,%
pcntl_wifsignaled,pcntl_wifstopped,pcntl_wstopsig,%
pcntl_exec,%
- %--- pcre functions
+ %--- pcre functions
preg_match,preg_match_all,preg_replace,preg_replace_callback,%
preg_quote,preg_grep,Pattern Modifiers,Pattern Syntax,%
- %--- pdf functions
+ %--- pdf functions
pdf_add_annotation,pdf_add_bookmark,pdf_add_launchlink,%
pdf_add_note,pdf_add_outline,pdf_add_pdflink,pdf_add_thumbnail,%
pdf_arc,pdf_arcn,pdf_attach_file,pdf_begin_page,%
@@ -5181,9 +5247,9 @@ SUBX,SWAP,TAS,TRAP,TRAPV,TST,UNLK},%
pdf_set_text_rendering,pdf_set_text_rise,pdf_set_text_matrix,%
pdf_set_word_spacing,pdf_show,pdf_show_boxed,pdf_show_xy,%
pdf_stringwidth,pdf_stroke,pdf_translate,%
- %--- pfpro functions
+ %--- pfpro functions
pfpro_init,pfpro_cleanup,pfpro_process,pfpro_process_raw,%
- %--- pgsql functions
+ %--- pgsql functions
pg_close,pg_affected_rows,pg_connect,pg_dbname,pg_end_copy,%
pg_query,pg_fetch_array,pg_fetch_object,pg_fetch_row,%
pg_field_name,pg_field_num,pg_field_prtlen,pg_field_size,%
@@ -5195,14 +5261,14 @@ SUBX,SWAP,TAS,TRAP,TRAPV,TST,UNLK},%
pg_send_query,pg_cancel_query,pg_connection_busy,%
pg_connection_status,pg_copy_from,pg_copy_to,pg_escape_bytea,%
pg_result_error,%
- %--- posix functions
+ %--- posix functions
posix_kill,posix_getpid,posix_getppid,posix_getuid,%
posix_getgid,posix_getegid,posix_setuid,posix_seteuid,%
posix_setegid,posix_getgroups,posix_getlogin,posix_getpgrp,%
posix_setpgid,posix_getpgid,posix_getsid,posix_uname,%
posix_ctermid,posix_ttyname,posix_isatty,posix_getcwd,%
posix_getgrnam,posix_getgrgid,posix_getpwnam,posix_getpwuid,%
- %--- printer functions
+ %--- printer functions
printer_open,printer_abort,printer_close,printer_write,%
printer_set_option,printer_get_option,printer_create_dc,%
printer_start_doc,printer_end_doc,printer_start_page,%
@@ -5211,42 +5277,42 @@ SUBX,SWAP,TAS,TRAP,TRAPV,TST,UNLK},%
printer_select_font,printer_logical_fontheight,%
printer_draw_rectangle,printer_draw_elipse,printer_draw_text,%
printer_draw_chord,printer_draw_pie,printer_draw_bmp,%
- %--- pspell functions
+ %--- pspell functions
pspell_add_to_personal,pspell_add_to_session,pspell_check,%
pspell_config_create,pspell_config_ignore,pspell_config_mode,%
pspell_config_repl,pspell_config_runtogether,%
pspell_new,pspell_new_config,pspell_new_personal,%
pspell_store_replacement,pspell_suggest,%
- %--- qtdom functions
+ %--- qtdom functions
qdom_tree,qdom_error,%
- %--- readline functions
+ %--- readline functions
readline,readline_add_history,readline_clear_history,%
readline_info,readline_list_history,readline_read_history,%
- %--- recode functions
+ %--- recode functions
recode_string,recode,recode_file,%
- %--- regex functions
+ %--- regex functions
ereg,ereg_replace,eregi,eregi_replace,split,spliti,sql_regcase,%
- %--- sem functions
+ %--- sem functions
sem_get,sem_acquire,sem_release,sem_remove,shm_attach,%
shm_remove,shm_put_var,shm_get_var,shm_remove_var,ftok,%
- %--- sesam functions
+ %--- sesam functions
sesam_connect,sesam_disconnect,sesam_settransaction,%
sesam_rollback,sesam_execimm,sesam_query,sesam_num_fields,%
sesam_diagnostic,sesam_fetch_result,sesam_affected_rows,%
sesam_field_array,sesam_fetch_row,sesam_fetch_array,%
sesam_free_result,%
- %--- session functions
+ %--- session functions
session_start,session_destroy,session_name,session_module_name,%
session_id,session_register,session_unregister,session_unset,%
session_get_cookie_params,session_set_cookie_params,%
session_encode,session_set_save_handler,session_cache_limiter,%
session_write_close,%
- %--- shmop functions
+ %--- shmop functions
shmop_open,shmop_read,shmop_write,shmop_size,shmop_delete,%
- %--- snmp functions
+ %--- snmp functions
snmpget,snmpset,snmpwalk,snmpwalkoid,snmp_get_quick_print,%
snmprealwalk,%
- %--- strings functions
+ %--- strings functions
addcslashes,addslashes,bin2hex,chop,chr,chunk_split,%
count_chars,crc32,crypt,echo,explode,get_html_translation_table,%
hebrev,hebrevc,htmlentities,htmlspecialchars,implode,join,%
@@ -5258,7 +5324,7 @@ SUBX,SWAP,TAS,TRAP,TRAPV,TST,UNLK},%
strrev,strrpos,strspn,strstr,strtok,strtolower,strtoupper,%
strtr,substr,substr_count,substr_replace,trim,ucfirst,ucwords,%
vsprintf,wordwrap,%
- %--- swf functions
+ %--- swf functions
swf_openfile,swf_closefile,swf_labelframe,swf_showframe,%
swf_getframe,swf_mulcolor,swf_addcolor,swf_placeobject,%
swf_removeobject,swf_nextid,swf_startdoaction,%
@@ -5274,14 +5340,14 @@ SUBX,SWAP,TAS,TRAP,TRAPV,TST,UNLK},%
swf_startbutton,swf_addbuttonrecord,swf_oncondition,%
swf_viewport,swf_ortho,swf_ortho2,swf_perspective,swf_polarview,%
swf_pushmatrix,swf_popmatrix,swf_scale,swf_translate,swf_rotate,%
- %--- sybase functions
+ %--- sybase functions
sybase_affected_rows,sybase_close,sybase_connect,%
sybase_fetch_array,sybase_fetch_field,sybase_fetch_object,%
sybase_field_seek,sybase_free_result,sybase_get_last_message,%
sybase_min_error_severity,sybase_min_message_severity,%
sybase_num_fields,sybase_num_rows,sybase_pconnect,sybase_query,%
sybase_select_db,%
- %--- uodbc functions
+ %--- uodbc functions
odbc_autocommit,odbc_binmode,odbc_close,odbc_close_all,%
odbc_connect,odbc_cursor,odbc_do,odbc_error,odbc_errormsg,%
odbc_execute,odbc_fetch_into,odbc_fetch_row,odbc_fetch_array,%
@@ -5292,28 +5358,28 @@ SUBX,SWAP,TAS,TRAP,TRAPV,TST,UNLK},%
odbc_tableprivileges,odbc_columns,odbc_columnprivileges,%
odbc_primarykeys,odbc_foreignkeys,odbc_procedures,%
odbc_specialcolumns,odbc_statistics,%
- %--- url functions
+ %--- url functions
base64_decode,base64_encode,parse_url,rawurldecode,rawurlencode,%
urlencode,%
- %--- var functions
+ %--- var functions
doubleval,empty,floatval,gettype,get_defined_vars,%
import_request_variables,intval,is_array,is_bool,is_double,%
is_int,is_integer,is_long,is_null,is_numeric,is_object,is_real,%
is_scalar,is_string,isset,print_r,serialize,settype,strval,%
unset,var_dump,var_export,is_callable,%
- %--- vpopmail functions
+ %--- vpopmail functions
vpopmail_add_domain,vpopmail_del_domain,%
vpopmail_add_domain_ex,vpopmail_del_domain_ex,%
vpopmail_add_user,vpopmail_del_user,vpopmail_passwd,%
vpopmail_auth_user,vpopmail_alias_add,vpopmail_alias_del,%
vpopmail_alias_get,vpopmail_alias_get_all,vpopmail_error,%
- %--- w32api functions
+ %--- w32api functions
w32api_set_call_method,w32api_register_function,%
w32api_deftype,w32api_init_dtype,%
- %--- wddx functions
+ %--- wddx functions
wddx_serialize_value,wddx_serialize_vars,wddx_packet_start,%
wddx_add_vars,wddx_deserialize,%
- %--- xml functions
+ %--- xml functions
xml_parser_create,xml_set_object,xml_set_element_handler,%
xml_set_processing_instruction_handler,xml_set_default_handler,%
xml_set_notation_decl_handler,%
@@ -5322,20 +5388,20 @@ SUBX,SWAP,TAS,TRAP,TRAPV,TST,UNLK},%
xml_parser_free,xml_parser_set_option,xml_parser_get_option,%
utf8_encode,xml_parser_create_ns,%
xml_set_start_namespace_decl_handler,%
- %--- xslt functions
+ %--- xslt functions
xslt_set_log,xslt_create,xslt_errno,xslt_error,xslt_free,%
xslt_set_sax_handler,xslt_set_scheme_handler,%
xslt_set_base,xslt_set_encoding,xslt_set_sax_handlers,%
- %--- yaz functions
+ %--- yaz functions
yaz_addinfo,yaz_close,yaz_connect,yaz_errno,yaz_error,yaz_hits,%
yaz_database,yaz_range,yaz_record,yaz_search,yaz_present,%
yaz_scan,yaz_scan_result,yaz_ccl_conf,yaz_ccl_parse,%
yaz_wait,yaz_sort,%
- %--- zip functions
+ %--- zip functions
zip_close,zip_entry_close,zip_entry_compressedsize,%
zip_entry_filesize,zip_entry_name,zip_entry_open,zip_entry_read,%
zip_read,%
- %--- zlib functions
+ %--- zlib functions
gzclose,gzeof,gzfile,gzgetc,gzgets,gzgetss,gzopen,gzpassthru,%
gzread,gzrewind,gzseek,gztell,gzwrite,readgzfile,gzcompress,%
gzdeflate,gzinflate,gzencode,},%
@@ -5701,7 +5767,7 @@ SUBX,SWAP,TAS,TRAP,TRAPV,TST,UNLK},%
%
% \subsection{PSTricks}
%
-% PSTricks is a \TeX\ macro package bundle.
+% PSTricks is a \TeX\ macro package bundle.
% \lstthanks{Herbert~Voss}{}{2004/09/17} provided the following definition.
%
% \begingroup
@@ -5883,15 +5949,19 @@ SUBX,SWAP,TAS,TRAP,TRAPV,TST,UNLK},%
intern},
sensitive=true,%
morecomment=[l]\#,%
- morestring=[b]',%
- morestring=[b]",%
+ morestring=[b]',%
+ morestring=[b]",%
% \end{macrocode}
% According to PEP (Python Enhancement Proposals) comment should be
% distinguished from documentation strings, so we define
% \begin{macrocode}
- morestring=[s]{'''}{'''},% used for documentation text (mulitiline strings)
- morestring=[s]{"""}{"""},% added by Philipp Matthias Hahn
+ morecomment=[s]{'''}{'''},% used for documentation text (mulitiline strings)
+ morecomment=[s]{"""}{"""},% added by Philipp Matthias Hahn
% \end{macrocode}
+% \lsthelper{J\"urgen Dietel}{j.dietel@rz.rwth-aachen}{2015/05/05}{} provided
+% an example with a wrong representation of documentation strings, so the
+% two lines above got changed from |morestring| $\rightarrow$ |morecomment|.
+%
% Python now supports so called \emph{raw strings} and also Unicode
% strings. Here is the definition of these strings:
% \begin{macrocode}
@@ -5921,7 +5991,7 @@ SUBX,SWAP,TAS,TRAP,TRAPV,TST,UNLK},%
% \begingroup
% Alexis Dimitriadis also proposes the following configuration for printing
% Python code which simulates colorizing the code as it's done by the IDLE
-% GUI:
+% GUI:
% \begin{macrocode}
%<*python-prf>
% \end{macrocode}
@@ -5944,7 +6014,7 @@ SUBX,SWAP,TAS,TRAP,TRAPV,TST,UNLK},%
%\definecolor{red2}{RGB}{221,0,0}
% Except for green and purple, the other colors are pretty good in standard
-% hue
+% hue
\lstdefinestyle{python-idle-code}{%
language=Python, % the language
basicstyle=\normalsize\ttfamily, % size of the fonts for the code
@@ -5956,10 +6026,10 @@ SUBX,SWAP,TAS,TRAP,TRAPV,TST,UNLK},%
upquote=true, % requires textcomp
}
% Unimplemented IDLE syntax: function/class names being defined should be
-% blue
+% blue
% \end{macrocode}
% This code is provided in the file |listings-python.prf|, see section
-% 2.4.1 (Preferences) of the \packagename{listings} documentation.
+% 2.4.1 (Preferences) of the \packagename{listings} documentation.
% \begin{macrocode}
%</python-prf>
% \end{macrocode}
@@ -6423,7 +6493,7 @@ literate=%
\lst@definelanguage{SHELXL}%
{morekeywords={TITL,CELL,ZERR,LATT,SYMM,SFAC,DISP,UNIT,LAUE,%
REM,MORE,TIME,END,HKLF,OMIT,SHEL,BASF,TWIN,EXTI,SWAT,%
- MERG,SPEC,RESI,MOVE,ANIS,AFIX,HFIX,FRAG,FEND,EXYZ,EADP,%
+ MERG,SPEC,RESI,MOVE,ANIS,AFIX,HFIX,FRAG,FEND,EXYZ,EADP,%
EQIV,OMIT,CONN,PART,BIND,FREE,DFIX,BUMP,SAME,SADI,CHIV,%
FLAT,DELU,SIMU,DEFS,ISOR,SUMP,L.S.,CGLS,SLIM,BLOC,DAMP,%
WGHT,FVAR,BOND,CONF,MPLA,RTAB,LIST,ACTA,SIZE,TEMP,WPDB,%
@@ -7016,7 +7086,7 @@ literate=%
% \end{macrocode}
% \lsthelper{Herbert Voss}{Herbert.Voss@FU-Berlin.DE}{2013-12-12}{typo} pointed
% to a typo: the \TeX{} primitive is |lineskiplimit| instead of
-% |lineskiplimits|.
+% |lineskiplimits|.
% \begin{macrocode}
\lst@definelanguage[primitive]{TeX}%
{moretexcs={above,abovedisplayshortskip,abovedisplayskip,aftergroup,%
@@ -7197,7 +7267,7 @@ literate=%
morecomment=[s]{/*}{*/},%
morecomment=[l]//,% nonstandard
morestring=[b]"%
- }[keywords,comments,strings]%
+ }[keywords,comments,strings]%
% \end{macrocode}
% \begin{macrocode}
%</lang3>
diff --git a/Master/texmf-dist/source/latex/listings/lstdrvrs.ins b/Master/texmf-dist/source/latex/listings/lstdrvrs.ins
index 510673ad8d0..d1bcbaefd8a 100644
--- a/Master/texmf-dist/source/latex/listings/lstdrvrs.ins
+++ b/Master/texmf-dist/source/latex/listings/lstdrvrs.ins
@@ -55,7 +55,7 @@
}
\endbatchfile
- [2014/09/06 1.5e listings language file]
+ [2015/06/04 1.6 listings language file]
\endinput
%%
%% End of file `lstdrvrs.ins'.