diff options
Diffstat (limited to 'Master/texmf-dist/tex')
| -rw-r--r-- | Master/texmf-dist/tex/latex/listings/listings.cfg | 2 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/listings/listings.sty | 14 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/listings/lstdoc.sty | 4 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/listings/lstlang1.sty | 64 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/listings/lstlang2.sty | 122 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/listings/lstlang3.sty | 6 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/listings/lstmisc.sty | 4 |
7 files changed, 186 insertions, 30 deletions
diff --git a/Master/texmf-dist/tex/latex/listings/listings.cfg b/Master/texmf-dist/tex/latex/listings/listings.cfg index b3558440b75..54f165b0889 100644 --- a/Master/texmf-dist/tex/latex/listings/listings.cfg +++ b/Master/texmf-dist/tex/latex/listings/listings.cfg @@ -21,7 +21,7 @@ %% Send comments and ideas on the package, error reports and additional %% programming languages to Jobst Hoffmann at <j.hoffmann@fh-aachen.de>. %% -\ProvidesFile{listings.cfg}[2013/08/26 1.5b listings configuration] +\ProvidesFile{listings.cfg}[2014/03/04 1.5c listings configuration] \def\lstlanguagefiles {lstlang0.sty,lstlang1.sty,lstlang2.sty,lstlang3.sty} \lstset{defaultdialect=[R/3 6.10]ABAP, diff --git a/Master/texmf-dist/tex/latex/listings/listings.sty b/Master/texmf-dist/tex/latex/listings/listings.sty index 1ef4c986717..f1bf1ab74f1 100644 --- a/Master/texmf-dist/tex/latex/listings/listings.sty +++ b/Master/texmf-dist/tex/latex/listings/listings.sty @@ -16,8 +16,8 @@ %% Send comments and ideas on the package, error reports and additional %% programming languages to Jobst Hoffmann at <j.hoffmann@fh-aachen.de>. %% -\def\filedate{2013/08/26} -\def\fileversion{1.5b} +\def\filedate{2014/03/04} +\def\fileversion{1.5c} \NeedsTeXFormat{LaTeX2e} \AtEndOfPackage{\ProvidesPackage{listings} [\filedate\space\fileversion\space(Carsten Heinz)]} @@ -1489,7 +1489,11 @@ \global\advance\c@lstnumber-\lst@advancelstnum \ifx \lst@firstnumber\c@lstnumber \global\advance\c@lstnumber-\lst@advancelstnum - \fi} + \fi% + \lst@ifincluderangemarker\else% + \global\advance\c@lstnumber by 1% + \fi% + } \def\lst@DefRangeEnd{% \ifx\lst@rangeend\@empty\else \expandafter\lst@CArgX\lst@rangeend\relax\lst@DefRangeE @@ -1884,7 +1888,9 @@ \def\lst@boxpos{b}% \lsthk@PreSet\lstset{flexiblecolumns,#1}% \lsthk@TextStyle - \@ifnextchar\bgroup{\afterassignment\lst@InlineG \let\@let@token}% + \@ifnextchar\bgroup{% + \ifnum`{=0}\fi% + \afterassignment\lst@InlineG \let\@let@token}% \lstinline@} \def\lstinline@#1{% \lst@Init\relax diff --git a/Master/texmf-dist/tex/latex/listings/lstdoc.sty b/Master/texmf-dist/tex/latex/listings/lstdoc.sty index 6a157851531..79127afdf69 100644 --- a/Master/texmf-dist/tex/latex/listings/lstdoc.sty +++ b/Master/texmf-dist/tex/latex/listings/lstdoc.sty @@ -16,8 +16,8 @@ %% Send comments and ideas on the package, error reports and additional %% programming languages to Jobst Hoffmann at <j.hoffmann@fh-aachen.de>. %% -\def\filedate{2013/08/26} -\def\fileversion{1.5b} +\def\filedate{2014/03/04} +\def\fileversion{1.5c} \ProvidesPackage{lstdoc} [\filedate\space\fileversion\space(Carsten Heinz)] \let\lstdoc@currversion\fileversion diff --git a/Master/texmf-dist/tex/latex/listings/lstlang1.sty b/Master/texmf-dist/tex/latex/listings/lstlang1.sty index d09c04352f8..177880e56d3 100644 --- a/Master/texmf-dist/tex/latex/listings/lstlang1.sty +++ b/Master/texmf-dist/tex/latex/listings/lstlang1.sty @@ -22,7 +22,7 @@ %% programming languages to Jobst Hoffmann at <j.hoffmann@fh-aachen.de>. %% \ProvidesFile{lstlang1.sty} - [2013/08/26 1.5b listings language file] + [2014/03/04 1.5c listings language file] %% %% ACSL definition (c) 2000 by Andreas Matthias %% @@ -308,38 +308,70 @@ }[keywords,comments,strings]% \lst@definelanguage[08]{Fortran}[03]{Fortran}{% morekeywords={ALL, BLOCK, CODIMENSION, CONCURRENT, CONTIGUOUS, CRITICAL,% - ERROR, LOCK, SUBMODULE, SYNC, UNLOCK}% + ERROR, LOCK, SUBMODULE, SYNC, UNLOCK},% + morekeywords=[3]{ACOSH,ASINH,ATANH,ATOMIC_DEFINE,ATOMIC_REF,BESSEL_J0,% + BESSEL_J1,BESSEL_JN,BESSEL_Y0,BESSEL_Y1,BESSEL_YN,BGE,BGT,BLE,BLT,% + C_SIZEOF,COMPILER_OPTIONS,COMPILER_VERSION,DSHIFTL,DSHIFTR,ERF,ERFC,% + ERFC_SCALED,EXECUTE_COMMAND_LINE,GAMMA,HYPOT,IALL,IANY,IMAGE_INDEX,% + IPARITY,LCOBOUND,LEADZ,LOG_GAMMA,MASKL,MASKR,MERGE_BITS,NORM2,% + NUM_IMAGES,PARITY,POPCNT,POPPAR,SHIFTA,SHIFTL,SHIFTR,STORAGE_SIZE,% + THIS_IMAGE,TRAILZ,UCOBOUND}% }% \lst@definelanguage[03]{Fortran}[95]{Fortran}{% morekeywords={ABSTRACT, ASSOCIATE, ASYNCHRONOUS, BIND, CLASS, DEFERRED,% ENUM, ENUMERATOR, EXTENDS, FINAL, FLUSH, GENERIC, IMPORT,% - NON_OVERRIDABLE, NOPASS, PASS, PROTECTED, VALUE, VOLATILE, WAIT}% + NON_OVERRIDABLE, NOPASS, PASS, PROTECTED, VALUE, VOLATILE, WAIT},% + morekeywords=[2]{DECIMAL,ENCODING,IOMSG,ROUND},% corrected NML from NMT + morekeywords=[3]{C_ASSOCIATED,C_F_POINTER,C_F_PROCPOINTER,C_FUNLOC,% + C_LOC,COMMAND_ARGUMENT_COUNT,EXTENDS_TYPE_OF,GET_COMMAND,GET_COMMAND_ARGUMENT,% + GET_ENVIRONMENT_VARIABLE,IS_IOSTAT_END,MOVE_ALLOC,NEW_LINE,SAME_TYPE_AS,% + SELECTED_CHAR_KIND}% }% \lst@definelanguage[90]{Fortran}[95]{Fortran}{} \lst@definelanguage[95]{Fortran}[77]{Fortran}% {deletekeywords=SAVE,% - morekeywords={ACTION,ADVANCE,ALLOCATE,ALLOCATABLE,ASSIGNMENT,CASE,% - CONTAINS,CYCLE,DEALLOCATE,DEFAULT,DELIM,EXIT,INCLUDE,IN,NONE,IN,% - 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,% + morekeywords={ALLOCATABLE,ALLOCATE,ASSIGNMENT,CASE,% + CONTAINS,CYCLE,DEALLOCATE,DEFAULT,EXIT,INCLUDE,IN,NONE,% + OUT,INTENT,INTERFACE,MODULE,NAMELIST,% + NULLIFY,ONLY,OPERATOR,OPTIONAL,OUT,POINTER,PRIVATE,% + PUBLIC,RECURSIVE,RESULT,SELECT,SEQUENCE,% TARGET,USE,WHERE,WHILE,BLOCKDATA,DOUBLEPRECISION,% ENDBLOCKDATA,ENDFILE,ENDFUNCTION,ENDINTERFACE,% ENDMODULE,ENDPROGRAM,ENDSELECT,ENDSUBROUTINE,ENDTYPE,ENDWHERE,% INOUT,SELECTCASE,% ELEMENTAL, ELSEWHERE, FORALL, PURE},% + morekeywords=[2]{ACTION,ADVANCE,DELIM,IOLENGTH,LEN,NAME,% + NML,PAD,POSITION,READWRITE,SIZE,STAT},% corrected NML from NMT + morekeywords=[3]{ADJUSTL,ADJUSTR,ALL,ALLOCATED,ANY,ASSOCIATED,BIT_SIZE,% + BTEST,CEILING,COUNT,CPU_TIME,CSHIFT,DATE_AND_TIME,DIGITS,DOT_PRODUCT,% + EOSHIFT,EPSILON,EXPONENT,FLOOR,FRACTION,HUGE,IACHAR,IAND,IBCLR, + IBITS,IBSET,ICHAR,IEOR,IOR,ISHFT,ISHFTC,KIND,LBOUND,LEN_TRIM,% left out LOGICAL + MATMUL,MAXEXPONENT,MAXLOC,MAXVAL,MERGE,MINEXPONENT,MINLOC,MINVAL,% + MODULO,MVBITS,NEAREST,NOT,NULL,PACK,PRECISION,PRESENT,PRODUCT,% + RADIX,RANDOM_NUMBER,RANDOM_SEED,RANGE,RANK,REPEAT,RESHAPE,RRSPACING,% + SCALE,SCAN,SELECTED_INT_KIND,SELECTED_REAL_KIND,SET_EXPONENT,SHAPE,% + SINH,SIZE,SPACING,SPREAD,SUM,SYSTEM_CLOCK,TINY,TRANSFER,TRANSPOSE,% + TRIM,UBOUND,UNPACK,VERIFY},% 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,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},% + {morekeywords={ASSIGN,BACKSPACE,CALL,CHARACTER,% + CLOSE,COMMON,COMPLEX,CONTINUE,DATA,DIMENSION,DO,DOUBLE,% + ELSE,ELSEIF,END,ENDIF,ENDDO,ENTRY,EQUIVALENCE,EXTERNAL,% + FILE,FORMAT,FUNCTION,GO,TO,GOTO,IF,IMPLICIT,% + INQUIRE,INTEGER,INTRINSIC,LOGICAL,% + OPEN,PARAMETER,PAUSE,PRECISION,PRINT,PROGRAM,READ,REAL,% + RETURN,REWIND,STOP,SUBROUTINE,THEN,% + WRITE,SAVE},% + morekeywords=[2]{ACCESS,BLANK,BLOCK,DIRECT,EOF,ERR,EXIST,% + FMT,FORM,FORMATTED,IOSTAT,NAMED,NEXTREC,NUMBER,OPENED,% + REC,RECL,SEQUENTIAL,STATUS,TYPE,UNFORMATTED,UNIT},% + morekeywords=[3]{INT,DBLE,CMPLX,ICHAR,CHAR,AINT,ANINT,% left out real + NINT,ABS,MOD,SIGN,DIM,DPROD,MAX,MIN,AIMAG,CONJG,SQRT,EXP,LOG,% + LOG10,SIN,COS,TAN,ASIN,ACOS,ATAN,ATAN2,SINH,COSH,TANH,LGE,LLE,LLT,% + LEN,INDEX},% + morekeywords=[4]{AND,EQ,EQV,FALSE,GE,GT,OR,LE,LT,NE,NEQV,NOT,TRUE},% sensitive=f,%% not Fortran-77 standard, but allowed in Fortran-95 %% morecomment=[f]*,% morecomment=[f]C,% diff --git a/Master/texmf-dist/tex/latex/listings/lstlang2.sty b/Master/texmf-dist/tex/latex/listings/lstlang2.sty index 680fee091ea..0379c047b26 100644 --- a/Master/texmf-dist/tex/latex/listings/lstlang2.sty +++ b/Master/texmf-dist/tex/latex/listings/lstlang2.sty @@ -22,7 +22,7 @@ %% programming languages to Jobst Hoffmann at <j.hoffmann@fh-aachen.de>. %% \ProvidesFile{lstlang2.sty} - [2013/08/26 1.5b listings language file] + [2014/03/04 1.5c listings language file] %% %% Abap definition by Knut Lickert %% @@ -76,6 +76,37 @@ raise,raising}% }[keywords,comments,strings] %% +%% ACM and ACMscript definition +%% (c) 2013 Stefan Pinnow +%% +\lst@definelanguage{ACM}{ + morekeywords={ + abs,After,acos,And,As,asin,atan,At,Call,Compatibility,Connect,cos,cosh,% + Create,Delay,Difference,Do,Else,ElseIf,End,EndFor,EndIf,EndParallel,% + EndState,EndSwitch,EndText,EndWith,exp,External,Fixed,For,ForEach,Free,% + Global,Hidden,If,Implementation,In,Initial,Input,InterSection,% + IntegerSet,Invoke,Is,Language,Library,Link,Log10,LogE,Max,Min,Model,Of,% + Once,Options,Output,Parallel,Parameter,Pause,Port,Print,Private,% + Procedure,Product,Ramp,Repeat,Restart,Return,Round,Runs,Sigma,sin,sinh,% + Size,SnapShot,sqr,sqrt,SRamp,State,Stream,StringSet,Structure,Switch,% + SubRoutine,SymDiff,tan,tanh,Task,Text,Time,Then,Truncate,Union,Until,% + Uses,Variable,Wait,When,With,WithIn,WorkSpace% + },% + sensitive=false,% + morecomment=[l]{//},% + morecomment=[s]{/*}{*/},% + string=[b]{"},% +}[keywords,comments,strings]% +\lst@definelanguage{ACMscript}[]{VBScript}{% + morekeywords={% + ElseIf,False,In,Resume,True% + },% + deletekeywords={% + Abs,Array,Clear,CreateObject,CStr,Err,ForReading,ForWriting,% + OpenTextFile,Replace,WriteLine% + }% +}[keywords,comments,strings]% +%% %% Corba IDL definition (c) 1999 Jens T. Berger Thielemann %% \lst@definelanguage[CORBA]{IDL}% @@ -325,6 +356,93 @@ morestring=[b]',% }[keywords,comments,strings]% %% +%% http://gretl.sourceforge.net/gretl-help/cmdref.html +%% (c) 2013 Ignacio D\'iaz-Emparanza +%% +\lst@definelanguage{hansl}{% + % $-variables are internal functions in hansl + keywordsprefix ={\$}, + morekeywords={ % hansl commands: + add,adf,anova,append,ar,ar1,% + arbond,arch,arima,biprobit,boxplot,break,% + catch,chow,clear,coeffsum,coint,coint2,% + corr,corrgm,cusum,data,dataset,debug,% + delete,diff,difftest,discrete,dpanel,dummify,% + duration,elif,else,end,endif,endloop,% + eqnprint,equation,estimate,fcast,foreign,fractint,% + freq,function,garch,genr,gmm,gnuplot,% + graphpg,hausman,heckit,help,hsk,hurst,% + if,include,info,intreg,join,kalman,% + kpss,labels,lad,lags,ldiff,leverage,% + levinlin,logistic,logit,logs,loop,mahal,% + makepkg,markers,meantest,mle,modeltab,modprint,% + modtest,mpols,negbin,nls,normtest,nulldata,% + ols,omit,open,orthdev,outfile,panel,% + pca,pergm,poisson,print,printf,probit,% + pvalue,qlrtest,qqplot,quantreg,quit,rename,% + reset,restrict,rmplot,run,runs,scatters,% + sdiff,set,setinfo,setobs,setmiss,shell,% + smpl,spearman,sprintf,square,sscanf,store,% + summary,system,tabprint,textplot,tobit,tsls,% + var,varlist,vartest,vecm,vif,wls,% + xcorrgm,xtab,scalar,series,matrix,string},% + morekeywords=[2]{ % Functions + abs,acos,acosh,aggregate,argname,% + asin,asinh,atan,atanh,atof,% + bessel,BFGSmax,bkfilt,boxcox,bwfilt,% + cdemean,cdf,cdiv,ceil,cholesky,% + chowlin,cmult,cnorm,colname,colnames,% + cols,corr,corrgm,cos,cosh,% + cov,critical,cum,deseas,det,% + diag,diagcat,diff,digamma,dnorm,% + dsort,dummify,eigengen,eigensym,eigsolve,% + epochday,errmsg,exp,fcstats,fdjac,% + fft,ffti,filter,firstobs,fixname,% + floor,fracdiff,gammafun,getenv,getline,% + ghk,gini,ginv,halton,hdprod,% + hpfilt,I,imaxc,imaxr,imhof,% + iminc,iminr,inbundle,infnorm,inlist,% + int,inv,invcdf,invmills,invpd,% + irf,irr,isconst,isnan,isnull,% + isodate,iwishart,kdensity,kfilter,ksimul,% + ksmooth,kurtosis,lags,lastobs,ldet,% + ldiff,lincomb,ljungbox,lngamma,log,% + log10,log2,loess,logistic,lower,% + lrvar,max,maxc,maxr,mcorr,% + mcov,mcovg,mean,meanc,meanr,% + median,mexp,min,minc,minr,% + missing,misszero,mlag,mnormal,mols,% + monthlen,movavg,mpols,mrandgen,mread,% + mreverse,mrls,mshape,msortby,muniform,% + mwrite,mxtab,nadarwat,nelem,ngetenv,% + nobs,normal,npv,NRmax,nullspace,% + obs,obslabel,obsnum,ok,onenorm,% + ones,orthdev,pdf,pergm,pmax,% + pmean,pmin,pnobs,polroots,polyfit,% + princomp,prodc,prodr,psd,psdroot,% + pshrink,psum,pvalue,pxsum,qform,% + qnorm,qrdecomp,quadtable,quantile,randgen,% + randgen1,randint,rank,ranking,rcond,% + readfile,regsub,remove,replace,resample,% + round,rownames,rows,sd,sdc,% + sdiff,selifc,selifr,seq,setnote,% + simann,sin,sinh,skewness,sort,% + sortby,sqrt,sscanf,sst,strlen,% + strncmp,strsplit,strstr,strstrip,strsub,% + sum,sumall,sumc,sumr,svd,% + tan,tanh,toepsolv,tolower,toupper,% + tr,transp,trimr,typestr,uniform,% + uniq,unvech,upper,urcpval,values,% + var,varname,varnum,varsimul,vec,% + vech,weekday,wmean,wsd,wvar,% + xmax,xmin,xpx,zeromiss,zeros,% + },% + sensitive=t,% + morecomment=[l]{\#},% + morecomment=[s]{/*}{*/},% + morestring=[b]{"}}% +\lstalias{gretl}{hansl} +%% %% Haskell98 as implemented in Hugs98. See http://www.haskell.org %% All keywords from Prelude and Standard Libraries %% (c) 1999 Peter Bartke @@ -452,7 +570,7 @@ life,list_together,name number,orders,parse_name,plural,% react_after,react_before,short_name,short_name_indef,time_left,% time_out,when_closed,when_open,when_on,when_off,% - with_key}, + with_key},% % % Library routines morekeywords=[6]{Achieved,AfterRoutines,AllowPushDir,Banner,ChangePlayer,% diff --git a/Master/texmf-dist/tex/latex/listings/lstlang3.sty b/Master/texmf-dist/tex/latex/listings/lstlang3.sty index 5b4b9e94a43..22140c1be23 100644 --- a/Master/texmf-dist/tex/latex/listings/lstlang3.sty +++ b/Master/texmf-dist/tex/latex/listings/lstlang3.sty @@ -22,7 +22,7 @@ %% programming languages to Jobst Hoffmann at <j.hoffmann@fh-aachen.de>. %% \ProvidesFile{lstlang3.sty} - [2013/08/26 1.5b listings language file] + [2014/03/04 1.5c listings language file] \lst@definelanguage[68]{Algol}% {morekeywords={abs,and,arg,begin,bin,bits,bool,by,bytes,case,channel,% char,co,comment,compl,conj,divab,do,down,elem,elif,else,empty,% @@ -1522,7 +1522,7 @@ literate=% ignorespaces,immediate,indent,input,insert,insertpenalties,% interlinepenalty,jobname,kern,language,lastbox,lastkern,% lastpenalty,lastskip,lccode,leaders,left,lefthyphenmin,leftskip,% - leqno,let,limits,linepenalty,lineskip,lineskiplimits,long,% + leqno,let,limits,linepenalty,lineskip,lineskiplimit,long,% looseness,lower,lowercase,mag,mark,mathaccent,mathbin,mathchar,% mathchardef,mathchoice,mathclose,mathcode,mathinner,mathop,% mathopen,mathord,mathpunct,mathrel,mathsurround,maxdeadcycles,% @@ -1551,7 +1551,7 @@ literate=% vfilneg,vfuzz,voffset,vrule,vsize,vskip,vsplit,vss,vtop,wd,% widowpenalty,write,xdef,xleaders,xspaceskip,year},% sensitive,% - alsoother={0123456789$_},% + alsoother={0123456789$_},%$ to make Emacs fontlocking happy morecomment=[l]\%% }[keywords,tex,comments]% %% diff --git a/Master/texmf-dist/tex/latex/listings/lstmisc.sty b/Master/texmf-dist/tex/latex/listings/lstmisc.sty index 6d46c9a2d5b..f3c083d63a9 100644 --- a/Master/texmf-dist/tex/latex/listings/lstmisc.sty +++ b/Master/texmf-dist/tex/latex/listings/lstmisc.sty @@ -16,8 +16,8 @@ %% Send comments and ideas on the package, error reports and additional %% programming languages to Jobst Hoffmann at <j.hoffmann@fh-aachen.de>. %% -\def\filedate{2013/08/26} -\def\fileversion{1.5b} +\def\filedate{2014/03/04} +\def\fileversion{1.5c} \ProvidesFile{lstmisc.sty} [\filedate\space\fileversion\space(Carsten Heinz)] \lst@CheckVersion\fileversion |