diff options
| author | Karl Berry <karl@freefriends.org> | 2007-02-28 22:32:28 +0000 |
|---|---|---|
| committer | Karl Berry <karl@freefriends.org> | 2007-02-28 22:32:28 +0000 |
| commit | e7d22f9c3388947b1b1e5e8c8519c9ae0684a96f (patch) | |
| tree | 54fcbbab0ca8c6ff479a36810919d99ce6e9e112 /Master/texmf-dist/tex/latex | |
| parent | 278b41c83363bdbda2ef386ec54df1c16417a1d8 (diff) | |
listings update (28feb07)
git-svn-id: svn://tug.org/texlive/trunk@4002 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex')
| -rw-r--r-- | Master/texmf-dist/tex/latex/listings/listings.cfg | 13 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/listings/listings.sty | 318 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/listings/lstdoc.sty | 23 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/listings/lstlang1.sty | 366 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/listings/lstlang2.sty | 34 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/listings/lstlang3.sty | 563 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/listings/lstmisc.sty | 52 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/listings/lstpatch.sty | 417 |
8 files changed, 1242 insertions, 544 deletions
diff --git a/Master/texmf-dist/tex/latex/listings/listings.cfg b/Master/texmf-dist/tex/latex/listings/listings.cfg index ebc5c730264..18f2e6ead31 100644 --- a/Master/texmf-dist/tex/latex/listings/listings.cfg +++ b/Master/texmf-dist/tex/latex/listings/listings.cfg @@ -4,12 +4,12 @@ %% %% The original source files were: %% -%% lstdrvrs-1.3.dtx (with options: `config') +%% lstdrvrs.dtx (with options: `config') %% %% The listings package is copyright 1996--2004 Carsten Heinz, and -%% continued maintenance on the package is copyright 2006 Brooks Moses. -%% The drivers are copyright 1997/1998/1999/2000/2001/2002/2003/2004 any -%% individual author listed in this file. +%% continued maintenance on the package is copyright 2006--2007 Brooks Moses. +%% The drivers are copyright 1997/1998/1999/2000/2001/2002/2003/2004/2006/ +%% 2007 any individual author listed in this file. %% %% This file is distributed under the terms of the LaTeX Project Public %% License from CTAN archives in directory macros/latex/base/lppl.txt. @@ -24,15 +24,16 @@ \def\lstlanguagefiles {lstlang0.sty,lstlang1.sty,lstlang2.sty,lstlang3.sty} \lstset{defaultdialect=[R/3 6.10]ABAP, - defaultdialect=[95]Ada, + defaultdialect=[2005]Ada, defaultdialect=[68]Algol, defaultdialect=[gnu]Awk, defaultdialect=[ANSI]C, defaultdialect=[light]Caml, defaultdialect=[1985]Cobol, +defaultdialect=[WinXP]command.com, defaultdialect=[ISO]C++, defaultdialect=[95]Fortran, - defaultdialect=[3.0]Mathematica, + defaultdialect=[5.2]Mathematica, defaultdialect=[OMG]OCL, defaultdialect=[Standard]Pascal, defaultdialect=[67]Simula, diff --git a/Master/texmf-dist/tex/latex/listings/listings.sty b/Master/texmf-dist/tex/latex/listings/listings.sty index 8d96f36b944..ccde8611888 100644 --- a/Master/texmf-dist/tex/latex/listings/listings.sty +++ b/Master/texmf-dist/tex/latex/listings/listings.sty @@ -4,7 +4,7 @@ %% %% The original source files were: %% -%% listings-1.3.dtx (with options: `kernel') +%% listings.dtx (with options: `kernel') %% %% Please read the software license in listings-1.3.dtx or listings-1.3.pdf. %% @@ -39,7 +39,8 @@ \fi} \edef\lst@RestoreCatcodes{% \noexpand\lccode`\noexpand\/`\noexpand\/% - \lst@RestoreCatcodes\"\^^I\^^M\~\^^@\relax} + \lst@RestoreCatcodes\"\^^I\^^M\~\^^@\relax + \catcode12\active} \lst@InputCatcodes \AtEndOfPackage{\lst@RestoreCatcodes} \def\@lst{lst} @@ -118,9 +119,14 @@ \def\lst@next{#2}% \fi \lst@next #3} \def\lst@for#1\do#2{% - \def\lst@forbody##1{#2}% - \@for\lst@forvar:=#1\do - {\expandafter\lst@forbody\expandafter{\lst@forvar}}} + \def\lst@forbody##1{#2}% + \def\@tempa{#1}% + \ifx\@tempa\@empty\else\expandafter\lst@f@r#1,\@nil,\fi +} +\def\lst@f@r#1,{% + \def\@tempa{#1}% + \ifx\@tempa\@nnil\else\lst@forbody{#1}\expandafter\lst@f@r\fi +} \def\lst@MakeActive#1{% \let\lst@temp\@empty \lst@MakeActive@#1% \relax\relax\relax\relax\relax\relax\relax\relax\relax} @@ -640,6 +646,19 @@ \def\lst@OutputLostSpace{\lst@ifnewline \lst@UseLostSpace\fi}% \let\lst@leftinsert\@empty \let\lst@rightinsert\@empty} +\def\lst@column@spaceflexible{% + \lst@column@flexible + \def\lst@OutputLostSpace{% + \lst@ifwhitespace + \ifx\lst@outputspace\lst@visiblespace + \else + \lst@UseLostSpace + \fi + \else + \lst@ifnewline \lst@UseLostSpace\fi + \fi}% + \let\lst@leftinsert\@empty + \let\lst@rightinsert\@empty} \def\lst@outputpos#1#2\relax{% \def\lst@lefthss{\lst@hss}\let\lst@righthss\lst@lefthss \let\lst@rightinsert\lst@InsertLostSpace @@ -820,8 +839,8 @@ \def\lst@keepspacestrue{\let\lst@ifkeepspaces\iftrue} \def\lst@ProcessSpace{% \lst@ifkeepspaces - \lst@whitespacetrue \lst@PrintToken + \lst@whitespacetrue \lst@AppendOther\lst@outputspace \lst@PrintToken \else \ifnum\lst@newlines=\z@ @@ -841,8 +860,8 @@ \global\advance\lst@pos\m@ne \lst@gobbledwhitespacetrue \else - \lst@whitespacetrue \lst@PrintToken + \lst@whitespacetrue \lst@AppendOther\lst@outputspace \lst@PrintToken \fi} @@ -1016,7 +1035,7 @@ \@makeother =\lsts@nfss@catcodes} \def\lst@makeletter#1{% \ifx\relax#1\else\catcode`#111\relax \expandafter\lst@makeletter\fi} -\lst@Key{useoutput}{2}{\edef\lst@useoutput{\ifcase#10 0\or 1\else 2\fi}} +\lst@Key{useoutput}{2}{\edef\lst@useoutput{\ifcase0#1 0\or 1\else 2\fi}} \lst@AddToHook{Init} {\edef\lst@OrgOutput{\the\output}% \ifcase\lst@useoutput\relax @@ -1050,9 +1069,14 @@ \fi \advance\@tempcnta\@ne \repeat} -\def\lst@ScanChars{% +\begingroup \catcode12=\active\let^^L\@empty +\gdef\lst@ScanChars{% + \let\lsts@ssL^^L% + \def^^L{\par}% \lst@GetChars\lst@RestoreOrigCatcodes\@ne {128}% + \let^^L\lsts@ssL \lst@GetChars\lst@RestoreOrigExtendedCatcodes{128}{256}} +\endgroup \lst@Key{rescanchars}\relax{\lst@ScanChars} \AtBeginDocument{\lst@ScanChars} \lst@Key{alsoletter}\relax{% @@ -1365,6 +1389,7 @@ \lst@AddToHookExe{EmptyStyle} {\let\lst@basicstyle\@empty \let\lst@inputenc\@empty} +\lst@Key{multicols}{}{\@tempcnta=0#1\relax\def\lst@multicols{#1}} \def\lst@parshape{\parshape\@ne \z@ \linewidth} \lst@AddToHookAtTop{EveryLine}{\lst@parshape} \lst@AddToHookAtTop{EndGroup}{\lst@parshape} @@ -1377,6 +1402,15 @@ {\let\lst@firstline\@ne \def\lst@lastline{9999999\relax}} \lst@Key{linerange}\relax{\lstKV@OptArg[]{#1}{% \def\lst@interrange{##1}\def\lst@linerange{##2,}}} +\lst@Key{rangeprefix}\relax{\def\lst@rangebeginprefix{#1}% + \def\lst@rangeendprefix{#1}} +\lst@Key{rangesuffix}\relax{\def\lst@rangebeginsuffix{#1}% + \def\lst@rangeendsuffix{#1}} +\lst@Key{rangebeginprefix}{}{\def\lst@rangebeginprefix{#1}} +\lst@Key{rangebeginsuffix}{}{\def\lst@rangebeginsuffix{#1}} +\lst@Key{rangeendprefix}{}{\def\lst@rangeendprefix{#1}} +\lst@Key{rangeendsuffix}{}{\def\lst@rangeendsuffix{#1}} +\lst@Key{includerangemarker}{true}[t]{\lstKV@SetIf{#1}\lst@ifincluderangemarker} \lst@AddToHook{PreSet}{\def\lst@firstline{1\relax}% \let\lst@linerange\@empty} \lst@AddToHook{Init} @@ -1387,20 +1421,130 @@ \def\lst@GetLineInterval{\expandafter\lst@GLI\lst@linerange\@nil} \def\lst@GLI#1,#2\@nil{\def\lst@linerange{#2}\lst@GLI@#1--\@nil} \def\lst@GLI@#1-#2-#3\@nil{% - \ifx\@empty#1\@empty - \let\lst@firstline\@ne - \else - \def\lst@firstline{#1\relax}% + \lst@IfNumber{#1}% + {\ifx\@empty#1\@empty + \let\lst@firstline\@ne + \else + \def\lst@firstline{#1\relax}% + \fi + \ifx\@empty#3\@empty + \def\lst@lastline{9999999\relax}% + \else + \ifx\@empty#2\@empty + \let\lst@lastline\lst@firstline + \else + \def\lst@lastline{#2\relax}% + \fi + \fi}% + {\def\lst@firstline{9999999\relax}% + \let\lst@lastline\lst@firstline + \let\lst@rangebegin\lst@rangebeginprefix + \lst@AddTo\lst@rangebegin{#1}\lst@Extend\lst@rangebegin\lst@rangebeginsuffix + \ifx\@empty#3\@empty + \let\lst@rangeend\lst@rangeendprefix + \lst@AddTo\lst@rangeend{#1}\lst@Extend\lst@rangeend\lst@rangeendsuffix + \else + \ifx\@empty#2\@empty + \let\lst@rangeend\@empty + \else + \let\lst@rangeend\lst@rangeendprefix + \lst@AddTo\lst@rangeend{#2}\lst@Extend\lst@rangeend\lst@rangeendsuffix + \fi + \fi + \global\def\lst@DefRange{\expandafter\lst@CArgX\lst@rangebegin\relax\lst@DefRangeB}% + \ifnum\lst@mode=\lst@Pmode \expandafter\lst@DefRange \fi}} +\lst@AddToHookExe{DeInit}{\global\let\lst@DefRange\@empty} +\def\lst@DefRangeB#1#2{\lst@DefRangeB@#1#2} +\def\lst@DefRangeB@#1#2#3#4{% + \lst@CDef{#1{#2}{#3}}#4{}% + {\lst@ifincluderangemarker + \lst@LeaveMode + \let#1#4% + \lst@DefRangeEnd + \lst@InitLstNumber + \else + \@tempcnta\lst@lineno \advance\@tempcnta\@ne + \edef\lst@firstline{\the\@tempcnta\relax}% + \gdef\lst@OnceAtEOL{\let#1#4\lst@DefRangeEnd}% + \lst@InitLstNumber + \fi + \global\let\lst@DefRange\lst@DefRangeEnd + \lst@CArgEmpty}% + \@empty} +\def\lstpatch@labels{% +\gdef\lst@SetFirstNumber{% + \ifx\lst@firstnumber\@undefined + \@tempcnta 0\csname\@lst no@\lst@intname\endcsname\relax + \ifnum\@tempcnta=\z@ \else + \lst@nololtrue + \advance\@tempcnta\lst@advancenumber + \edef\lst@firstnumber{\the\@tempcnta\relax}% + \fi + \fi}% +} +\def\lst@InitLstNumber{% + \global\c@lstnumber\lst@firstnumber + \global\advance\c@lstnumber\lst@advancenumber + \global\advance\c@lstnumber-\lst@advancelstnum + \ifx \lst@firstnumber\c@lstnumber + \global\advance\c@lstnumber-\lst@advancelstnum + \fi} +\def\lst@DefRangeEnd{% + \ifx\lst@rangeend\@empty\else + \expandafter\lst@CArgX\lst@rangeend\relax\lst@DefRangeE + \fi} +\def\lst@DefRangeE#1#2{\lst@DefRangeE@#1#2} +\def\lst@DefRangeE@#1#2#3#4{% + \lst@CDef{#1#2{#3}}#4{}% + {\let#1#4% + \edef\lst@lastline{\the\lst@lineno\relax}% + \lst@DefRangeE@@}% + \@empty} +\def\lst@DefRangeE@@#1\@empty{% + \lst@ifincluderangemarker + #1\lst@XPrintToken \fi - \ifx\@empty#2\@empty - \def\lst@lastline{9999999\relax}% + \lst@LeaveModeToPmode + \lst@BeginDropInput{\lst@Pmode}} +\def\lst@LeaveModeToPmode{% + \ifnum\lst@mode=\lst@Pmode + \expandafter\lsthk@EndGroup \else - \ifx -#2% - \let\lst@lastline\lst@firstline - \else - \def\lst@lastline{#2\relax}% - \fi + \expandafter\egroup\expandafter\lst@LeaveModeToPmode + \fi} +\lst@AddToHook{EOL}{\lst@OnceAtEOL\global\let\lst@OnceAtEOL\@empty} +\gdef\lst@OnceAtEOL{}% Init +\def\lst@MSkipToFirst{% + \global\advance\lst@lineno\@ne + \ifnum \lst@lineno=\lst@firstline + \def\lst@next{\lst@LeaveMode \global\lst@newlines\z@ + \lst@OnceAtEOL \global\let\lst@OnceAtEOL\@empty + \lst@InitLstNumber % Added to work with modified \lsthk@PreInit. + \lsthk@InitVarsBOL + \lst@BOLGobble}% + \expandafter\lst@next \fi} +\def\lst@SkipToFirst{% + \ifnum \lst@lineno<\lst@firstline + \def\lst@next{\lst@BeginDropInput\lst@Pmode + \lst@Let{13}\lst@MSkipToFirst + \lst@Let{10}\lst@MSkipToFirst}% + \expandafter\lst@next + \else + \expandafter\lst@BOLGobble + \fi} +\def\lst@IfNumber#1{% + \ifx\@empty#1\@empty + \let\lst@next\@firstoftwo + \else + \lst@IfNumber@#1\@nil + \fi + \lst@next} +\def\lst@IfNumber@#1#2\@nil{% + \let\lst@next\@secondoftwo + \ifnum`#1>47\relax \ifnum`#1>57\relax\else + \let\lst@next\@firstoftwo + \fi\fi} \lst@Key{nolol}{false}[t]{\lstKV@SetIf{#1}\lst@ifnolol} \def\lst@nololtrue{\let\lst@ifnolol\iftrue} \let\lst@ifnolol\iffalse % init @@ -1415,13 +1559,18 @@ \lst@AddToHookExe{TextStyle} {\let\lst@caption\@empty \let\lst@@caption\@empty \let\lst@title\@empty \let\lst@label\@empty} -\@ifundefined{thechapter} - {\newcounter{lstlisting} - \renewcommand\thelstlisting{\@arabic\c@lstlisting}} - {\newcounter{lstlisting}[chapter] - \renewcommand\thelstlisting - {\ifnum \c@chapter>\z@ \thechapter.\fi \@arabic\c@lstlisting}} +\AtBeginDocument{ + \@ifundefined{thechapter}{\let\lst@ifnumberbychapter\iffalse}{} + \lst@ifnumberbychapter + \newcounter{lstlisting}[chapter] + \gdef\thelstlisting% + {\ifnum \c@chapter>\z@ \thechapter.\fi \@arabic\c@lstlisting} + \else + \newcounter{lstlisting} + \gdef\thelstlisting{\@arabic\c@lstlisting} + \fi} \lst@UserCommand\lstlistingname{Listing} +\lst@Key{numberbychapter}{true}[t]{\lstKV@SetIf{#1}\lst@ifnumberbychapter} \@ifundefined{abovecaptionskip} {\newskip\abovecaptionskip \newskip\belowcaptionskip}{} @@ -1471,7 +1620,7 @@ \par\@parboxrestore\normalsize\normalfont % \noindent (AS) \ifx #1t\allowbreak \fi \ifx\lst@title\@empty - \lst@makecaption\fnum@lstlisting\lst@caption % (AS) + \lst@makecaption\fnum@lstlisting{\ignorespaces \lst@caption} \else \lst@maketitle\lst@title % (AS) \fi @@ -1550,6 +1699,10 @@ \edef\@tempa{\noexpand\lst@beginfloat{lstlisting}[\lst@float]}% \expandafter\@tempa \fi + \ifx\lst@multicols\@empty\else + \edef\lst@next{\noexpand\multicols{\lst@multicols}} + \expandafter\lst@next + \fi \ifhmode\ifinner \lst@boxtrue \fi\fi \lst@ifbox \lsthk@BoxUnsafe @@ -1618,10 +1771,17 @@ \par\penalty-50\vspace\lst@belowskip \fi \fi + \ifx\lst@multicols\@empty\else + \def\lst@next{\global\let\@checkend\@gobble + \endmulticols + \global\let\@checkend\lst@@checkend} + \expandafter\lst@next + \fi \ifx\lst@float\relax\else \expandafter\lst@endfloat \fi \endgroup} +\let\lst@@checkend\@checkend \newdimen\lst@maxwidth % \global \lst@AddToHook{InitVars}{\global\lst@maxwidth\z@} \lst@AddToHook{InitVarsEOL} @@ -1691,21 +1851,33 @@ \let\contentsname\lstlistlistingname \let\lst@temp\@starttoc \def\@starttoc##1{\lst@temp{lol}}% \tableofcontents \egroup} -\@ifpackageloaded{scrlfile} -{\newcommand*\lol@heading{\float@listhead{\lstlistlistingname}} - \renewcommand*\lstlistoflistings{% - \begingroup% - \if@twocolumn - \@restonecoltrue\onecolumn - \else - \@restonecolfalse - \fi - \lol@heading% - \@parskipfalse\@parskip@indent% - \@starttoc{lol}% - \if@restonecol\twocolumn\fi - \endgroup}% -}{} +\@ifundefined{float@listhead}{}{% + \renewcommand*{\lstlistoflistings}{% + \begingroup + \@ifundefined{@restonecoltrue}{}{% + \if@twocolumn + \@restonecoltrue\onecolumn + \else + \@restonecolfalse + \fi + }% + \float@listhead{\lstlistlistingname}% + \parskip\z@\parindent\z@\parfillskip \z@ \@plus 1fil% + \@starttoc{lol}% + \@ifundefined{@restonecoltrue}{}{% + \if@restonecol\twocolumn\fi + }% + \endgroup + }% +} +\AtBeginDocument{% + \@ifundefined{float@addtolists}% + {\gdef\float@addtolists#1{\addtocontents{lol}{#1}}}% + {\let\orig@float@addtolists\float@addtolists + \gdef\float@addtolists#1{% + \addtocontents{lol}{#1}% + \orig@float@addtolists{#1}}}% +}% \newcommand\lstinline[1][]{% \leavevmode\bgroup % \hbox\bgroup --> \bgroup \def\lst@boxpos{b}% @@ -1753,6 +1925,68 @@ \def\lst@InlineGJReadSp#1{% \lccode`\~=`\ \lowercase{\lst@lAddTo\lst@arg~}% \lst@InlineGJ#1} +\newcommand\lstMakeShortInline[1][]{% + \def\lst@shortinlinedef{\lstinline[#1]}% + \lstMakeShortInline@}% +\def\lstMakeShortInline@#1{% + \expandafter\ifx\csname lst@ShortInlineOldCatcode\string#1\endcsname\relax + \lst@shortlstinlineinfo{Made }{#1}% + \lst@add@special{#1}% + \expandafter + \xdef\csname lst@ShortInlineOldCatcode\string#1\endcsname{\the\catcode`#1}% + \begingroup + \catcode`\~\active \lccode`\~`#1% + \lowercase{% + \global\expandafter\let + \csname lst@ShortInlineOldMeaning\string#1\endcsname~% + \expandafter\gdef\expandafter~\expandafter{\lst@shortinlinedef#1}}% + \endgroup + \global\catcode`#1\active + \else + \PackageError{Listings}% + {\string\lstMakeShorterInline\ definitions cannot be nested}% + {Use \string\lstDeleteShortInline first.}% + {}% + \fi} +\def\lstDeleteShortInline#1{% + \expandafter\ifx\csname lst@ShortInlineOldCatcode\string#1\endcsname\relax + \PackageError{Listings}% + {#1 is not a short reference for \string\lstinline}% + {Use \string\lstMakeShortInline first.}% + {}% + \else + \lst@shortlstinlineinfo{Deleted }{#1 as}% + \lst@rem@special{#1}% + \global\catcode`#1\csname lst@ShortInlineOldCatcode\string#1\endcsname + \global \expandafter\let% + \csname lst@ShortInlineOldCatcode\string#1\endcsname \relax + \ifnum\catcode`#1=\active + \begingroup + \catcode`\~\active \lccode`\~`#1% + \lowercase{% + \global\expandafter\let\expandafter~% + \csname lst@ShortInlineOldMeaning\string#1\endcsname}% + \endgroup + \fi + \fi} +\def\lst@shortlstinlineinfo#1#2{% + \PackageInfo{Listings}{% + #1\string#2 a short reference for \string\lstinline}} +\def\lst@add@special#1{% + \lst@rem@special{#1}% + \expandafter\gdef\expandafter\dospecials\expandafter + {\dospecials \do #1}% + \expandafter\gdef\expandafter\@sanitize\expandafter + {\@sanitize \@makeother #1}} +\def\lst@rem@special#1{% + \def\do##1{% + \ifnum`#1=`##1 \else \noexpand\do\noexpand##1\fi}% + \xdef\dospecials{\dospecials}% + \begingroup + \def\@makeother##1{% + \ifnum`#1=`##1 \else \noexpand\@makeother\noexpand##1\fi}% + \xdef\@sanitize{\@sanitize}% + \endgroup} \def\lst@MakePath#1{\ifx\@empty#1\@empty\else\lst@MakePath@#1/\@nil/\fi} \def\lst@MakePath@#1/{#1/\lst@MakePath@@} \def\lst@MakePath@@#1/{% diff --git a/Master/texmf-dist/tex/latex/listings/lstdoc.sty b/Master/texmf-dist/tex/latex/listings/lstdoc.sty index 419da5d1825..62987896859 100644 --- a/Master/texmf-dist/tex/latex/listings/lstdoc.sty +++ b/Master/texmf-dist/tex/latex/listings/lstdoc.sty @@ -4,7 +4,7 @@ %% %% The original source files were: %% -%% listings-1.3.dtx (with options: `doc') +%% listings.dtx (with options: `doc') %% %% Please read the software license in listings-1.3.dtx or listings-1.3.pdf. %% @@ -32,13 +32,13 @@ {} {\ifnum\OpMode>\z@ \lst@true \fi} \lst@if \IfFileExists{hyperref.sty}{\hypertrue}{}\fi -\newif\ifalgorithmic \IfFileExists{algorithmic.sty}{\algorithmictrue}{} +\newif\ifalgorithmicpkg \IfFileExists{algorithmic.sty}{\algorithmicpkgtrue}{} \newif\iflgrind \IfFileExists{lgrind.sty}{\lgrindtrue}{} \iffancyvrb \RequirePackage{fancyvrb}\fi \ifhyper \RequirePackage[colorlinks]{hyperref}\else \def\href#1{\texttt}\fi \ifcolor \RequirePackage{color}\fi -\ifalgorithmic \RequirePackage{algorithmic}\fi +\ifalgorithmicpkg \RequirePackage{algorithmic}\fi \iflgrind \RequirePackage{lgrind}\fi \RequirePackage{nameref} \RequirePackage{url} @@ -142,13 +142,13 @@ \def\PrintAspectName#1{} \def\SpecialMainAspectIndex#1{% \@bsphack - \index{aspects:\levelchar\protect\aspectname{#1}\encapchar main}% + \index{aspects:\levelchar\protect\aspectname{#1}}% \@esphack} \newdocenvironment{lstkey}{Key}{}{} \def\PrintKeyName#1{\strut\keyname{#1}\ } \def\SpecialMainKeyIndex#1{% \@bsphack - \index{keys\levelchar\protect\keyname{#1}\encapchar main}% + \index{keys\levelchar\protect\keyname{#1}}% \@esphack} \newcounter{argcount} \def\labelargcount{\texttt{\#\arabic{argcount}}\hskip\labelsep$=$} @@ -204,7 +204,8 @@ {-1em}% {\normalfont\normalsize\bfseries}} \def\lstref#1{\emph{\ref{#1} \nameref{#1}}} -\def\@part[#1]#2{\addcontentsline{toc}{part}{#1}% +\def\@part[#1]#2{\ifhyper\phantomsection\fi + \addcontentsline{toc}{part}{#1}% {\parindent\z@ \raggedright \interlinepenalty\@M \normalfont \huge \bfseries #2\markboth{}{}\par}% \nobreak\vskip 3ex\@afterheading} @@ -228,13 +229,13 @@ \keyname{#1}} \newcommand\ekeyname[1]{% \@bsphack - \lstkeyindex{#1}{\encapchar usage}% - \lstaspectindex{#1}{\encapchar usage}% + \lstkeyindex{#1}{}% + \lstaspectindex{#1}{}% \@esphack} \newcommand\rkeyname[1]{% \@bsphack - \lstkeyindex{#1}{\encapchar main}% - \lstaspectindex{#1}{\encapchar main}% + \lstkeyindex{#1}{}% + \lstaspectindex{#1}{}% \@esphack{\rstyle\keyname{#1}}} \newcommand\icmdname[1]{% \@bsphack @@ -242,7 +243,7 @@ \@esphack\texttt{\string#1}} \newcommand\rcmdname[1]{% \@bsphack - \lstaspectindex{#1}{\encapchar main}% + \lstaspectindex{#1}{}% \@esphack\texttt{\rstyle\string#1}} \def\lstaspectindex#1#2{% \global\@namedef{lstkandc@\string#1}{}% diff --git a/Master/texmf-dist/tex/latex/listings/lstlang1.sty b/Master/texmf-dist/tex/latex/listings/lstlang1.sty index 49521b72aa2..40c3f371689 100644 --- a/Master/texmf-dist/tex/latex/listings/lstlang1.sty +++ b/Master/texmf-dist/tex/latex/listings/lstlang1.sty @@ -4,12 +4,12 @@ %% %% The original source files were: %% -%% lstdrvrs-1.3.dtx (with options: `lang1') +%% lstdrvrs.dtx (with options: `lang1') %% %% The listings package is copyright 1996--2004 Carsten Heinz, and -%% continued maintenance on the package is copyright 2006 Brooks Moses. -%% The drivers are copyright 1997/1998/1999/2000/2001/2002/2003/2004 any -%% individual author listed in this file. +%% continued maintenance on the package is copyright 2006--2007 Brooks Moses. +%% The drivers are copyright 1997/1998/1999/2000/2001/2002/2003/2004/2006/ +%% 2007 any individual author listed in this file. %% %% This file is distributed under the terms of the LaTeX Project Public %% License from CTAN archives in directory macros/latex/base/lppl.txt. @@ -36,6 +36,11 @@ %% %% Ada 95 definition (c) Torsten Neuer %% +%% Ada 2005 definition (c) 2006 Santiago Urue\~{n}a Pascual +%% <Santiago.Uruena@upm.es> +%% +\lst@definelanguage[2005]{Ada}[95]{Ada}% + {morekeywords={interface,overriding,synchronized}}% \lst@definelanguage[95]{Ada}[83]{Ada}% {morekeywords={abstract,aliased,protected,requeue,tagged,until}}% \lst@definelanguage[83]{Ada}% @@ -308,27 +313,28 @@ OUT,INTENT,INTERFACE,IOLENGTH,KIND,LEN,MODULE,NAME,NAMELIST,NMT,% NULLIFY,ONLY,OPERATOR,OPTIONAL,OUT,PAD,POINTER,POSITION,PRIVATE,% PUBLIC,READWRITE,RECURSIVE,RESULT,SELECT,SEQUENCE,SIZE,STAT,% - TARGET,USE,WHERE,WHILE,BLOCKDATA,DOUBLEPRECISION,ELSEIF,% - ENDBLOCKDATA,ENDDO,ENDFILE,ENDFUNCTION,ENDIF,ENDINTERFACE,% + TARGET,USE,WHERE,WHILE,BLOCKDATA,DOUBLEPRECISION,% + ENDBLOCKDATA,ENDFILE,ENDFUNCTION,ENDINTERFACE,% ENDMODULE,ENDPROGRAM,ENDSELECT,ENDSUBROUTINE,ENDTYPE,ENDWHERE,% - GOTO,INOUT,SELECTCASE},% + INOUT,SELECTCASE},% deletecomment=[f],% no fixed comment line: 1998 Magne Rudshaug morecomment=[l]!% }% \lst@definelanguage[77]{Fortran}% {morekeywords={ACCESS,ASSIGN,BACKSPACE,BLANK,BLOCK,CALL,CHARACTER,% CLOSE,COMMON,COMPLEX,CONTINUE,DATA,DIMENSION,DIRECT,DO,DOUBLE,% - ELSE,END,ENTRY,EOF,EQUIVALENCE,ERR,EXIST,EXTERNAL,FILE,FMT,FORM,% - FORMAT,FORMATTED,FUNCTION,GO,TO,IF,IMPLICIT,INQUIRE,INTEGER,% - INTRINSIC,IOSTAT,LOGICAL,NAMED,NEXTREC,NUMBER,OPEN,OPENED,% - PARAMETER,PAUSE,PRECISION,PRINT,PROGRAM,READ,REAL,REC,RECL,% - RETURN,REWIND,SEQUENTIAL,STATUS,STOP,SUBROUTINE,THEN,TYPE,% - UNFORMATTED,UNIT,WRITE,SAVE},% - sensitive=f,%% not Fortran standard %% + ELSE,ELSEIF,END,ENDIF,ENDDO,ENTRY,EOF,EQUIVALENCE,ERR,EXIST,EXTERNAL,% + FILE,FMT,FORM,FORMAT,FORMATTED,FUNCTION,GO,TO,GOTO,IF,IMPLICIT,% + INQUIRE,INTEGER,INTRINSIC,IOSTAT,LOGICAL,NAMED,NEXTREC,NUMBER,% + OPEN,OPENED,PARAMETER,PAUSE,PRECISION,PRINT,PROGRAM,READ,REAL,% + REC,RECL,RETURN,REWIND,SEQUENTIAL,STATUS,STOP,SUBROUTINE,THEN,% + TYPE,UNFORMATTED,UNIT,WRITE,SAVE},% + sensitive=f,%% not Fortran-77 standard, but allowed in Fortran-95 %% morecomment=[f]*,% morecomment=[f]C,% morecomment=[f]c,% - morestring=[d]"% + morestring=[d]",%% not Fortran-77 standard, but allowed in Fortran-95 %% + morestring=[d]'% }[keywords,comments,strings]% \lst@definelanguage{HTML}% {morekeywords={A,ABBR,ACRONYM,ADDRESS,APPLET,AREA,B,BASE,BASEFONT,% @@ -511,6 +517,319 @@ morecomment=[l]\%,% morestring=[m]'% }[keywords,comments,strings]% +\lst@definelanguage[5.2]{Mathematica}[3.0]{Mathematica}%% + {morekeywords={Above,AbsoluteOptions,AbsoluteTiming,AccountingForm,% + AccuracyGoal,Active,ActiveItem,AddOnHelpPath,% + AdjustmentBox,AdjustmentBoxOptions,After,AiryAiPrime,% + AlgebraicRulesData,Algebraics,Alias,AlignmentMarker,% + AllowInlineCells,AllowScriptLevelChange,Analytic,AnimationCycleOffset,% + AnimationCycleRepetitions,AnimationDirection,AnimationDisplayTime,ApartSquareFree,% + AppellF1,ArgumentCountQ,ArrayDepth,ArrayPlot,% + ArrayQ,ArrayRules,AspectRatioFixed,Assuming,% + Assumptions,AutoDelete,AutoEvaluateEvents,AutoGeneratedPackage,% + AutoIndent,AutoIndentSpacings,AutoItalicWords,AutoloadPath,% + AutoOpenNotebooks,AutoOpenPalettes,AutoScroll,AutoSpacing,% + AutoStyleOptions,Axis,BackgroundTasksSettings,Backsubstitution,% + Backward,Baseline,Before,BeginDialogPacket,% + BeginFrontEndInteractionPacket,Below,BezoutMatrix,BinaryFormat,% + BinaryGet,BinaryRead,BinaryReadList,BinaryWrite,% + BitAnd,BitNot,BitOr,BitXor,% + Black,BlankForm,Blue,Boole,% + Booleans,Bottom,Bounds,Box,% + BoxBaselineShift,BoxData,BoxDimensions,BoxFormFormatTypes,% + BoxFrame,BoxMargins,BoxRegion,Brown,% + Buchberger,Button,ButtonBox,ButtonBoxOptions,% + ButtonCell,ButtonContents,ButtonData,ButtonEvaluator,% + ButtonExpandable,ButtonFrame,ButtonFunction,ButtonMargins,% + ButtonMinHeight,ButtonNote,ButtonNotebook,ButtonSource,% + ButtonStyle,ButtonStyleMenuListing,ByteOrdering,CallPacket,% + CarmichaelLambda,Cell,CellAutoOverwrite,CellBaseline,% + CellBoundingBox,CellBracketOptions,CellContents,CellDingbat,% + CellEditDuplicate,CellElementsBoundingBox,CellElementSpacings,CellEvaluationDuplicate,% + CellFrame,CellFrameColor,CellFrameLabelMargins,CellFrameLabels,% + CellFrameMargins,CellGroup,CellGroupData,CellGrouping,% + CellGroupingRules,CellHorizontalScrolling,CellLabel,CellLabelAutoDelete,% + CellLabelMargins,CellLabelPositioning,CellMargins,CellObject,% + CellOpen,CellPasswords,CellPrint,CellSize,% + CellStyle,CellTags,CellularAutomaton,Center,% + CharacterEncoding,CharacterEncodingsPath,CharacteristicPolynomial,CharacterRange,% + CheckAll,CholeskyDecomposition,Clip,ClipboardNotebook,% + Closed,ClosingAutoSave,CoefficientArrays,CoefficientDomain,% + CofactorExpansion,ColonForm,ColorFunctionScaling,ColorRules,% + ColorSelectorSettings,Column,ColumnAlignments,ColumnLines,% + ColumnsEqual,ColumnSpacings,ColumnWidths,CommonDefaultFormatTypes,% + CompileOptimizations,CompletionsListPacket,Complexes,ComplexityFunction,% + Compose,ComposeSeries,ConfigurationPath,ConjugateTranspose,% + Connect,ConsoleMessage,ConsoleMessagePacket,ConsolePrint,% + ContentsBoundingBox,ContextToFileName,ContinuedFraction,ConversionOptions,% + ConversionRules,ConvertToBitmapPacket,ConvertToPostScript,ConvertToPostScriptPacket,% + Copyable,CoshIntegral,CounterAssignments,CounterBox,% + CounterBoxOptions,CounterEvaluator,CounterFunction,CounterIncrements,% + CounterStyle,CounterStyleMenuListing,CreatePalettePacket,Cross,% + CurrentlySpeakingPacket,Cyan,CylindricalDecomposition,DampingFactor,% + DataRange,Debug,DebugTag,Decimal,% + DedekindEta,DefaultDuplicateCellStyle,DefaultFontProperties,DefaultFormatType,% + DefaultFormatTypeForStyle,DefaultInlineFormatType,DefaultInputFormatType, + DefaultNaturalLanguage,% + DefaultNewCellStyle,DefaultNewInlineCellStyle,DefaultNotebook,DefaultOutputFormatType,% + DefaultStyleDefinitions,DefaultTextFormatType,DefaultTextInlineFormatType,DefaultValues,% + DefineExternal,DegreeLexicographic,DegreeReverseLexicographic,Deletable,% + DeleteContents,DeletionWarning,DelimiterFlashTime,DelimiterMatching,% + Delimiters,DependentVariables,DiacriticalPositioning,DialogLevel,% + DifferenceOrder,DigitCharacter,DigitCount,DiracDelta,% + Direction,DirectoryName,DisableConsolePrintPacket,DiscreteDelta,% + DisplayAnimation,DisplayEndPacket,DisplayFlushImagePacket,DisplayForm,% + DisplayPacket,DisplayRules,DisplaySetSizePacket,DisplayString,% + DivisionFreeRowReduction,DOSTextFormat,DoubleExponential,DoublyInfinite,% + Down,DragAndDrop,DrawHighlighted,DualLinearProgramming,% + DumpGet,DumpSave,Edit,Editable,% + EditButtonSettings,EditCellTagsSettings,EditDefinition,EditIn,% + Element,EliminationOrder,EllipticExpPrime,EllipticNomeQ,% + EllipticReducedHalfPeriods,EllipticThetaPrime,Empty,EnableConsolePrintPacket,% + Encoding,EndAdd,EndDialogPacket,EndFrontEndInteractionPacket,% + EndOfLine,EndOfString,Enter,EnterExpressionPacket,% + EnterTextPacket,EqualColumns,EqualRows,EquatedTo,% + Erfi,ErrorBox,ErrorBoxOptions,ErrorNorm,% + ErrorPacket,ErrorsDialogSettings,Evaluatable,EvaluatePacket,% + EvaluationCell,EvaluationCompletionAction,EvaluationMonitor,EvaluationNotebook,% + Evaluator,EvaluatorNames,EventEvaluator,ExactNumberQ,% + ExactRootIsolation,Except,ExcludedForms,Exists,% + ExitDialog,ExponentPosition,ExponentStep,Export,% + ExportAutoReplacements,ExportPacket,ExportString,ExpressionPacket,% + ExpToTrig,Extension,ExternalCall,ExternalDataCharacterEncoding,% + Extract,Fail,FEDisableConsolePrintPacket,FEEnableConsolePrintPacket,% + Fibonacci,File,FileFormat,FileInformation,% + FileName,FileNameDialogSettings,FindFit,FindInstance,% + FindMaximum,FindSettings,FitAll,FlushPrintOutputPacket,% + Font,FontColor,FontFamily,FontName,% + FontPostScriptName,FontProperties,FontReencoding,FontSize,% + FontSlant,FontSubstitutions,FontTracking,FontVariations,% + FontWeight,ForAll,FormatRules,FormatTypeAutoConvert,% + FormatValues,FormBox,FormBoxOptions,Forward,% + ForwardBackward,FourierCosTransform,FourierParameters,FourierSinTransform,% + FourierTransform,FractionalPart,FractionBox,FractionBoxOptions,% + FractionLine,FrameBox,FrameBoxOptions,FresnelC,% + FresnelS,FromContinuedFraction,FromDigits,FrontEndExecute,% + FrontEndObject,FrontEndStackSize,FrontEndToken,FrontEndTokenExecute,% + FrontEndVersion,Full,FullAxes,FullSimplify,% + FunctionExpand,FunctionInterpolation,GaussKronrod,GaussPoints,% + GenerateBitmapCaches,GenerateConditions,GeneratedCell,GeneratedParameters,% + Generic,GetBoundingBoxSizePacket,GetContext,GetFileName,% + GetFrontEndOptionsDataPacket,GetLinebreakInformationPacket,% + GetMenusPacket,GetPageBreakInformationPacket,% + Glaisher,GlobalPreferences,GlobalSession,Gradient,% + GraphicsData,GraphicsGrouping,Gray,Green,% + Grid,GridBaseline,GridBox,GridBoxOptions,% + GridCreationSettings,GridDefaultElement,GridFrame,GridFrameMargins,% + GroupPageBreakWithin,HarmonicNumber,Hash,HashTable,% + HeadCompose,HelpBrowserLookup,HelpBrowserNotebook,HelpBrowserSettings,% + HessenbergDecomposition,Hessian,HoldAllComplete,HoldComplete,% + HoldPattern,Horizontal,HorizontalForm,HorizontalScrollPosition,% + HTMLSave,Hypergeometric0F1Regularized,Hypergeometric1F1Regularized,% + Hypergeometric2F1Regularized,% + HypergeometricPFQ,HypergeometricPFQRegularized,HyperlinkCreationSettings,Hyphenation,% + HyphenationOptions,IgnoreCase,ImageCache,ImageCacheValid,% + ImageMargins,ImageOffset,ImageRangeCache,ImageRegion,% + ImageResolution,ImageRotated,ImageSize,Import,% + ImportAutoReplacements,ImportString,IncludeFileExtension,IncludeSingularTerm,% + IndentingNewlineSpacings,IndentMaxFraction,IndexCreationOptions,Inequality,% + InexactNumberQ,InexactNumbers,Inherited,InitializationCell,% + InitializationCellEvaluation,InitializationCellWarning,% + InlineCounterAssignments,InlineCounterIncrements,% + InlineRules,InputAliases,InputAutoFormat,InputAutoReplacements,% + InputGrouping,InputNamePacket,InputNotebook,InputPacket,% + InputSettings,InputStringPacket,InputToBoxFormPacket,InputToInputForm,% + InputToStandardForm,InsertionPointObject,IntegerExponent,IntegerPart,% + Integers,Interactive,Interlaced,InterpolationOrder,% + InterpolationPoints,InterpolationPrecision,InterpretationBox,% + InterpretationBoxOptions,% + InterpretTemplate,InterruptSettings,Interval,IntervalIntersection,% + IntervalMemberQ,IntervalUnion,InverseBetaRegularized,InverseEllipticNomeQ,% + InverseErf,InverseErfc,InverseFourierCosTransform, + InverseFourierSinTransform,% + InverseFourierTransform,InverseGammaRegularized,InverseJacobiCD,% + InverseJacobiCN,% + InverseJacobiCS,InverseJacobiDC,InverseJacobiDN,InverseJacobiDS,% + InverseJacobiNC,InverseJacobiND,InverseJacobiNS,InverseJacobiSC,% + InverseJacobiSD,InverseLaplaceTransform,InverseWeierstrassP,InverseZTransform,% + Jacobian,JacobiCD,JacobiCN,JacobiCS,% + JacobiDC,JacobiDN,JacobiDS,JacobiNC,% + JacobiND,JacobiNS,JacobiSC,JacobiSD,% + JordanDecomposition,K,Khinchin,KleinInvariantJ,% + KroneckerDelta,Language,LanguageCategory,LaplaceTransform,% + Larger,Launch,LayoutInformation,Left,% + LetterCharacter,Lexicographic,LicenseID,LimitsPositioning,% + LimitsPositioningTokens,LinearSolveFunction,LinebreakAdjustments,LineBreakWithin,% + LineForm,LineIndent,LineSpacing,LineWrapParts,% + LinkActivate,LinkClose,LinkConnect,LinkConnectedQ,% + LinkCreate,LinkError,LinkFlush,LinkHost,% + LinkInterrupt,LinkLaunch,LinkMode,LinkObject,% + LinkOpen,LinkOptions,LinkPatterns,LinkProtocol,% + LinkRead,LinkReadHeld,LinkReadyQ,Links,% + LinkWrite,LinkWriteHeld,ListConvolve,ListCorrelate,% + Listen,ListInterpolation,ListQ,LiteralSearch,% + LongestMatch,LongForm,Loopback,LUBackSubstitution,% + LUDecomposition,MachineID,MachineName,MachinePrecision,% + MacintoshSystemPageSetup,Magenta,Magnification,MakeBoxes,% + MakeExpression,MakeRules,Manual,MatchLocalNameQ,% + MathematicaNotation,MathieuC,MathieuCharacteristicA,MathieuCharacteristicB,% + MathieuCharacteristicExponent,MathieuCPrime,MathieuS,MathieuSPrime,% + MathMLForm,MathMLText,MatrixRank,Maximize,% + MaxIterations,MaxPlotPoints,MaxPoints,MaxRecursion,% + MaxStepFraction,MaxSteps,MaxStepSize,Mean,% + Median,MeijerG,MenuPacket,MessageOptions,% + MessagePacket,MessagesNotebook,MetaCharacters,Method,% + MethodOptions,Minimize,MinRecursion,MinSize,% + Mode,ModularLambda,MonomialOrder,MonteCarlo,% + Most,MousePointerNote,MultiDimensional,MultilaunchWarning,% + MultilineFunction,MultiplicativeOrder,Multiplicity,Nand,% + NeedCurrentFrontEndPackagePacket,NeedCurrentFrontEndSymbolsPacket,% + NestedScriptRules,NestWhile,% + NestWhileList,NevilleThetaC,NevilleThetaD,NevilleThetaN,% + NevilleThetaS,Newton,Next,NHoldAll,% + NHoldFirst,NHoldRest,NMaximize,NMinimize,% + NonAssociative,NonPositive,Nor,Norm,% + NormalGrouping,NormalSelection,NormFunction,Notebook,% + NotebookApply,NotebookAutoSave,NotebookClose,NotebookConvert,% + NotebookConvertSettings,NotebookCreate,NotebookCreateReturnObject,NotebookDefault,% + NotebookDelete,NotebookDirectory,NotebookFind,NotebookFindReturnObject,% + NotebookGet,NotebookGetLayoutInformationPacket,NotebookGetMisspellingsPacket,% + NotebookInformation,% + NotebookLocate,NotebookObject,NotebookOpen,NotebookOpenReturnObject,% + NotebookPath,NotebookPrint,NotebookPut,NotebookPutReturnObject,% + NotebookRead,NotebookResetGeneratedCells,Notebooks,NotebookSave,% + NotebookSaveAs,NotebookSelection,NotebookSetupLayoutInformationPacket,% + NotebooksMenu,% + NotebookWrite,NotElement,NProductExtraFactors,NProductFactors,% + NRoots,NSumExtraTerms,NSumTerms,NumberMarks,% + NumberMultiplier,NumberString,NumericFunction,NumericQ,% + NValues,Offset,OLEData,OneStepRowReduction,% + Open,OpenFunctionInspectorPacket,OpenSpecialOptions,OptimizationLevel,% + OptionInspectorSettings,OptionQ,OptionsPacket,OptionValueBox,% + OptionValueBoxOptions,Orange,Ordering,Oscillatory,% + OutputAutoOverwrite,OutputFormData,OutputGrouping,OutputMathEditExpression,% + OutputNamePacket,OutputToOutputForm,OutputToStandardForm,Over,% + Overflow,Overlaps,Overscript,OverscriptBox,% + OverscriptBoxOptions,OwnValues,PadLeft,PadRight,% + PageBreakAbove,PageBreakBelow,PageBreakWithin,PageFooterLines,% + PageFooters,PageHeaderLines,PageHeaders,PalettePath,% + PaperWidth,ParagraphIndent,ParagraphSpacing,ParameterVariables,% + ParentConnect,ParentForm,Parenthesize,PasteBoxFormInlineCells,% + Path,PatternTest,PeriodicInterpolation,Pick,% + Piecewise,PiecewiseExpand,Pink,Pivoting,% + PixelConstrained,Placeholder,Plain,Plot3Matrix,% + PointForm,PolynomialForm,PolynomialReduce,Polynomials,% + PowerModList,Precedence,PreferencesPath,PreserveStyleSheet,% + Previous,PrimaryPlaceholder,Primes,PrincipalValue,% + PrintAction,PrintingCopies,PrintingOptions,PrintingPageRange,% + PrintingStartingPageNumber,PrintingStyleEnvironment,PrintPrecision,% + PrivateCellOptions,% + PrivateEvaluationOptions,PrivateFontOptions,PrivateNotebookOptions,PrivatePaths,% + ProductLog,PromptForm,Purple,Quantile,% + QuasiMonteCarlo,QuasiNewton,RadicalBox,RadicalBoxOptions,% + RandomSeed,RationalFunctions,Rationals,RawData,% + RawMedium,RealBlockForm,Reals,Reap,% + Red,Refine,Refresh,RegularExpression,% + Reinstall,Release,Removed,RenderingOptions,% + RepeatedString,ReplaceList,Rescale,ResetMenusPacket,% + Resolve,ResumePacket,ReturnExpressionPacket,ReturnInputFormPacket,% + ReturnPacket,ReturnTextPacket,Right,Root,% + RootReduce,RootSum,Row,RowAlignments,% + RowBox,RowLines,RowMinHeight,RowsEqual,% + RowSpacings,RSolve,RuleCondition,RuleForm,% + RulerUnits,Saveable,SaveAutoDelete,ScreenRectangle,% + ScreenStyleEnvironment,ScriptBaselineShifts,ScriptLevel,ScriptMinSize,% + ScriptRules,ScriptSizeMultipliers,ScrollingOptions,ScrollPosition,% + Second,SectionGrouping,Selectable,SelectedNotebook,% + Selection,SelectionAnimate,SelectionCell,SelectionCellCreateCell,% + SelectionCellDefaultStyle,SelectionCellParentStyle,SelectionCreateCell,% + SelectionDuplicateCell,% + SelectionEvaluate,SelectionEvaluateCreateCell,SelectionMove,SelectionSetStyle,% + SelectionStrategy,SendFontInformationToKernel,SequenceHold,SequenceLimit,% + SeriesCoefficient,SetBoxFormNamesPacket,SetEvaluationNotebook,% + SetFileLoadingContext,% + SetNotebookStatusLine,SetOptionsPacket,SetSelectedNotebook,% + SetSpeechParametersPacket,% + SetValue,ShortestMatch,ShowAutoStyles,ShowCellBracket,% + ShowCellLabel,ShowCellTags,ShowClosedCellArea,ShowContents,% + ShowCursorTracker,ShowGroupOpenCloseIcon,ShowPageBreaks,ShowSelection,% + ShowShortBoxForm,ShowSpecialCharacters,ShowStringCharacters,% + ShrinkWrapBoundingBox,% + SingleLetterItalics,SingularityDepth,SingularValueDecomposition,% + SingularValueList,% + SinhIntegral,Smaller,Socket,SolveDelayed,% + SoundAndGraphics,Sow,Space,SpaceForm,% + SpanAdjustments,SpanCharacterRounding,SpanLineThickness,SpanMaxSize,% + SpanMinSize,SpanningCharacters,SpanSymmetric,Sparse,% + SparseArray,SpeakTextPacket,SpellingDictionaries,SpellingDictionariesPath,% + SpellingOptions,SpellingSuggestionsPacket,Spherical,Split,% + SqrtBox,SqrtBoxOptions,StandardDeviation,StandardForm,% + StartingStepSize,StartOfLine,StartOfString,StartupSound,% + StepMonitor,StieltjesGamma,StoppingTest,StringCases,% + StringCount,StringExpression,StringFreeQ,StringQ,% + StringReplaceList,StringReplacePart,StringSplit,StripBoxes,% + StripWrapperBoxes,StructuredSelection,StruveH,StruveL,% + StyleBox,StyleBoxAutoDelete,StyleBoxOptions,StyleData,% + StyleDefinitions,StyleForm,StyleMenuListing,StyleNameDialogSettings,% + StylePrint,StyleSheetPath,Subresultants,SubscriptBox,% + SubscriptBoxOptions,Subsets,Subsuperscript,SubsuperscriptBox,% + SubsuperscriptBoxOptions,SubtractFrom,SubValues,SugarCube,% + SuperscriptBox,SuperscriptBoxOptions,SuspendPacket,SylvesterMatrix,% + SymbolName,Syntax,SyntaxForm,SyntaxPacket,% + SystemException,SystemHelpPath,SystemStub,Tab,% + TabFilling,TabSpacings,TagBox,TagBoxOptions,% + TaggingRules,TagStyle,TargetFunctions,TemporaryVariable,% + TensorQ,TeXSave,TextAlignment,TextBoundingBox,% + TextData,TextJustification,TextLine,TextPacket,% + TextParagraph,TextRendering,TextStyle,ThisLink,% + TimeConstraint,TimeVariable,TitleGrouping,ToBoxes,% + ToColor,ToFileName,Toggle,ToggleFalse,% + Tolerance,TooBig,Top,ToRadicals,% + Total,Tr,TraceAction,TraceInternal,% + TraceLevel,TraditionalForm,TraditionalFunctionNotation,TraditionalNotation,% + TraditionalOrder,TransformationFunctions,TransparentColor,Trapezoidal,% + TrigExpand,TrigFactor,TrigFactorList,TrigReduce,% + TrigToExp,Tuples,UnAlias,Underflow,% + Underoverscript,UnderoverscriptBox,UnderoverscriptBoxOptions,Underscript,% + UnderscriptBox,UnderscriptBoxOptions,UndocumentedTestFEParserPacket,% + UndocumentedTestGetSelectionPacket,% + UnitStep,Up,URL,Using,% + V2Get,Value,ValueBox,ValueBoxOptions,% + ValueForm,Variance,Verbatim,Verbose,% + VerboseConvertToPostScriptPacket,VerifyConvergence,VerifySolutions,Version,% + VersionNumber,Vertical,VerticalForm,ViewPointSelectorSettings,% + Visible,VisibleCell,WeierstrassHalfPeriods,WeierstrassInvariants,% + WeierstrassSigma,WeierstrassZeta,White,Whitespace,% + WhitespaceCharacter,WindowClickSelect,WindowElements,WindowFloating,% + WindowFrame,WindowFrameElements,WindowMargins,WindowMovable,% + WindowSize,WindowTitle,WindowToolbars,WindowWidth,% + WordBoundary,WordCharacter,WynnDegree,XMLElement},% + morendkeywords={$,$AddOnsDirectory,$AnimationDisplayFunction,% + $AnimationFunction,% + $Assumptions,$BaseDirectory,$BoxForms,$ByteOrdering,% + $CharacterEncoding,$ConditionHold,$CurrentLink,$DefaultPath,% + $ExportEncodings,$ExportFormats,$FormatType,$FrontEnd,% + $HistoryLength,$HomeDirectory,$ImportEncodings,$ImportFormats,% + $InitialDirectory,$InstallationDate,$InstallationDirectory,% + $InterfaceEnvironment,% + $LaunchDirectory,$LicenseExpirationDate,$LicenseID,$LicenseProcesses,% + $LicenseServer,$MachineDomain,$MaxExtraPrecision,$MaxLicenseProcesses,% + $MaxNumber,$MaxPiecewiseCases,$MaxPrecision,$MaxRootDegree,% + $MinNumber,$MinPrecision,$NetworkLicense,$NumberMarks,% + $Off,$OutputForms,$ParentLink,$ParentProcessID,% + $PasswordFile,$PathnameSeparator,$PreferencesDirectory,$PrintForms,% + $PrintLiteral,$ProcessID,$ProcessorType,$ProductInformation,% + $ProgramName,$PSDirectDisplay,$RandomState,$RasterFunction,% + $RootDirectory,$SetParentLink,$SoundDisplay,$SuppressInputFormHeads,% + $SystemCharacterEncoding,$SystemID,$TemporaryPrefix,$TextStyle,% + $TopDirectory,$TraceOff,$TraceOn,$TracePattern,% + $TracePostAction,$TracePreAction,$UserAddOnsDirectory,$UserBaseDirectory,% + $UserName,Constant,Flat,HoldAll,% + HoldAllComplete,HoldFirst,HoldRest,Listable,% + Locked,NHoldAll,NHoldFirst,NHoldRest,% + NumericFunction,OneIdentity,Orderless,Protected,% + ReadProtected,SequenceHold},% + }% %% %% Mathematica definitions (c) 1999 Michael Wiese %% @@ -564,7 +883,7 @@ TraceOriginal,TracePrint,TraceScan,Trig,Unevaluated,Uninstall,% UnsameQ,UpperCaseQ,UpValues,ViewCenter,ViewVertical,With,Word,% WordSearch,WordSeparators},% - morendkeywords={Stub,Temporary,$Aborted,$BatchInput,$BatchOutput,% + morendkeywords={Stub,Temporary,$Aborted,$BatchInput,$BatchOutput,% $CreationDate,$DefaultFont,$DumpDates,$DumpSupported,$Failed,% $Input,$Inspector,$IterationLimit,$Language,$Letters,$Linked,% $LinkSupported,$MachineEpsilon,$MachineID,$MachineName,% @@ -605,7 +924,7 @@ FormatType,FortranForm,Fourier,FreeQ,FullDefinition,FullForm,% Function,Gamma,GCD,GegenbauerC,General,Get,Goto,Graphics,% Graphics3D,GrayLevel,Greater,GreaterEqual,Head,HermiteH,% - HiddenSurface,Hold,HoldForm,Hypergeometric0F1, Hypergeometric1F1,% + HiddenSurface,Hold,HoldForm,Hypergeometric0F1,Hypergeometric1F1,% Hypergeometric2F1,HypergeometricU,Identity,IdentityMatrix,If,Im,% Implies,In,Increment,Indent,Infix,Information,Inner,Input,% InputForm,InputString,Insert,Integer,IntegerQ,Integrate,% @@ -670,7 +989,7 @@ %% Octave definition (c) 2001,2002 Ulrich G. Wortmann %% \lst@definelanguage{Octave}% - {morekeywords={gt,lt,gt,lt,amp,abs,acos,acosh,acot,acoth,acsc,acsch,% + {morekeywords={gt,lt,amp,abs,acos,acosh,acot,acoth,acsc,acsch,% all,angle,ans,any,asec,asech,asin,asinh,atan,atan2,atanh,auread,% auwrite,axes,axis,balance,bar,bessel,besselk,bessely,beta,% betainc,betaln,blanks,bone,break,brighten,capture,cart2pol,% @@ -737,10 +1056,11 @@ whatsnew,which,while,white,whitebg,who,whos,wilkinson,wk1read,% stderr,stdout,plot,set,endif,wk1write,xlabel,xor,ylabel,zeros,% zlabel,zoom,endwhile,endfunction,printf,case,switch,otherwise,% - system,lsode,endfor},% - sensitive=f,% + system,lsode,endfor,error,ones,oneplot,__gnuplot_set__,do,until},% + sensitive=t,% morecomment=[l]\#,% morecomment=[l]\#\#,% + morecomment=[l]\%,% morestring=[m]',% morestring=[m]"% }[keywords,comments,strings]% @@ -904,10 +1224,10 @@ or,pass,print,raise,return,try,while},% sensitive=true,% morecomment=[l]\#,% - morecomment=[s]{'''}{'''},% used for documentation text - morecomment=[s]{"""}{"""},% added by Philipp Matthias Hahn morestring=[b]',% - morestring=[b]"% + morestring=[b]",% + morecomment=[s]{'''}{'''},% used for documentation text + morecomment=[s]{"""}{"""}% added by Philipp Matthias Hahn }% %% %% Scilab definition (c) 2002,2003 Jean-Philippe Grivet diff --git a/Master/texmf-dist/tex/latex/listings/lstlang2.sty b/Master/texmf-dist/tex/latex/listings/lstlang2.sty index c95df46f296..aea935ae1df 100644 --- a/Master/texmf-dist/tex/latex/listings/lstlang2.sty +++ b/Master/texmf-dist/tex/latex/listings/lstlang2.sty @@ -4,12 +4,12 @@ %% %% The original source files were: %% -%% lstdrvrs-1.3.dtx (with options: `lang2') +%% lstdrvrs.dtx (with options: `lang2') %% %% The listings package is copyright 1996--2004 Carsten Heinz, and -%% continued maintenance on the package is copyright 2006 Brooks Moses. -%% The drivers are copyright 1997/1998/1999/2000/2001/2002/2003/2004 any -%% individual author listed in this file. +%% continued maintenance on the package is copyright 2006--2007 Brooks Moses. +%% The drivers are copyright 1997/1998/1999/2000/2001/2002/2003/2004/2006/ +%% 2007 any individual author listed in this file. %% %% This file is distributed under the terms of the LaTeX Project Public %% License from CTAN archives in directory macros/latex/base/lppl.txt. @@ -67,7 +67,7 @@ transfer-dynpro,translate,type,unpack,update,user-command,% using,value,when,where,while,window,with,workfile,write,},% morecomment=[l]",% - morecomment=[f][0]*,% + morecomment=[f][commentstyle][0]*,% morestring=[d]'% }[keywords,comments,strings,procnames] \lst@definelanguage[R/2 4.3]{ABAP}[R/2 5.0]{ABAP}% @@ -1351,7 +1351,18 @@ morecomment=[s]{=BEGIN}{=END},% morestring=[b]',% morestring=[b]",% - morestring=[b]/% + morestring=[s]{\%q/}{/},% + morestring=[s]{\%q!}{!},% + morestring=[s]{\%q\{}{\}},% + morestring=[s]{\%q(}{)},% + morestring=[s]{\%q[}{]},% + morestring=[s]{\%q-}{-},% + morestring=[s]{\%Q/}{/},% + morestring=[s]{\%Q!}{!},% + morestring=[s]{\%Q\{}{\}},% + morestring=[s]{\%Q(}{)},% + morestring=[s]{\%Q[}{]},% + morestring=[s]{\%Q-}{-}% }[keywords,comments,strings]% %% %% SHELXL definition (c) 1999 Aidan Philip Heerdegen @@ -1452,13 +1463,10 @@ hypot,log,log10,pow,sin,sinh,sqrt,tan,tanh,abs,double,int,round% },% morestring=[d]",% - MoreSelectCharTable=% - \lst@CArgX\#\relax\lst@DefDelimB{}{}% - {\ifx\lst@lastother\lstum@backslash - \expandafter\@gobblethree - \fi}% - \lst@BeginComment\lst@commentmode - {{\lst@commentstyle}\lst@Lmodetrue}% + morecomment=[f]\#,% + morecomment=[l]{;\#},% + morecomment=[l]{[\#},% + morecomment=[l]{\{\#}% }[keywords,comments,strings]% %% %% VBScript definition (c) 2000 Sonja Weidmann diff --git a/Master/texmf-dist/tex/latex/listings/lstlang3.sty b/Master/texmf-dist/tex/latex/listings/lstlang3.sty index 09652d7cce2..726bfa51d1f 100644 --- a/Master/texmf-dist/tex/latex/listings/lstlang3.sty +++ b/Master/texmf-dist/tex/latex/listings/lstlang3.sty @@ -4,12 +4,12 @@ %% %% The original source files were: %% -%% lstdrvrs-1.3.dtx (with options: `lang3') +%% lstdrvrs.dtx (with options: `lang3') %% %% The listings package is copyright 1996--2004 Carsten Heinz, and -%% continued maintenance on the package is copyright 2006 Brooks Moses. -%% The drivers are copyright 1997/1998/1999/2000/2001/2002/2003/2004 any -%% individual author listed in this file. +%% continued maintenance on the package is copyright 2006--2007 Brooks Moses. +%% The drivers are copyright 1997/1998/1999/2000/2001/2002/2003/2004/2006/ +%% 2007 any individual author listed in this file. %% %% This file is distributed under the terms of the LaTeX Project Public %% License from CTAN archives in directory macros/latex/base/lppl.txt. @@ -43,6 +43,22 @@ keywordcommentsemicolon={end}{else,end}{comment}% }[keywords,keywordcomments]% %% +%% Motorola 68K definition (c) 2006 Michael Franke +%% +\lst@definelanguage[Motorola68k]{Assembler}% + {morekeywords={ABCD,ADD,% +ADDA,ADDI,ADDQ,ADDX,AND,ANDI,ASL,ASR,BCC,BLS,BCS,BLT,BEQ,BMI,BF,BNE,BGE,BPL,% +BGT,BT,BHI,BVC,BLE,BVS,BCHG,BCLR,BRA,BSET,BSR,BTST,CHK,CLR,CMP,CMPA,CMPI,CMPM,% +DBCC,DBLS,DBCS,DBLT,DBEQ,DBMI,DBF,DBNE,DBGE,DBPL,DBGT,DBT,DBHI,DBVC,DBLE,DBVS,DIVS,% +DIVU,EOR,EORI,EXG,EXT,ILLEGAL,JMP,JSR,LEA,LINK,LSL,LSR,MOVE,MOVEA,MOVEM,MOVEP,MOVEQ,% +MULS,MULU,NBCD,NEG,NEGX,NOP,NOT,OR,ORI,PEA,RESET,ROL,ROR,ROXL,ROXR,RTE,RTR,RTS,SBCD,% +SCC,SLS,SCS,SLT,SEQ,SMI,SF,SNE,SGE,SPL,SGT,ST,SHI,SVC,SLE,SVS,STOP,SUB,SUBA,SUBI,SUBQ,% +SUBX,SWAP,TAS,TRAP,TRAPV,TST,UNLK},% + sensitive=false,% + morecomment=[l]*,% + morecomment=[l];% + }[keywords,comments,strings] +%% %% x86masm definition (c) 2002 Andrew Zabolotny %% \lst@definelanguage[x86masm]{Assembler}% @@ -107,6 +123,44 @@ morecomment=[n]{/*}{*/},% morestring=[b]"% }[keywords,comments,strings]% +\lstdefinelanguage{CIL}% + {morekeywords=[1]{assembly,beforefieldinit,class,default,cdecl,cil,corflags,% + culture,custom,data,entrypoint,fastcall,field,file,% + hidebysig,hash,il,imagebase,locals,managed,marshall,% + maxstack,mresource,method,module,namespace,publickey,% + stdcall,subsystem,thiscall,unmanaged,vararg,ver,vtfixup,% + % types + bool,char,float32,float64,int,int8,int16,int32,% + int64,method,native,object,string,modopt,modreq,pinned,% + typedref,valuetype,unsigned,void,% + % defining types + abstract,ansi,auto,autochar,beforefieldinit,boxed,class,% + explicit,extends,implements,interface,famandassem,family,% + famorassem,inherits,nested,override,pack,private,property,% + public,rtspecialname,sealed,sequential,serializable,size,% + specialname,static,unicode,% + % postfix + algorithm,alignment,extern,init,from,nometadata,with},% + morekeywords=[2]{add,and,arglist,beq,bge,bgt,ble,blt,bne,br,break,brfalse,% + brtrue,call,calli,ceq,cgt,ckfinite,clt,conv,cpblk,div,% + dup,endfilter,endfinally,initblk,jmp,ldarg,ldarga,ldc,% + ldftn,ldind,ldloc,ldloca,ldnull,leave,localloc,mul,neg,% + nop,not,or,pop,rem,ret,shl,shr,starg,stind,stloc,sub,% + switch,xor,% + % prefix + tail,unaligned,volatile,% + % postfix + un,s,ovf,% + % object + box,callvirt,castclass,cpobj,cctor,ctor,initobj,isinst,% + ldelem,ldelema,ldfld,ldflda,ldlen,ldobj,ldsfld,ldsflda,% + ldstr,ldtoken,ldvirtftn,mkrefany,newarr,newobj,refanytype,% + refanyval,rethrow,sizeof,stelem,stfld,stobj,stsfld,throw,% + unbox},% + sensitive=true,% + morecomment=[l]{//},% + morestring=[b]"% +}[keywords,comments,strings]% \lst@definelanguage{Comal 80}% {morekeywords={AND,AUTO,CASE,DATA,DEL,DIM,DIV,DO,ELSE,ENDCASE,ENDIF,% ENDPROC,ENDWHILE,EOD,EXEC,FALSE,FOR,GOTO,IF,INPUT,INT,LIST,LOAD,% @@ -116,6 +170,128 @@ morecomment=[l]//,% morestring=[d]"% }[keywords,comments,strings]% +\lst@definelanguage[WinXP]{command.com}% + {morekeywords={assoc,at,attrib,bootcfg,break,cacls,call,cd,chcp,chdir,% + chkdsk,chkntfs,cls,cmd,cmdextversion,color,comp,compact,convert,copy,% + date,defined,del,dir,diskcomp,diskcopy,do,doskey,echo,else,endlocal,% + erase,errorlevel,exist,exit,fc,find,findstr,for,format,ftype,goto,% + graftabl,help,if,in,label,md,mkdir,mode,more,move,not,off,path,% + pause,popd,print,prompt,pushd,rd,recover,ren,rename,replace,rmdir,% + set,setlocal,shift,sort,start,subst,time,title,tree,type,ver,% + verify,vol,xcopy},% + sensitive=false,% + alsoother={@},% + alsoletter={\%~:-/},% + morecomment=[l]{rem},% + morecomment=[l]{reM},% + morecomment=[l]{rEm},% + morecomment=[l]{rEM},% + morecomment=[l]{Rem},% + morecomment=[l]{ReM},% + morecomment=[l]{REm},% + morecomment=[l]{REM},% + morestring=[d]"% +}[keywords,comments,strings]% +\lst@definelanguage{Comsol}% + {morekeywords={% + adaption,arc1,arc2,arrayr,assemble,asseminit,beziercurve2,block2,% + block3,bsplinecurve2,bsplinecurve3,bsplinesurf3,bypassplot,cardg,% + ccoeffgroup,chamfer,checkgeom,circ1,circ2,coeff2cell,comsol,% + cone2,cone3,Contents,createhexes,createprisms,createquads,csgbl2,% + csgbl3,csgcmpbz,csgimplbz,csginitaux,csginitnr,csgproputil,% + csgrbconv,csgunique3,csguniquep,csgversion,csgvvovl,curve2,% + curve3,cylinder2,cylinder3,dat2str,defastget,display,drawgetobj,% + drawreobj,drawsetobj,dst,duplicate,dxflayers,dxfread,dxfwrite,% + econe2,econe3,eigloop,elcconstr,elcplbnd,elcplextr,elcplproj,% + elcplscalar,elempty,elemreobj,eleqc,eleqw,elevate,elgeom,ellip1,% + ellip2,ellipsoid2,ellipsoid3,ellipsoidgen_fl23,elmat,elovar,% + elpconstr,elshape,elvar,elvarm,embed,extrude,face3,faceprim3,% + fastsetop,fem2jxfem,femblocksu,femdiff,femeig,femexport,femgui,% + femimport,femiter,femlab,femlin,femmesh,femmeshexp,femnlin,% + femplot,femsfun,femsim,femsimlowlevel,femsimserver,femsol,% + femsolver,femstate,femstruct,femtime,femwave,festyle,fieldnames,% + fillet,fl1d,fl2d,fl3d,flaction,flafun,flappconvert,flappobj,% + flaxisequal,flbase,flbinary,flc1hs,flc2hs,flcanpnt,flcell2draw,% + flclear,flcolorbar,flcompact,flconeplot,flcontour2mesh,% + flcontour2meshaux,flconvreact,flconvreact1d,flconvreact2d,% + flconvreact3d,flcyl,fldc1hs,fldc2hs,fldegree,fldegreer3,% + fldegreet3,fldimvarsget,fldisp,fldraw2cell,fldrawnow,fldsmhs,% + fldsmsign,flevalmat,flexch,flexchprop,flfastgeom,flform,flgc,% + flgcbo,flgdconv,flgeom2cellstr,flgeomadj,flgeomarcize,flgeomec,% + flgeomed,flgeomepol,flgeomes,flgeomfc,flgeomfd,flgeomfdp,% + flgeomff1,flgeomff2,flgeomfn,flgeomfs,flgeomgetlocalsys,% + flgeominit,flgeominitprop,flgeomitransform,flgeomloft,flgeommesh,% + flgeomnbs,flgeomnes,flgeomnmr,flgeomnv,flgeompsinv,flgeomrmsing,% + flgeomrotp,flgeomsd,flgeomsdim,flgeomse,flgeomsf2,flgeomspm,% + flgeomtransform,flgeomud,flgeomvtx,flgetdraw,flheat,flheat1d,% + flheat2d,flheat3d,flhelmholtz,flhelmholtz1d,flhelmholtz2d,% + flhelmholtz3d,flim2curve,flinterp1,fliscont,flismember,% + flisnumeric,fljaction,fllaplace,fllaplace1d,fllaplace2d,% + fllaplace3d,flload,flloadfl,flloadmatfile,flloadmfile,% + fllobj2cellstr,flmakeevalstr,flmapsoljac,flmat2str,flmatch,% + flmesh2spline,flmesh2splineaux,flml65setup,flngdof,flnull,% + flnullorth,flpde,flpdeac,flpdec,flpdec1d,flpdec2d,flpdec3d,% + flpdedc,flpdedc2d,flpdedc3d,flpdedf,flpdedf1d,flpdedf2d,% + flpdedf3d,flpdees,flpdees2d,flpdees3d,flpdeg,flpdeg1d,flpdeg2d,% + flpdeg3d,flpdeht,flpdeht1d,flpdeht2d,flpdeht3d,flpdems,flpdems2d,% + flpdems3d,flpdens,flpdens2d,flpdens3d,flpdepn,flpdeps,flpdesm3d,% + flpdew,flpdew1d,flpdew2d,flpdew3d,flpdewb,flpdewb1d,flpdewb2d,% + flpdewb3d,flpdewc,flpdewc1d,flpdewc2d,flpdewc3d,flpdewe,% + flpdewe3d,flpdewp,flpdewp2d,flpdewp3d,flplot,flpoisson,% + flpoisson1d,flpoisson2d,flpoisson3d,flpric2,flpric3,flreobj,% + flreport,flresolvepath,flsave,flschrodinger,flschrodinger1d,% + flschrodinger2d,flschrodinger3d,flsde,flsdp,flsdt,flsetalpha,% + flsetdraw,flsmhs,flsmsign,flspnull,fltherm_cond1,fltrg,flversion,% + flversions,flverver,flwave,flwave1d,flwave2d,flwave3d,% + flwriteghist,formstr,gdsread,gencyl2,gencyl3,genextrude,% + genextrudeaux,geom,geom0,geom0get,geom1,geom1get,geom2,geom2get,% + geom3,geom3get,geom3j2m,geom3m2j,geomaddlblmargin,geomanalyze,% + geomarrayr,geomassign,geomcoerce,geomcomp,geomconnect,geomcopy,% + geomcsg,geomdel,geomedit,geomexport,geomfile,geomget,% + geomgetlabels,geomgetwrkpln,geomimport,geominfo,geominfoaux,% + geomlblplot,geomload,geomnumparse,geomobject,geomparse,geomplot,% + geomplot1,geomplot2,geomplot3,geomposition,geomproputil,% + geomreconstruct,geomreobj,geomserver,geomspline,geomsurf,% + geomupdate,get,getfemgeom,getisocurve,getjptr,getmesh,getsdim,% + getvmatrixexch,handlesolnumstr,helix1,helix2,helix3,hexahedron2,% + hexahedron3,histfrommat,idst,igesread,importplotdata,isempty,% + isfield,isfunc,isscript,javaclass,jproputil,jptr2geom,jptrgeom1,% + jptrgeom1_fl23,jptrgeom2,jptrgeom2_fl23,jptrgeom3,jptrgeom3_fl23,% + keiter,line1,line2,loadobj,loft,matlabinterpdata,mesh2geom,% + meshassign,meshcaseadd,meshcasedel,meshcaseutil,meshcheck,% + meshembed,meshenrich,meshenrich1,meshenrich2,meshenrich3,% + meshexport,meshextend,meshextrude,meshget,meshimport,meshinit,% + meshintegrate,meshmap,meshoptim,meshparse,meshplot,meshplot1,% + meshplot2,meshplot3,meshplotproputil,meshpoi,meshproputil,% + meshptplot,meshqual,meshrefine,meshrevolve,meshsmooth,% + meshsmooth2,meshsweep,meshvolume,minus,mirror,mkreflparams,% + mmsolve,modetype,move,moveglobalfields,mphproputil,mtimes,% + multiphysics,mypostinterp,notscript,onlyelsconstr,outassign,% + paramgeom,pde2draw,pde2equ,pde2fem,pde2geom,pdeblxpd,plus,point1,% + point2,point3,poisson,poly1,poly2,postanim,postapplysettings,% + postarrow,postarrowbnd,postcolorbar,postcont,postcontdomind,% + postcoord,postcopyprop,postcrossplot,postdistrprops,posteval,% + postflow,postfnd,postgeomplot,postgetfem,postgetstylecolor,% + postglobaleval,postglobalplot,postgp,postinit,postint,postinterp,% + postiso,postlin,postmakecontcol,postmax,postmaxmin,postmin,% + postmkcontbar,postmknormexpr,postmovie,postnewplot,% + postoldmaxminprops,postpd2pm,postplot,postplotconstants,% + postpm2pd,postprinc,postprincbnd,postprocgui,postproputil,% + postslice,postsurf,posttet,posttitle,print2file,pyramid2,% + pyramid3,rect1,rect2,restorefields,revolve,rmfield,rotate,% + rotmatrix,scale,serialize,set,setmesh,sh2str,sharg_2_5,shbub,% + shdisc,shdiv,shherm,shlag,shvec,simplecoerce,simreobj,slblocks,% + solassign,solid0,solid1,solid2,solid3,solidprim3,solproputil,% + solsize,solveraddcases,sphere2,sphere3,spiceimport,splineaux,% + split,splittoprim,square1,square2,stlread,submode,submodes,% + subsasgn,subsref,tangent,taucs,tetrahedron2,tetrahedron3,% + tobsplines,torus2,torus3,transform,update,updateassoc,% + updateassocinfo,updatefem,updateguistruct,updateobj,vrmlread,% + xmeshinfo,xmeshinit},% + sensitive=false,% + morecomment=[l]\%,% + morestring=[m]'% + }[keywords,comments,strings]% \lst@definelanguage{Elan}% {morekeywords={ABS,AND,BOOL,CAND,CASE,CAT,COLUMNS,CONCR,CONJ,CONST,% COR,DECR,DEFINES,DET,DIV,DOWNTO,ELIF,ELSE,END,ENDIF,ENDOP,% @@ -167,6 +343,190 @@ morestring=[d]',% morestring=[d]`% }[keywords,comments,strings]% +\lst@definelanguage{Lingo} + {morekeywords={abort,after,and,before,do,down,halt,me,new,not,of,% + on,or,otherwise,pass,put,result,return,set,tell,the,then,to,with,% + repeat,while,case,if,else,true,false,global,property,\_global,\_key,% + \_mouse,\_movie,\_player,\_sound,\_system,abbr,abbrev,abbreviated,abs,% + actionsenabled,activateapplication,activatewindow,active3drenderer,% + activecastlib,activewindow,actorlist,add,addat,addbackdrop,addcamera,% + addchild,addmodifier,addoverlay,addprop,addtoworld,addvertex,alert,% + alerthook,alignment,allowcustomcaching,allowgraphicmenu,allowsavelocal,% + allowtransportcontrol,allowvolumecontrol,allowzooming,alphathreshold,% + ambient,ambientcolor,ancestor,angle,anglebetween,animationenabled,% + antialias,antialiasthreshold,append,applicationname,applicationpath,% + appminimize,atan,attenuation,attributevalue,auto,autoblend,automask,% + autotab,axisangle,back,backcolor,backdrop,backgroundcolor,backspace,% + beep,beepon,beginrecording,beginsprite,beveldepth,beveltype,bgcolor,% + bias,bitand,bitmap,bitmapsizes,bitnot,bitor,bitrate,bitspersample,% + bitxor,blend,blendconstant,blendconstantlist,blendfactor,blendfunction,% + blendfunctionlist,blendlevel,blendrange,blendsource,blendsourcelist,% + blendtime,bone,bonesplayer,border,both,bottom,bottomcap,bottomradius,% + bottomspacing,boundary,boundingsphere,box,boxdropshadow,boxtype,% + breakconnection,breakloop,brightness,broadcastprops,browsername,% + buffersize,build,buttonsenabled,buttonstyle,buttontype,bytesstreamed,% + boolean,cachedocverify,cachesize,call,callancestor,camera,cameracount,% + cameraposition,camerarotation,cancelidleload,castlib,castlibnum,% + castmemberlist,center,centerregpoint,centerstage,changearea,channelcount,% + char,characterset,charpostoloc,chars,charspacing,chartonum,% + checkboxaccess,checkboxtype,checkmark,checknetmessages,child,chunksize,% + clearatrender,clearcache,clearerror,clearframe,clearglobals,clearvalue,% + clickloc,clickmode,clickon,clone,clonedeep,clonemodelfromcastmember,% + clonemotionfromcastmember,close,closed,closewindow,closexlib,collision,% + collisiondata,collisionnormal,color,world,colorbuffer,colorbufferdepth,% + colordepth,colorlist,colorrange,colors,colorsteps,commanddown,comments,% + compressed,connecttonetserver,constrainh,constraint,constrainv,,% + continue,controldown,controller,copypixels,copyrightinfo,copyto,% + copytoclipboard,cos,count,cpuhogticks,creaseangle,creases,[contains],% + createfolder,createmask,creatematte,creationdate,creator,crop,cross,% + crossproduct,cuepassed,cuepointnames,cuepointtimes,currentloopstate,% + currentspritenum,currenttime,cursor,cursorsize,curve,cylinder,ate,day,% + deactivateapplication,deactivatewindow,debug,debugplaybackenabled,% + decaymode,defaultrect,defaultrectmode,delay,delete,deleteall,deleteat,% + deletecamera,deletefolder,deleteframe,deletegroup,deletelight,% + deletemodel,deletemodelresource,deletemotion,deleteone,deleteprop,% + deleteshader,deletetexture,deletevertex,density,depth,depthbufferdepth,% + desktoprectlist,diffuse,diffusecolor,diffuselightmap,% + digitalvideotimescale,digitalvideotype,direction,directionalcolor,% + directionalpreset,directtostage,disableimagingtransformation,displayface,% + displaymode,distanceto,distribution,dither,done,doneparsing,dot,% + dotproduct,doubleclick,downloadnetthing,drag,draw,drawrect,dropshadow,% + duplicate,duplicateframe,duration,editable,editshortcutsenabled,% + elapsedtime,emissive,emitter,empty,emulatemultibuttonmouse,enabled,% + enablehotspot,end,endangle,endcolor,endframe,endrecording,endsprite,% + endtime,enter,enterframe,environment,erase,error,eventpassmode,% + exchange,exists,exit,exitframe,exitlock,exp,externalevent,% + externalparamcount,externalparamname,externalparamvalue,extractalpha,% + extrude3d,face,fadein,fadeout,fadeto,far,field,fieldofview,filename,% + fill,fillcolor,fillcycles,filldirection,filled,fillmode,filloffset,% + fillscale,findempty,findlabel,findpos,findposnear,finishidleload,% + firstindent,fixedlinespace,fixedrate,fixstagesize,flashrect,flashtostage,% + flat,fliph,flipv,float,floatp,floatprecision,flush,flushinputevents,% + fog,folderchar,font,fontsize,fontstyle,forecolor,forget,frame,% + framecount,framelabel,framepalette,framerate,frameready,framescript,% + framesound1,framesound2,framestohms,frametempo,frametransition,freeblock,% + freebytes,fromcastmember,fromimageobject,front,frontwindow,% + generatenormals,getaprop,getat,getbehaviordescription,getbehaviortooltip,% + getboneid,geterror,geterrorstring,gethardwareinfo,gethotspotrect,getlast,% + getlatestnetid,getnetaddresscookie,getneterrorstring,getnetmessage,% + getnetoutgoingbytes,getnettext,getnormalized,getnthfilenameinfolder,% + getnumberwaitingnetmessages,getone,getpeerconnectionlist,getpixel,% + getplaylist,getpos,getpref,getprop,getpropat,getpropertydescriptionlist,% + getrendererservices,getstreamstatus,gettemppath,getworldtransform,globals,% + glossmap,go,gotoframe,gotonetmovie,gotonetpage,gradienttype,gravity,% + group,handler,handlers,height,heightvertices,high,highlightpercentage,% + highlightstrength,hilite,hither,hittest,hmstoframes,hold,hotspot,html,% + hyperlink,hyperlinkclicked,hyperlinkrange,hyperlinks,hyperlinkstate,% + id3tags,identity,idle,idlehandlerperiod,idleloaddone,idleloadmode,% + idleloadperiod,idleloadtag,idlereadchunksize,ilk,image,imagecompression,% + imageenabled,imagequality,immovable,importfileinto,inflate,ink,inker,% + inlineimeenabled,insertbackdrop,insertframe,insertoverlay,inside,% + installmenu,instance,integer,integerp,interface,interpolate,% + interpolateto,intersect,index,interval,inverse,invert,invertmask,% + isbusy,isinworld,isoktoattach,ispastcuepoint,item,itemdelimiter,kerning,% + kerningthreshold,key,keyboardfocussprite,keycode,keydown,keydownscript,% + keyframeplayer,keypressed,keyup,keyupscript,label,labellist,last,% + lastchannel,lastclick,lastevent,lastframe,lastkey,lastroll,left,% + leftindent,length,lengthvertices,level,lifetime,light,line,linearlist,% + linecolor,linecount,linedirection,lineheight,lineoffset,linepostolocv,% + linesize,linkas,linked,list,listp,loaded,loadfile,loc,loch,locked,% + locktranslation,loctocharpos,locv,locvtolinepos,locz,lod,log,long,% + loop,loopcount,loopendtime,loopsremaining,loopstarttime,machinetype,% + magnitude,map,mapImageToStage,mapmembertostage,mapstagetomember,margin,% + marker,markerlist,mask,max,maxinteger,maxspeed,mci,media,mediaready,% + member,membernum,members,memorysize,menu,mesh,meshdeform,milliseconds,% + min,minspeed,modal,mode,model,modela,modelb,modelresource,% + modelsunderloc,modelsunderray,modelunderloc,modified,modifiedby,% + modifieddate,modifier,modifiers,month,mostrecentcuepoint,motion,% + mousechar,mousedown,mousedownscript,mouseenter,mouseh,mouseitem,% + mouseleave,mouselevel,mouseline,mouseloc,mousemember,mouseoverbutton,% + mouseup,mouseupoutside,mouseupscript,mousev,mousewithin,mouseword,move,% + moveablesprite,movetoback,movetofront,movevertex,movevertexhandle,% + movewindow,movie,movieaboutinfo,moviecopyrightinfo,moviefilefreesize,% + moviefilesize,moviefileversion,movieimagecompression,movieimagequality,% + moviename,moviepath,movierate,movietime,moviextralist,mpeglayer,% + multiply,multisound,name,near,nearfiltering,neighbor,netabort,netdone,% + neterror,netlastmoddate,netmime,netpresent,netstatus,nettextresult,% + netthrottleticks,newcamera,newcurve,newgroup,newlight,newmesh,newmodel,% + newmodelresource,newmotion,newshader,newtexture,next,none,normalize,% + normallist,normals,nothing,notify,nudge,number,numchannels,% + numparticles,numsegments,numtochar,objectp,offset,open,openresfile,% + openwindow,openxlib,optiondown,organizationname,originalfont,originh,% + originmode,originpoint,originv,orthoheight,overlay,pageheight,palette,% + palettemapping,paletteref,paletteindex,pan,paragraph,param,paramcount,% + parent,parsestring,particle,pasteclipboardinto,path,pathname,% + pathstrength,pattern,pause,pausedatstart,pausestate,percentplayed,% + percentstreamed,period,perpendicularto,persistent,pi,picture,picturep,% + plane,platform,play,playbackmode,playfile,playing,playlist,playnext,% + playrate,point,pointat,pointatorientation,pointinhyperlink,% + pointofcontact,pointtochar,pointtoitem,pointtoline,pointtoparagraph,% + pointtoword,position,positionreset,posterframe,postnettext,power,% + preferred3drenderer,preload,preloadbuffer,preloadeventabort,preloadmember,% + preloadmode,preloadmovie,preloadnetthing,preloadram,preloadtime,% + premultiply,prepareframe,preparemovie,prerotate,prescale,pretranslate,% + previous,primitives,printfrom,productversion,projection,projectionangle,% + propList,proxyserver,pttohotspotid,puppet,puppetpalette,puppetsound,% + puppetsprite,puppettempo,puppettransition,purgepriority,% + qtregisteraccesskey,qtunregisteraccesskey,quad,quality,queue,quit,quote,% + radius,ramneeded,random,randomseed,randomvector,rateshift,rawnew,read,% + readvalue,recordfont,rect,ref,reflectionmap,reflectivity,region,% + registerforevent,registerscript,regpoint,regpointvertex,removebackdrop,% + removefromworld,removelast,removemodifier,removeoverlay,rename,renderer,% + rendererdevicelist,renderformat,renderstyle,resetworld,resizewindow,% + resolution,resolve,resolvea,resolveb,resource,restart,resume,% + reverttoworlddefaults,rewind,rgb,rgba4444,rgba5550,rgba5551,rgba5650,% + rgba8880,rgba8888,right,rightindent,rightmousedown,rightmouseup,% + rollover,romanlingo,rootlock,rootnode,rotate,rotation,rotationreset,% + rtf,runmode,runpropertydialog,safeplayer,samplecount,samplerate,% + samplesize,save,savedlocal,savemovie,scale,scalemode,score,scorecolor,% + scoreselection,script,scriptexecutionstyle,scriptinstancelist,scriptlist,% + scriptnum,scriptsenabled,scripttext,scripttype,scrollbyline,scrollbypage,% + scrolltop,sds,searchcurrentfolder,searchpath,searchpaths,seconds,% + selectedtext,selection,selend,selstart,sendallsprites,sendevent,% + sendnetmessage,sendsprite,serialnumber,setalpha,setaprop,setat,% + setcollisioncallback,setflashproperty,setnetbufferlimits,% + setnetmessagehandler,setpixel,setplaylist,setpref,setprop,setscriptlist,% + settrackenabled,setvariable,shader,shaderlist,shadowpercentage,% + shadowstrength,shapetype,shiftdown,shininess,shockwave3d,short,% + showglobals,showlocals,showprops,showresfile,showxlib,shutdown,% + silhouettes,sin,size,sizerange,skew,sleep,smoothness,sort,sound,% + soundbusy,soundchannel,sounddevice,sounddevicelist,soundenabled,% + soundkeepdevice,soundlevel,soundmixmedia,source,sourcerect,space,% + specular,specularcolor,specularlightmap,sphere,spotangle,spotdecay,% + sprite,spritenum,spritespacetoworldspace,sqrt,stage,stagebottom,% + stagecolor,stageleft,stageright,stagetoflash,stagetop,standard,% + startangle,startframe,startmovie,starttime,starttimer,state,static,% + status,stepframe,stilldown,stop,stopevent,stopmovie,stoptime,stream,% + streammode,streamname,streamsize,streamstatus,string,stringp,% + strokecolor,strokewidth,style,subdivision,sweep,swing,switchcolordepth,% + symbol,symbolp,systemdate,tab,tabcount,tabs,tan,target,% + tellstreamstatus,tension,text,texture,texturecoordinatelist,% + texturecoordinates,texturelayer,texturelist,texturemember,texturemode,% + texturemodelist,texturerenderformat,texturerepeat,texturerepeatlist,% + texturetransform,texturetransformlist,texturetype,thumbnail,ticks,tilt,% + time,timeout,timeouthandler,timeoutkeydown,timeoutlapsed,timeoutlength,% + timeoutlist,timeoutmouse,timeoutplay,timeoutscript,timer,timescale,% + title,titlevisible,toon,top,topcap,topradius,topspacing,trace,% + traceload,tracelogfile,trackcount,trackenabled,tracknextkeytime,% + tracknextsampletime,trackpreviouskeytime,trackprevioussampletime,% + trackstarttime,trackstoptime,tracktext,tracktype,trails,transform,% + transitiontype,translate,triggercallback,trimwhitespace,tunneldepth,% + tweened,tweenmode,type,[transparent],union,unload,unloadmember,% + unloadmovie,unregisterallevents,update,updateframe,updatelock,% + updatemovieenabled,updatestage,url,usealpha,usediffusewithtexture,% + usefastquads,usehypertextstyles,uselineoffset,userdata,username,value,% + vector,version,vertex,vertexlist,vertices,video,videoforwindowspresent,% + viewh,viewpoint,viewscale,viewv,visibility,visible,void,voidp,volume,% + volumeinfo,wait,waitfornetconnection,warpmode,width,widthvertices,wind,% + window,windowlist,windowpresent,windowtype,word,wordwrap,world,% + worldposition,worldspacetospritespace,worldtransform,wraptransform,% + wraptransformlist,write,writevalue,,xaxis,xtra,xtralist,xtras,,yaxis,% + year,yon,zaxis,zoombox,zoomwindow,repeat,Conditional,Boolean,TypeDef,% + Statement,Operator,String,Comment,Identifier,Special,x,y,z} + sensitive=false, + morecomment=[l]{--}, + morestring=[b]", + }[keywords,comments,strings]% \lst@definelanguage{Logo}% {morekeywords={and,atan,arctan,both,break,bf,bl,butfirst,butlast,% cbreak, close,co,continue,cos,count,clearscreen,cs,debquit,% @@ -453,6 +813,62 @@ morestring=[d]'% }[keywords,comments,strings]% %% +%% PostScript language definition (c) 2005 Christophe Jorssen. +%% +\lst@definelanguage{PostScript}{% + morekeywords={abs,add,aload,anchorsearch,and,arc,arcn,arct,arcto,array,ashow, + astore,atan,awidthshow,begin,bind,bitshift,bytesavailable,cachestatus, + ceiling,charpath,clear,cleartomark,cleardictstack,clip,clippath,closefile, + closepath,colorimage,concat,concatmatrix,condition,copy,copypage,cos,count, + countdictstack,countexecstack,counttomark,cshow,currentblackgeneration, + currentcacheparams,currentcmykcolor,currentcolor,currentcolorrendering, + currentcolorscreen,currentcolorspace,currentcolortransfer,currentcontext, + currentdash,currentdevparams,currentdict,currentfile,currentflat,currentfont, + currentglobal,currentgray,currentgstate,currenthalftone,currenthalftonephase, + currenthsbcolor,currentlinecap,currentlinejoin,currentlinewidth,currentmatrix, + currentmiterlimit,currentobjectformat,currentpacking,currentpagedevice, + currentpoint,currentrgbcolor,currentscreen,currentshared,currentstrokeadjust, + currentsystemparams,currenttransfer,currentundercolorremoval,currentuserparams, + curveto,cvi,cvlit,cvn,cvr,cvrs,cvs,cvx,def,defaultmatrix,definefont, + defineresource,defineusername,defineuserobject,deletefile,detach,deviceinfo, + dict,dictstack,div,dtransform,dup, + echo,eexec,end,eoclip,eofill,eoviewclip,eq,erasepage,errordict,exch,exec, + execform,execstack,execuserobject,executeonly,executive,exit, + exp,false,file,filenameforall,fileposition,fill,filter,findencoding,findfont, + findresource,flattenpath,floor,flush,flushfile,FontDirectory,for,forall,fork,ge, + get,getinterval,globaldict,GlobalFontDirectory,glyphshow,grestore,grestoreall, + gsave,gstate,gt,identmatrix,idiv,idtransform,if,ifelse,image, + imagemask,index,ineofill,infill,initclip,initgraphics,initmatrix,initviewclip, + instroke,internaldict,inueofill,inufill,inustroke, + invertmatrix,ISOLatin1Encoding,itransform,join,kshow, + known,languagelevel,le,length,lineto,ln,load,lock,log,loop,lt, + makefont,makepattern,mark,matrix,maxlength,mod,monitor,moveto,mul,ne,neg, + newpath,noaccess,not,notify,null,nulldevice,or,packedarray, + pathbbox,pathforall,pop,print,printobject,product,prompt,pstack,put,putinterval, + quit,rand,rcurveto,read,readhexstring,readline,readonly,readstring, + realtime,rectclip,rectfill,rectstroke,rectviewclip,renamefile,repeat,resetfile, + resourceforall,resourcestatus,restore,reversepath,revision,rlineto,rmoveto,roll, + rootfont,rotate,round,rrand,run,save,scale,scalefont,scheck,search,selectfont, + serialnumber,setbbox,setblackgeneration,setcachedevice,setcachedevice2, + setcachelimit,setcacheparams,setcharwidth,setcmykcolor,setcolor, + setcolorrendering,setcolorscreen,setcolorspace,setcolortransfer,setdash, + setdevparams,setfileposition,setflat,setfont,setglobal,setgray,setgstate, + sethalftone,sethalftonephase,sethsbcolor,setlinecap,setlinejoin,setlinewidth, + setmatrix,setmiterlimit,setobjectformat,setoverprint,setpacking,setpagedevice, + setpattern,setrgbcolor,setscreen,setshared,setstrokeadjust,setsystemparams, + settransfer,setucacheparams,setundercolorremoval,setuserparams,setvmthreshold, + shareddict,show,showpage,sin,sqrt,srand,stack, + StandardEncoding,start,startjob,status,statusdict,stop,stopped,store,string, + stringwidth,stroke,strokepath,sub,systemdict,transform, + translate,true,truncate,type,token,uappend,ucache,ucachestatus, + ueofill,ufill,undef, + upath,userdict,UserObjects, + usertime,ustroke,ustrokepath,version,viewclip,viewclippath,vmreclaim, + vmstatus,wait,wcheck,where,widthshow,write,writehexstring,writeobject, + writestring,wtranslation,xcheck,xor,xshow,xyshow,yield,yshow}, + sensitive, + morecomment=[l]\%}[keywords,comments] +%% %% Promela definition (c) 2004 William Thimbleby %% \lst@definelanguage{Promela} @@ -467,6 +883,132 @@ morestring=[b]"% }[keywords,comments,strings,directives]% %% +%% PSTricks definition (c) 2006 Herbert Voss +%% +\lst@definelanguage{PSTricks}% + {morekeywords={% + begin,end,definecolor,multido,% + KillGlue,DontKillGlue,pslbrace,bsrbrace,psscalebox,psset,pstVerb,pstverb,% + pst@def,,psframebox,psclip,endclip,endpspicture,psframe, +%% pspicture,% + multirput,multips,Rput,rput,uput,cput,lput,% + newrgbcolor,newgray,newcmykcolor, +%% +%% pstricks-add + psStep,psgraph,psbrace,psPrintValue, +%% +%% pst-plot + psvlabel,pshlabel,psplot,psline,pscustom,pscurve,psccurve,% + readdata,savedata,fileplot,dataplot,listplot,% + psecurce,psgraph,parametricplot,% + psellipse,psaxes,ncline,nccurve,psbezier,parabola,% + qdisk,qline,clipbox,endpsclip,% + psgrid,pscircle,pscirclebox,psdiabox,pstribox,% + newpsfontdot,psdot,psdots,% + pspolygon,psdiamond,psoval,pstriangle,% + psarc,psarcn,psellipticarc,psellipticarcn,pswedge,psellipticwedge, + pcline,pcdiag,pcdiagg,pccurve,pccurve,pcecurve,% + scalebox,scaleboxto,psmathboxtrue,everypsbox,psverbboxtrue,overlaybox,% + psoverlay,putoverlaybox,% + newpsstyle,newpsobject,% + moveto,newpath,closepath,stroke,fill,gsave,grestore,msave,mrestore,translate,scale,% + swapaxes,rotate,openshadow,closedshadow,movepath,lineto,rlineto,curveto,rcurveto,% + code,dim,coor,rcoor,file,arrows,setcolor,% + rotateleft,rotateright,rotatedown,% +%% +%% pst-node + nput,naput,nbput,ncput,% + ncarc,ncbox,ncangle,ncangles,ncloop,ncdiag,ncdiagg,ncarcbox,ncbar,% + cnodeput,nccircle,% + pnode,rnode,Rnode,Cnode,cnode,fnode,% + circlenode,ovalnode,trinode,dianode,% + psmatrix,endpsmatrix,psspan,% +%% +%% pst-tree + pstree,Tcircle,TCircle,Ttri,Tn,TC,Tc,Tfan,TR,Tr,Tdia,Toval,Tdot,Tp,Tf,% + skiplevel,skiplevels,endskiplevels,tspace,tlput,% +%% +%% pst-text + pscharpath,pstextpath, +%% +%% pst-barcode + psbarcode, +%% +%% pst-coil + psboxfill,pscoil,psCoil,pszigzag,nccoil, + psshadow,pstilt,psTilt,ThreeDput, +%% +%% pst-gr3d + PstGridThreeDNodeProcessor,% +%% +%% pst-vue3d + PstGridThreeD, + AxesThreeD,LineThreeD,DieThreeD,FrameThreeD,SphereCircleThreeD,SphereMeridienThreeD, + QuadrillageThreeD,TetraedreThreeD,PyramideThreeD,ConeThreeD,CylindreThreeD, + DodecahedronThreeD,ConeThreeD,SphereThreeD,SphereInverseThreeD,DemiSphereThreeD, + SphereCreuseThreeD,SphereCircledThreeD,PortionSphereThreeD,pNodeThreeD,CubeThreeD,% +%% +%% pst-3dplot + pstThreeDCoor,pstThreeDDot,pstThreeDTriangle,pstThreeDCircle,pstPlanePut,% + pstThreeDBox,pstThreeDEllipse,pstThreeDLine,pstThreeDPut,% + pstThreeDNode,pstThreeDSquare,psplotThreeD,parametricplotThreeD,fileplotThreeD,% + dataplotThreeD,pstScalePoints,% +%% +%% pst-circ + resistor,battery,Ucc,Icc,capacitor,coil,diode,Zener,LED,lamp,switch,wire,tension, + circledipole,multidipole,OA,transistor,Tswitch,potentiometer,transformer, + optoCoupler,logic, +%% +%% pst-eucl + pstTriangle,pstMediatorAB,pstInterLL,pstMiddleAB,pstProjection,pstCircleOA,pstLineAB,% +%% +%% pst-func + psBessel,psPolynomial,psFourier,psGaussI,psGauss,psSi,pssi,psCi,psci,% +%% +%% pst-infixplot + psPlot, +%% +%% pst-ob3d + PstDie,PstCube, +%% +%% pst-poly + PstPolygon,pspolygonbox, +%% +%% pst-bar + psbarchart,readpsbardata,psbarscale,newpsbarstyle,% +%% +%% pst-lens + PstLens,% +%% +%% pst-geo + WorldMap,WorldMapII,WorldMapThreeD,WorldMapThreeDII,pnodeMap,MapPut,% +%% +%% pst-autoseg + asr,firstnode,merge,massoc,labelmerge,% +%% +%% gastex + node,imark,fmark,rmark,drawqbpedge,drawedge,drawloop,% +%% +%% pst-labo + Distillation,Ballon, +%% +%% pst-optic + lens,Transform,% +%% +%% pst-light3d + PstLightThreeDText,% +%% +%% calendrier + Calendrier,% +%% +%% pst-osci + Oscillo% + },% + sensitive,% + alsoother={0123456789$_},% + morecomment=[l]\% % + }[keywords,comments]% +%% %% Reduce definition (c) 2002 Geraint Paul Bevan %% \lst@definelanguage{Reduce}% @@ -641,6 +1183,19 @@ literate=% morestring=[d]",% morestring=[d]'% }[keywords,keywordcomments,strings]% +%% +%% SPARQL definition (c) 2006 Christoph Kiefer +%% +\lst@definelanguage{SPARQL}% + {morekeywords={BASE,PREFIX,SELECT,DISTINCT,CONSTRUCT,DESCRIBE,ASK,% + FROM,NAMED,WHERE,ORDER,BY,ASC,DESC,LIMIT,OFFSET,OPTIONAL,% + GRAPH,UNION,FILTER,a,STR,LANG,LANGMATCHES,DATATYPE,BOUND,% + isIRI,isURI,isBLANK,isLITERAL,REGEX,true,false},% + sensitive=false,% + morecomment=[l]\#,% + morestring=[d]',% + morestring=[d]"% + }[keywords,comments,strings]% \lst@definelanguage{S}[]{R}{} \lst@definelanguage[PLUS]{S}[]{R}{} \lst@definelanguage{R}% diff --git a/Master/texmf-dist/tex/latex/listings/lstmisc.sty b/Master/texmf-dist/tex/latex/listings/lstmisc.sty index 4180dc84094..2d2a6435163 100644 --- a/Master/texmf-dist/tex/latex/listings/lstmisc.sty +++ b/Master/texmf-dist/tex/latex/listings/lstmisc.sty @@ -4,7 +4,7 @@ %% %% The original source files were: %% -%% listings-1.3.dtx (with options: `misc,0.21') +%% listings.dtx (with options: `misc,0.21') %% %% Please read the software license in listings-1.3.dtx or listings-1.3.pdf. %% @@ -72,7 +72,7 @@ \ifnum\lst@length=\z@\else \lst@WFWriteToFile \fi} \lst@EndAspect \lst@BeginAspect{strings} -\gdef\lst@stringtypes{d,b,m,bd,db} +\gdef\lst@stringtypes{d,b,m,bd,db,s} \gdef\lst@StringKey#1#2{% \lst@Delim\lst@stringstyle #2\relax {String}\lst@stringtypes #1% @@ -113,14 +113,6 @@ \fi} \global\let\lst@StringDM@bd\lst@StringDM@b \global\let\lst@StringDM@db\lst@StringDM@bd -\gdef\lst@StringDM@a#1#2\@empty#3#4#5{% - \lst@CArg #2\relax\lst@DefDelimBE{}{}% - {\let\lst@next\@gobblethree - \lst@ifletter\else - \ifx\lst@lastother)\else \ifx\lst@lastother]\else - \let\lst@next\@empty - \fi \fi \fi - \lst@next}#3{#1}{#5}#4} \gdef\lst@StringDM@m#1#2\@empty#3#4#5{% \lst@CArg #2\relax\lst@DefDelimBE{}{}% {\let\lst@next\@gobblethree @@ -130,6 +122,9 @@ {\let\lst@next\@empty}% \fi \lst@next}#3{#1}{#5}#4} +\gdef\lst@StringDM@s#1#2#3\@empty#4#5#6{% + \lst@CArg #2\relax\lst@DefDelimB{}{}{}#4{#1}{#6}% + \lst@CArg #3\relax\lst@DefDelimE{}{}{}#5{#1}} \lst@SaveOutputDef{"7D}\lstum@rbrace \lst@EndAspect \lst@BeginAspect{mf} @@ -327,7 +322,7 @@ \lst@CArg #2\relax\lst@ActiveCDefX {}% {\lst@escapeend #4\lst@LeaveAllModes\lst@ReenterModes - \lst@whitespacefalse}% + \lst@newlines\z@ \lst@whitespacefalse}% {}% \fi #3\lst@escapebegin @@ -750,11 +745,12 @@ \lst@AddToHook{SelectCharTable} {\lst@iftexcsincludebs \ifx\@empty\lst@texcs\else \lst@DefSaveDef{`\\}\lsts@texcsbs - {\ifx\lst@lastother\lstum@backslash - \lsts@texcsbs\lst@XPrintToken - \else - \lst@Merge\lsts@texcsbs - \fi}% + {\lst@ifletter + \lst@Output + \else + \lst@OutputOther + \fi + \lst@Merge\lsts@texcsbs}% \fi \fi} \lst@EndAspect \lst@BeginAspect[keywords]{directives} @@ -1206,7 +1202,7 @@ \lst@AddToHook{PreSet}{\let\lst@advancenumber\z@} \lst@AddToHook{PreInit} {\ifx\lst@firstnumber\@undefined - \let\lst@firstnumber\lst@firstline + \def\lst@firstnumber{\lst@lineno}% \fi} \gdef\lst@SetFirstNumber{% \ifx\lst@firstnumber\@undefined @@ -1232,10 +1228,7 @@ \lst@AddToHook{InitVars} {\global\c@lstnumber\lst@firstnumber \global\advance\c@lstnumber\lst@advancenumber - \global\advance\c@lstnumber-\lst@advancelstnum - \ifx \lst@firstnumber\c@lstnumber - \global\advance\c@lstnumber-\lst@advancelstnum - \fi} + \global\advance\c@lstnumber-\lst@advancelstnum} \lst@AddToHook{ExitVars} {\global\advance\c@lstnumber\lst@advancelstnum} \AtBeginDocument{% @@ -1440,20 +1433,23 @@ \let\lst@frametshape\@empty \let\lst@framershape\@empty \let\lst@framebshape\@empty - \let\lst@framelshape\@empty} + \let\lst@framelshape\@empty + \let\lst@bkgcolor\@empty} \gdef\lst@frameMakeBoxV#1#2#3{% \setbox#1\hbox{% \color@begingroup \lst@rulecolor + \ifx\lst@framelshape\@empty + \else + \llap{% + \lst@frameBlock\lst@fillcolor\lst@frametextsep{#2}{#3}% + \kern\lst@framexleftmargin}% + \fi \llap{\setbox\z@\hbox{\vrule\@width\z@\@height#2\@depth#3% \lst@frameL}% \rlap{\lst@frameBlock\lst@rulesepcolor{\wd\z@}% {\ht\z@}{\dp\z@}}% \box\z@ - \ifx\lst@framelshape\@empty - \kern\lst@frametextsep\relax - \else - \lst@frameBlock\lst@fillcolor\lst@frametextsep{#2}{#3}% - \fi + \kern\lst@frametextsep\relax \kern\lst@framexleftmargin}% \rlap{\kern-\lst@framexleftmargin \@tempdima\linewidth @@ -1811,7 +1807,7 @@ \lst@Key{stringtest}\relax{}% dummy \lst@Key{outputpos}\relax{\lst@outputpos#1\relax\relax} \lst@Key{stringspaces}\relax[t]{\lstKV@SetIf{#1}\lst@ifshowstringspaces} -\lst@Key{visisblespaces}\relax[t]{\lstKV@SetIf{#1}\lst@ifshowspaces} +\lst@Key{visiblespaces}\relax[t]{\lstKV@SetIf{#1}\lst@ifshowspaces} \lst@Key{visibletabs}\relax[t]{\lstKV@SetIf{#1}\lst@ifshowtabs} \lst@EndAspect \lst@BeginAspect{fancyvrb} diff --git a/Master/texmf-dist/tex/latex/listings/lstpatch.sty b/Master/texmf-dist/tex/latex/listings/lstpatch.sty deleted file mode 100644 index 1fed6d8234e..00000000000 --- a/Master/texmf-dist/tex/latex/listings/lstpatch.sty +++ /dev/null @@ -1,417 +0,0 @@ -%% -%% This is file `lstpatch.sty', generated manually. -%% -%% (w)(c) 2004 Carsten Heinz -%% (c) 2006 Brooks Moses -%% -%% This file may be distributed under the terms of the LaTeX Project Public -%% License from CTAN archives in directory macros/latex/base/lppl.txt. -%% Either version 1.3 or, at your option, any later version. -%% -%% Send comments and ideas on the package, error reports and additional -%% programming languages to <bmoses@dpdx.net>. -%% -%% This patch file will remove the following bugs from the listings package. -%% Each item contains the bug finder with date of report and first bug fix -%% version, a short description of the problem, and the reason for the bug -%% in parenthesis. -%% -%% 1) Frank Atanassow, 2004/10/07, 1.3b -%% -%% space after mathescape is not preserved -%% (\lst@newlines>0) -%% -%% 2) Benjamin Lings, 2004/10/15, 1.3b (2004/10/17) -%% -%% \usepackage{xy,listings} yields: -%% "Forbidden control sequence found while scanning use of \lst@lExtend" -%% (xy-pic correctly resets catcode of ^^L (to active), which is \outer) -%% -%% The following features are added to the base package. -%% -%% 1.3a (2004/09/07) -%% -%% a) H I G H L Y E X P E R I M E N T A L -%% -%% Use the options -%% rangeprefix=<prefix for begin and end of range> -%% rangesuffix=<suffix for begin and end of range> -%% -%% rangebeginprefix=<prefix for begin of range> -%% rangebeginsuffix=<suffix for begin of range> -%% -%% rangeendprefix=<prefix for end of range> -%% rangeendsuffix=<suffix for end of range> -%% -%% includerangemarker=true|false -%% together with -%% firstline=<begin marker> -%% lastline=<end marker> -%% or -%% linerange={<begin marker 1>-<end marker 1>, -%% <begin marker 2>-<end marker 2>, ...} -%% The according markers in the source code are -%% <prefix><marker><suffix> -%% for begin respectively end of range. Moreover, one can use -%% includerangemarker=true|false -%% to show or hide the range markers in the output. -%% -%% 1.3b (2004/10/17) -%% -%% b) multicols=<number> (requires loaded multicol package) -%% -%% 1.3c -%% -%% c) speedups suggested by Hendri Adriaens: -%% -%% \lst@for replaced by a faster version. -%% -\lst@CheckVersion{1.3} -{\typeout{^^J% - ***^^J% - *** This is a patch for listings 1.3, but you're using^^J% - *** version \lst@version.^^J% - ***^^J - *** Patch file not loaded.^^J% - ***^^J}% - \endinput -} -\def\fileversion{1.3b} -\def\filedate{2004/10/17} -\ProvidesFile{lstpatch.sty}[\filedate\space\fileversion\space (Carsten Heinz)] -% -% 0) Insert % after #1. -\def\@@xbitor #1{\@tempcntb \count#1% - \ifnum \@tempcnta =\z@ - \else - \divide\@tempcntb\@tempcnta - \ifodd\@tempcntb \@testtrue\fi - \fi} -% -% 1) Reset \lst@newlines at end of escape. -\def\lstpatch@escape{% -\gdef\lst@Escape##1##2##3##4{% - \lst@CArgX ##1\relax\lst@CDefX - {}% - {\lst@ifdropinput\else - \lst@TrackNewLines\lst@OutputLostSpace \lst@XPrintToken - \lst@InterruptModes - \lst@EnterMode{\lst@TeXmode}{\lst@modetrue}% - \ifx\^^M##2% - \lst@CArg ##2\relax\lst@ActiveCDefX - {}% - {\lst@escapeend ##4\lst@LeaveAllModes\lst@ReenterModes}% - {\lst@MProcessListing}% - \else - \lst@CArg ##2\relax\lst@ActiveCDefX - {}% - {\lst@escapeend ##4\lst@LeaveAllModes\lst@ReenterModes - \lst@newlines\z@ \lst@whitespacefalse}% - {}% - \fi - ##3\lst@escapebegin - \fi}% - {}}% -} -% -% 2) Deactivate \outer definition of ^^L temporarily (inside and outside -% of \lst@ScanChars) and restore \catcode at end of package. -\begingroup \catcode12=\active\let^^L\@empty -\gdef\lst@ScanChars{% - \let\lsts@ssL^^L% - \def^^L{\par}% - \lst@GetChars\lst@RestoreOrigCatcodes\@ne {128}% - \let^^L\lsts@ssL - \lst@GetChars\lst@RestoreOrigExtendedCatcodes{128}{256}} -\endgroup -\lst@lAddTo\lst@RestoreCatcodes{\catcode12\active} -% -% a) Let's start with the options: -\lst@Key{rangeprefix}\relax{\def\lst@rangebeginprefix{#1}% - \def\lst@rangeendprefix{#1}} -\lst@Key{rangesuffix}\relax{\def\lst@rangebeginsuffix{#1}% - \def\lst@rangeendsuffix{#1}} -\lst@Key{rangebeginprefix}{}{\def\lst@rangebeginprefix{#1}} -\lst@Key{rangebeginsuffix}{}{\def\lst@rangebeginsuffix{#1}} -\lst@Key{rangeendprefix}{}{\def\lst@rangeendprefix{#1}} -\lst@Key{rangeendsuffix}{}{\def\lst@rangeendsuffix{#1}} -\lst@Key{includerangemarker}{true}[t]{\lstKV@SetIf{#1}\lst@ifincluderangemarker} -% -% The key is a redefinition of \lst@GLI@ checking for numbers. -\def\lst@GLI@#1-#2-#3\@nil{% - \lst@IfNumber{#1}% - {\ifx\@empty#1\@empty - \let\lst@firstline\@ne - \else - \def\lst@firstline{#1\relax}% - \fi - \ifx\@empty#3\@empty - \def\lst@lastline{9999999\relax}% - \else - \ifx\@empty#2\@empty - \let\lst@lastline\lst@firstline - \else - \def\lst@lastline{#2\relax}% - \fi - \fi}% -% -% If we've found a general marker, we set firstline and lastline to 9999999. -% This prevents (almost) anything to be printed for now. - {\def\lst@firstline{9999999\relax}% - \let\lst@lastline\lst@firstline -% -% We add the prefixes and suffixes to the markers. - \let\lst@rangebegin\lst@rangebeginprefix - \lst@AddTo\lst@rangebegin{#1}\lst@Extend\lst@rangebegin\lst@rangebeginsuffix - \ifx\@empty#3\@empty - \let\lst@rangeend\lst@rangeendprefix - \lst@AddTo\lst@rangeend{#1}\lst@Extend\lst@rangeend\lst@rangeendsuffix - \else - \ifx\@empty#2\@empty - \let\lst@rangeend\@empty - \else - \let\lst@rangeend\lst@rangeendprefix - \lst@AddTo\lst@rangeend{#2}\lst@Extend\lst@rangeend\lst@rangeendsuffix - \fi - \fi -% The following definition will be executed in the SelectCharTable hook -% and here right now if we are already processing a listing. - \global\def\lst@DefRange{\expandafter\lst@CArgX\lst@rangebegin\relax\lst@DefRangeB}% - \ifnum\lst@mode=\lst@Pmode \expandafter\lst@DefRange \fi}} -% \lst@DefRange is not inserted via a hook anymore. Instead it is now called -% directly from \lst@SelectCharTable. This was necessary to get rid of an -% interference with the escape-to-LaTeX-feature. The bug was reported by -% \lsthelper{Michael~Bachmann}{2004/07/21}{Keine label-Referenzierung -% m\"oglich...}. Another chance is due to the same bug: \lst@DefRange is -% redefined globally when the begin of code is found, see below. The bug was -% reported by \lsthelper{Tobias~Rapp}{2004/04/06}{undetected end of range if -% listing crosses page break} \lsthelper{Markus~Luisser}{2004/08/13}{Bug mit -% 'linerangemarker' in umgebrochenen listings} -%\lst@AddToHook{SelectCharTable}{\lst@DefRange} -\lst@AddToHookExe{DeInit}{\global\let\lst@DefRange\@empty} -% -% Actually defining the marker (via \lst@GLI@, \lst@DefRange, \lst@CArgX as -% seen above) is similar to \lst@DefDelimB---except that we unfold the first -% parameter and use different <execute>, <pre>, and <post> statements. -\def\lst@DefRangeB#1#2{\lst@DefRangeB@#1#2} -\def\lst@DefRangeB@#1#2#3#4{% - \lst@CDef{#1{#2}{#3}}#4{}% - {\lst@ifincluderangemarker - \lst@LeaveMode - \let#1#4% - \lst@DefRangeEnd - \lst@InitLstNumber - \else - \@tempcnta\lst@lineno \advance\@tempcnta\@ne - \edef\lst@firstline{\the\@tempcnta\relax}% - \gdef\lst@OnceAtEOL{\let#1#4\lst@DefRangeEnd}% - \lst@InitLstNumber - \fi - \global\let\lst@DefRange\lst@DefRangeEnd - \lst@CArgEmpty}% - \@empty} -% -% Modify labels and define |\lst@InitLstNumber| used above. -% \lsthelper{Omair-Inam~Abdul-Matin}{2004/05/10}{experimental linerange -% feature does not work with firstnumber} -\def\lstpatch@labels{% -\gdef\lst@SetFirstNumber{% - \ifx\lst@firstnumber\@undefined - \@tempcnta 0\csname\@lst no@\lst@intname\endcsname\relax - \ifnum\@tempcnta=\z@ \else - \lst@nololtrue - \advance\@tempcnta\lst@advancenumber - \edef\lst@firstnumber{\the\@tempcnta\relax}% - \fi - \fi}% -} -\lst@AddToAtTop\lsthk@PreInit - {\ifx\lst@firstnumber\@undefined - \def\lst@firstnumber{\lst@lineno}% - \fi} -\def\lst@InitLstNumber{% - \global\c@lstnumber\lst@firstnumber - \global\advance\c@lstnumber\lst@advancenumber - \global\advance\c@lstnumber-\lst@advancelstnum - \ifx \lst@firstnumber\c@lstnumber - \global\advance\c@lstnumber-\lst@advancelstnum - \fi} -% -% The end-marker is defined if and only if it's not empty. The definition is -% similar to \lst@DefDelimE---with the above exceptions and except that we -% define the re-entry point \lst@DefRangeE@@ as it is defined in the new -% version of \lst@MProcessListing above. -\def\lst@DefRangeEnd{% - \ifx\lst@rangeend\@empty\else - \expandafter\lst@CArgX\lst@rangeend\relax\lst@DefRangeE - \fi} -\def\lst@DefRangeE#1#2{\lst@DefRangeE@#1#2} -\def\lst@DefRangeE@#1#2#3#4{% - \lst@CDef{#1#2{#3}}#4{}% - {\let#1#4% - \edef\lst@lastline{\the\lst@lineno\relax}% - \lst@DefRangeE@@}% - \@empty} -\def\lst@DefRangeE@@#1\@empty{% - \lst@ifincluderangemarker - #1\lst@XPrintToken - \fi - \lst@LeaveModeToPmode - \lst@BeginDropInput{\lst@Pmode}} -% -\def\lst@LeaveModeToPmode{% - \ifnum\lst@mode=\lst@Pmode - \expandafter\lsthk@EndGroup - \else - \expandafter\egroup\expandafter\lst@LeaveModeToPmode - \fi} -% -% Eventually we shouldn't forget to install \lst@OnceAtEOL, which must -% also be called in \lst@MSkipToFirst. -\lst@AddToHook{EOL}{\lst@OnceAtEOL\global\let\lst@OnceAtEOL\@empty} -\gdef\lst@OnceAtEOL{}% Init -\def\lst@MSkipToFirst{% - \global\advance\lst@lineno\@ne - \ifnum \lst@lineno=\lst@firstline - \def\lst@next{\lst@LeaveMode \global\lst@newlines\z@ - \lst@OnceAtEOL \global\let\lst@OnceAtEOL\@empty - \lst@InitLstNumber % Added to work with modified \lsthk@PreInit. - \lsthk@InitVarsBOL - \lst@BOLGobble}% - \expandafter\lst@next - \fi} -\def\lst@SkipToFirst{% - \ifnum \lst@lineno<\lst@firstline - \def\lst@next{\lst@BeginDropInput\lst@Pmode - \lst@Let{13}\lst@MSkipToFirst - \lst@Let{10}\lst@MSkipToFirst}% - \expandafter\lst@next - \else - \expandafter\lst@BOLGobble - \fi} -% -% Finally the service macro \lst@IfNumber: -\def\lst@IfNumber#1{% - \ifx\@empty#1\@empty - \let\lst@next\@firstoftwo - \else - \lst@IfNumber@#1\@nil - \fi - \lst@next} -\def\lst@IfNumber@#1#2\@nil{% - \let\lst@next\@secondoftwo - \ifnum`#1>47\relax \ifnum`#1>57\relax\else - \let\lst@next\@firstoftwo - \fi\fi} -% -% b) The following is known to fail with some keys. -\lst@Key{multicols}{}{\@tempcnta=0#1\relax\def\lst@multicols{#1}} -\def\lst@Init#1{% - \begingroup - \ifx\lst@float\relax\else - \edef\@tempa{\noexpand\lst@beginfloat{lstlisting}[\lst@float]}% - \expandafter\@tempa - \fi -% chmod begin - \ifx\lst@multicols\@empty\else - \edef\lst@next{\noexpand\multicols{\lst@multicols}} - \expandafter\lst@next - \fi -% chmod end - \ifhmode\ifinner \lst@boxtrue \fi\fi - \lst@ifbox - \lsthk@BoxUnsafe - \hbox to\z@\bgroup - $\if t\lst@boxpos \vtop - \else \if b\lst@boxpos \vbox - \else \vcenter \fi\fi - \bgroup \par\noindent - \else - \lst@ifdisplaystyle - \lst@EveryDisplay - \par\penalty-50\relax - \vspace\lst@aboveskip - \fi - \fi - \normalbaselines - \abovecaptionskip\lst@abovecaption\relax - \belowcaptionskip\lst@belowcaption\relax - \lst@MakeCaption t% - \lsthk@PreInit \lsthk@Init - \lst@ifdisplaystyle - \global\let\lst@ltxlabel\@empty - \if@inlabel - \lst@ifresetmargins - \leavevmode - \else - \xdef\lst@ltxlabel{\the\everypar}% - \lst@AddTo\lst@ltxlabel{% - \global\let\lst@ltxlabel\@empty - \everypar{\lsthk@EveryLine\lsthk@EveryPar}}% - \fi - \fi - \everypar\expandafter{\lst@ltxlabel - \lsthk@EveryLine\lsthk@EveryPar}% - \else - \everypar{}\let\lst@NewLine\@empty - \fi - \lsthk@InitVars \lsthk@InitVarsBOL - \lst@Let{13}\lst@MProcessListing - \let\lst@Backslash#1% - \lst@EnterMode{\lst@Pmode}{\lst@SelectCharTable}% - \lst@InitFinalize} -\def\lst@DeInit{% - \lst@XPrintToken \lst@EOLUpdate - \global\advance\lst@newlines\m@ne - \lst@ifshowlines - \lst@DoNewLines - \else - \setbox\@tempboxa\vbox{\lst@DoNewLines}% - \fi - \lst@ifdisplaystyle \par\removelastskip \fi - \lsthk@ExitVars\everypar{}\lsthk@DeInit\normalbaselines\normalcolor - \lst@MakeCaption b% - \lst@ifbox - \egroup $\hss \egroup - \vrule\@width\lst@maxwidth\@height\z@\@depth\z@ - \else - \lst@ifdisplaystyle - \par\penalty-50\vspace\lst@belowskip - \fi - \fi -% chmod begin - \ifx\lst@multicols\@empty\else - \def\lst@next{\global\let\@checkend\@gobble - \endmulticols - \global\let\@checkend\lst@@checkend} - \expandafter\lst@next - \fi -% chmod end - \ifx\lst@float\relax\else - \expandafter\lst@endfloat - \fi - \endgroup} -\let\lst@@checkend\@checkend -% -% c) Hendri's suggested change to \lst@for. -% -% \begin{macro}{\lst@for} -% \begin{macro}{\lst@f@r} -% A for-loop with expansion of the loop-variable. -% \begin{macrocode} -\def\lst@for#1\do#2{% - \def\lst@forbody##1{#2}% - \def\@tempa{#1}% - \ifx\@tempa\@empty\else\expandafter\lst@f@r#1,\@nil,\fi -} -\def\lst@f@r#1,{% - \def\@tempa{#1}% - \ifx\@tempa\@nnil\else\lst@forbody{#1}\expandafter\lst@f@r\fi -} -% \end{macrocode} -% \end{macro} -% \end{macro} -%% -\endinput -%% -%% End of file `lstpatch.sty'. |