diff options
author | Karl Berry <karl@freefriends.org> | 2010-11-18 00:31:46 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2010-11-18 00:31:46 +0000 |
commit | 57a41168bf79aad7fe801d13fe653640dab69686 (patch) | |
tree | 420c3d2d83a3a89ce3677d4e1370e43e83b945fa /Master/texmf-dist | |
parent | 82363687abbffeaa2b8e9fe3ea988d92702a09b1 (diff) |
parselines (16nov10)
git-svn-id: svn://tug.org/texlive/trunk@20468 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist')
-rw-r--r-- | Master/texmf-dist/doc/latex/parselines/parselines.pdf | bin | 153666 -> 159924 bytes | |||
-rw-r--r-- | Master/texmf-dist/source/latex/parselines/parselines.drv | 25 | ||||
-rw-r--r-- | Master/texmf-dist/source/latex/parselines/parselines.dtx | 179 | ||||
-rw-r--r-- | Master/texmf-dist/source/latex/parselines/parselines.ins | 8 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/parselines/parselines.sty | 10 |
5 files changed, 114 insertions, 108 deletions
diff --git a/Master/texmf-dist/doc/latex/parselines/parselines.pdf b/Master/texmf-dist/doc/latex/parselines/parselines.pdf Binary files differindex e985cf64e59..e28d2ca4679 100644 --- a/Master/texmf-dist/doc/latex/parselines/parselines.pdf +++ b/Master/texmf-dist/doc/latex/parselines/parselines.pdf diff --git a/Master/texmf-dist/source/latex/parselines/parselines.drv b/Master/texmf-dist/source/latex/parselines/parselines.drv index a47959217e2..9975b1bea8d 100644 --- a/Master/texmf-dist/source/latex/parselines/parselines.drv +++ b/Master/texmf-dist/source/latex/parselines/parselines.drv @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% parselines : 2010/06/20 v1.0 - parselines : catch file between delimiters or tags +%% parselines : 2010/11/16 v1.2 - parselines : catch file between delimiters or tags %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either @@ -24,9 +24,9 @@ %% Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr> %% \edef\thisfile{\jobname} -\def\thisinfo{a simple line parser for TeX (\FC)} -\def\thisdate{2010/10/23} -\def\thisversion{1.1} +\def\thisinfo{a simple line parser for TeX} +\def\thisdate{2010/11/16} +\def\thisversion{1.2} \def\CTANbaseurl{http://www.ctan.org/tex-archive/macros/latex} \def\CTANdisplay{CTAN:macros/latex} \makeatletter\protected\def\CTANhref{\@ifstar\CTANhrefstar\CTANhrefnost}\makeatother @@ -34,21 +34,24 @@ \newcommand*\CTANhrefnost[2][/contrib/]{\href{\CTANbaseurl#1#2}{\nolinkurl{\CTANdisplay#1#2}}} \let\loadclass\LoadClass \def\LoadClass#1{\loadclass[abstracton]{scrartcl}\let\scrmaketitle\maketitle\AtEndOfClass{\let\maketitle\scrmaketitle}} +\PassOptionsToPackage{svgnames}{xcolor} \documentclass[a4paper,oneside]{ltxdoc} +\AtBeginDocument{\DeleteShortVerb{\|}} \usepackage[latin1]{inputenc} \usepackage[american]{babel} \usepackage[T1]{fontenc} -\usepackage{etex,etoolbox,geometry,lastpage,tocloft,titlesec,graphicx,xspace,tabularx,fancyhdr,color,bbding,embedfile,framed,multirow,txfonts,multirow,makecell,enumitem,arydshln,atveryend,catchfile} -\usepackage[hyperindex=false,pdfusetitle,colorlinks,pdfpagelabels,pdfencoding=auto]{hyperref} -\usepackage{interfaces} +\usepackage{etex,etoolbox,geometry,lastpage,tocloft,titlesec,graphicx,xspace,relsize} +\usepackage{tabularx,fancyhdr,xcolor,bbding,embedfile,framed,multirow,txfonts,multirow,makecell,enumitem,arydshln,atveryend,catchfile} +\usepackage[expansion=alltext,protrusion=alltext]{microtype} +\usepackage{interfaces}[2010/11/15] +\usepackage{tabu}[2010/11/15] \csname endofdump\endcsname -\usepackage{holtxdoc} +\usepackage{holtxdoc,bookmark} \CodelineNumbered -\usepackage{fancyvrb} -\usepackage[svgnames]{xcolor} +\usepackage{fancyvrb}\fvset{gobble=1,listparameters={\topsep=0pt}} \usepackage{parselines} \lastlinefit999 -\geometry{top=1.2cm,headheight=1cm,headsep=.3cm,bottom=1.4cm,footskip=.5cm,left=2.5cm,right=1cm} +\geometry{top=0pt,includeheadfoot,headheight=.6cm,headsep=.6cm,bottom=.6cm,footskip=.5cm,left=4cm,right=1.5cm} \hypersetup{% pdftitle={The parselines package}, pdfsubject={a simple line parser for TeX}, diff --git a/Master/texmf-dist/source/latex/parselines/parselines.dtx b/Master/texmf-dist/source/latex/parselines/parselines.dtx index 9bc64200590..4a9cf1749be 100644 --- a/Master/texmf-dist/source/latex/parselines/parselines.dtx +++ b/Master/texmf-dist/source/latex/parselines/parselines.dtx @@ -1,5 +1,5 @@ % \iffalse meta-comment -% parselines : 2010/10/23 v1.1 - parselines : a simple line parser for TeX] +% parselines : 2010/11/16 v1.2 - parselines : a simple line parser for TeX] % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either @@ -36,7 +36,7 @@ \input docstrip.tex \Msg{************************************************************************} \Msg{* Installation} -\Msg{* Package: 2010/10/23 v1.1 - parselines : a simple line parser for TeX} +\Msg{* Package: 2010/11/16 v1.2 - parselines : a simple line parser for TeX} \Msg{************************************************************************} \keepsilent @@ -47,7 +47,7 @@ This is a generated file. -parselines : 2010/10/23 v1.1 - parselines : catch file between delimiters or tags +parselines : 2010/11/16 v1.2 - parselines : catch file between delimiters or tags This work may be distributed and/or modified under the conditions of the LaTeX Project Public License, either @@ -70,7 +70,7 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr> \file{parselines.sty}{\from{parselines.dtx}{package}}% } -\askforoverwritetrue +\askforoverwritefalse \generate{% \file{parselines.drv}{\from{parselines.dtx}{driver}}% } @@ -97,9 +97,9 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr> %</ignore> %<*driver> \edef\thisfile{\jobname} -\def\thisinfo{a simple line parser for TeX (\FC)} -\def\thisdate{2010/10/23} -\def\thisversion{1.1} +\def\thisinfo{a simple line parser for TeX} +\def\thisdate{2010/11/16} +\def\thisversion{1.2} \def\CTANbaseurl{http://www.ctan.org/tex-archive/macros/latex} \def\CTANdisplay{CTAN:macros/latex} \makeatletter\protected\def\CTANhref{\@ifstar\CTANhrefstar\CTANhrefnost}\makeatother @@ -107,21 +107,24 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr> \newcommand*\CTANhrefnost[2][/contrib/]{\href{\CTANbaseurl#1#2}{\nolinkurl{\CTANdisplay#1#2}}} \let\loadclass\LoadClass \def\LoadClass#1{\loadclass[abstracton]{scrartcl}\let\scrmaketitle\maketitle\AtEndOfClass{\let\maketitle\scrmaketitle}} +\PassOptionsToPackage{svgnames}{xcolor} \documentclass[a4paper,oneside]{ltxdoc} +\AtBeginDocument{\DeleteShortVerb{\|}} \usepackage[latin1]{inputenc} \usepackage[american]{babel} \usepackage[T1]{fontenc} -\usepackage{etex,etoolbox,geometry,lastpage,tocloft,titlesec,graphicx,xspace,tabularx,fancyhdr,color,bbding,embedfile,framed,multirow,txfonts,multirow,makecell,enumitem,arydshln,atveryend,catchfile} -\usepackage[hyperindex=false,pdfusetitle,colorlinks,pdfpagelabels,pdfencoding=auto]{hyperref} -\usepackage{interfaces} +\usepackage{etex,etoolbox,geometry,lastpage,tocloft,titlesec,graphicx,xspace,relsize} +\usepackage{tabularx,fancyhdr,xcolor,bbding,embedfile,framed,multirow,txfonts,multirow,makecell,enumitem,arydshln,atveryend,catchfile} +\usepackage[expansion=alltext,protrusion=alltext]{microtype} +\usepackage{interfaces}[2010/11/15] +\usepackage{tabu}[2010/11/15] \csname endofdump\endcsname -\usepackage{holtxdoc} +\usepackage{holtxdoc,bookmark} \CodelineNumbered -\usepackage{fancyvrb} -\usepackage[svgnames]{xcolor} +\usepackage{fancyvrb}\fvset{gobble=1,listparameters={\topsep=0pt}} \usepackage{parselines} \lastlinefit999 -\geometry{top=1.2cm,headheight=1cm,headsep=.3cm,bottom=1.4cm,footskip=.5cm,left=2.5cm,right=1cm} +\geometry{top=0pt,includeheadfoot,headheight=.6cm,headsep=.6cm,bottom=.6cm,footskip=.5cm,left=4cm,right=1.5cm} \hypersetup{% pdftitle={The parselines package}, pdfsubject={a simple line parser for TeX}, @@ -182,7 +185,6 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr> % \makeatletter % \newrobustcmd\ClearPage{\@ifstar\clearpage{}} % \makeatletter -% \MakeShortVerb{\+}\DeleteShortVerb{\|}\DefineShortVerb{\|} % \catcode`\§ \active \def§{\@ifnextchar §{\par\nobreak\vskip-2\parskip}{\par\nobreak\vskip-\parskip}} % \def\thispackage{\xpackage{{\pkgcolor\thisfile}}\xspace} % \def\ThisPackage{\Xpackage{\thisfile}\xspace} @@ -191,9 +193,8 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr> % \def\X@@package#1#2[#3]{\xpackage{#2\footnote{\noindent\xpackage{#2}: \CTANhref{#1}#3}}} % \def\Underbrace#1_#2{$\underbrace{\vtop to2ex{}\hbox{#1}}_{\footnotesize\hbox{#2}}$} % -% \parindent\z@\parskip.4\baselineskip\topsep\parskip\partopsep\z@ -% \g@addto@macro\macro@font{\macrocodecolor\let\AltMacroFont\macro@font} -% \g@addto@macro\@list@extra{\parsep\parskip\topsep\z@\itemsep\z@} +% \parindent\z@\parskip.4\baselineskip\topsep\parskip\partopsep\z@\leftmargini=2.5cm +% \widowpenalty=5000\clubpenalty=8000 % \DefineVerbatimEnvironment{VerbLines}{Verbatim}{gobble=1,frame=lines,framesep=6pt,fontfamily=txtt,fontseries=m} % \DefineVerbatimEnvironment{VerbLines*}{Verbatim}{gobble=1,frame=lines,framesep=6pt,fontfamily=txtt,fontseries=m,commandchars=$()} % \DefineVerbatimEnvironment{Verb}{Verbatim}{gobble=1,fontfamily=txtt,fontseries=m} @@ -238,9 +239,9 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr> % }\expandafter\thisyear\thisdate\@nil % } % \renewrobustcmd\declcs[2][]{^^A -% \par\addvspace\parskip^^A{.5ex plus 1ex}\noindent +% \par\addvspace\parskip % \goodbreak -% \noindent +% \noindent\changefont{spread=1}^^A % \hspace{-\leftmargini}^^A % \def\*{\unskip\,\texttt{*}}^^A % \begin{tabular}{|l|}^^A @@ -255,33 +256,45 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr> % \noindent % \ignorespacesafterend % } +% \def\declmargin{\hspace*{\dimexpr-\leftmargini+\arrayrulewidth+\tabcolsep}} +% \pretocmd\textasteriskcentered{\usefont{OMS}{cmsy}mn}{}{} % % \pagesetup{% -% head/rule, -% head/left=\footnotesize\color[gray]{.35} The \thispackage package -- \thisinfo, -% head/right=\lk\footnotesize\bfseries\thefirstmarks{section}, -% ^^Afoot/left=\color[gray]{.35}\scriptsize\thispackage\quad[rev.\thisversion]\quad\copyright\oldstylenums{2010}\,\lower.3ex\hbox{\NibRight}\,\FC, -% foot/left=\thispackage\,[rev.\thisversion]\,\copyright\,\thisyear\,\lower.4ex\hbox{\pkgcolor\NibRight}\,\FC,% +% norules, +% left/offset=3cm,foot/left/offset+=.5cm,right/offset=1cm, +% font=\scriptsize,foot/font+=\lk, +% head/color=LightSteelBlue, +% head/left=\moveleft1cm\vbox to\z@{\vss\setbox0=\null\ht0=\z@\wd0=\paperwidth\dp0=\headheight\rlap{\colorbox{GhostWhite}{\box0}}}\vskip-\headheight\thispackage\ -- \thisinfo, +% head/right=\lk\sffamily\thefirstmarks{section}, +% foot/left=\vbox to\baselineskip{\vss{{\rotatebox[origin=l]{90}{\thispackage\,[rev.\thisversion]\,\copyright\,\thisyear\,\lower.4ex\hbox{\pkgcolor\NibRight}\,\FC}}}}, % foot/right=\oldstylenums{\arabic{page}} / \oldstylenums{\pageref{LastPage}}% % } % \pagesetup[plain]{% -% norules, -% foot/right=\oldstylenums{\arabic{page}} / \oldstylenums{\pageref{LastPage}}, +% norules,font=\scriptsize, +% left/offset=3cm,foot/left/offset+=.5cm,right/offset=1cm, +% foot/font=\lk\scriptsize, +% foot/right=\oldstylenums{\arabic{page}} / \oldstylenums{\pageref{LastPage}}, +% foot/left=\vbox to\baselineskip{\vss{{\rotatebox[origin=l]{90}{\thispackage\,[rev.\thisversion]\,\copyright\,\thisyear\,\lower.4ex\hbox{\pkgcolor\NibRight}\,\FC\quad \xemail{florent.chervet at free.fr}}}}}, % } % \pagestyle{fancy} -% \sectionformat\section{mark=\marksthe{section}{#1},top-=12pt} -% \sectionformat\subsection{top-=6pt} +% \sectionformat\section{mark=\marksthe{section}{#1},top-=12pt,bottom=2pt} +% \sectionformat\subsection{top=2pt,bottom=2pt} % -% \newrobustcmd*\macrocodecolor{\color{macrocode}}\definecolor{macrocode}{rgb}{0.18,0.00,0.45} +% \newrobustcmd*\macrocodecolor{\color{macrocode}}\definecolor{macrocode}{rgb}{0.05,0.02,0.07} % \newrobustcmd*\IMPLEMENTATION{% % \hypersetup{bookmarksopenlevel=1} % \section{Implementation} \label{sec:implementation}} -% \renewrobustcmd*\PrintMacroName[1]{% -% \setbox0\hbox{\MacroFont \strut \string #1\ }% -% \global\labelsep\dimexpr\wd0-3em\relax\global\itemindent\labelsep -% \hbox to4em{\box0\hss}} -% -% \newcommand\reflinkcolor{\color{reflink}}\definecolor{reflink}{rgb}{0.49,0.00,0.00} +% \let\plainllap\llap +% \newrobustcmd\macro@llap[1]{\global\let\llap\plainllap\setbox0\hbox{#1}^^A +% \ifdim\wd0>4cm\hbox to\z@{\hss\hbox to4cm{#1\hss}}^^A +% \edef\@tempa{\the\everypar\hskip\dimexpr\the\wd0-4cm\relax\global\everypar{}}% +% \global\everypar\expandafter{\@tempa}^^A +% \else\hbox to\z@{\hss#1}\fi +% \setbox\z@\box\voidb@x} +% \pretocmd\macro{\MacrocodeTopsep=\z@skip\MacroTopsep\z@skip\let\llap\macro@llap\parsep=\z@\topsep=\z@\itemsep=\z@\partopsep\z@}{}{} +% \apptocmd\endmacro{\goodbreak\vskip.3\parskip}{}{} +% +% \newcommand\reflinkcolor{\color{reflink}}\colorlet{reflink}{DarkSlateBlue} % \newrobustcmd\stform{\@ifnextchar*{\@stform[]\textasteriskcentered\@gobble}\@stform} % \newrobustcmd\@stform[2][\string]{\textttbf{\rred#1#2}\xspace} % @@ -290,14 +303,13 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr> % \deffootnote{1em}{0pt}{\rlap{\textsuperscript{\thefootnotemark}}\kern1em} % % \title{\vspace*{-28pt}\mdseries The {\bfseries\thispackage\footnotemark}\kern.6em package} -% \author{\tiny\xemail{florent.chervet at free.fr}} -% \date{\thisdate~--~version \thisversion} -% \subtitle{\thisinfo} -% ^^A\subject{\thisinfo} +% \author{\small\thisdate~--~version \thisversion} +% \date{} +% \subtitle{\LARGE\thisinfo\endgraf {\small\FC}} % \maketitle % % \makeatletter\begingroup\let\@thefnmark\@empty\let\@makefntext\@firstofone -% \footnotetext{\noindent\scriptsize +% \footnotetext{\noindent\topsep=0pt\scriptsize % This documentation is produced with the +DocStrip+ utility. % \begin{tabbing} % \qquad\=\smex\=To get the documentation, \= run (thrice):\quad\= \texttt{pdflatex \thisfile.dtx} \\ @@ -308,43 +320,42 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr> % \endgroup\makeatother % % \deffootnote{1em}{0pt}{\rlap{\thefootnotemark.}\kern1em} -% \vspace*{-26pt} -% \begin{abstract}\parskip\medskipamount\parindent0pt\noindent\leftskip1cm\rightskip\leftskip\lastlinefit0% +% +% {\let\quotation\relax\vspace*{-1cm}% +% \begin{abstract}\parskip\medskipamount\parindent0pt\lastlinefit0\leftskip1cm\rightskip\leftskip % -% \thispackage provides an environment {\vbbf parse lines} which applies a macro -% to each line of the input between \cs{begin}\M*{{\red parse lines}}\, and\, \cs{end}\M*{{\red parse lines}}. +% \thispackage provides an environment ``\textt{parse lines}'' which applies a macro +% to each line of the input between \cs{begin}\M*{{\dg parse lines}}\, and\, \cs{end}\M*{{\dg parse lines}}. % -% There is also a macro: \cs[\red]{dofilebyline}: its purpose is to expand a user-defined macro \cs{do} with +% There is also a macro: \cs{dofilebyline}: its purpose is to expand a user-defined macro \cs{do} with % one parameter (the line) on each line of a given text file. % % This packages requires \eTeX and no other package. % % \end{abstract} % -% \DeleteShortVerb{\+}\enlargethispage{\baselineskip} -% \cftbeforesecskip=4pt plus2pt minus2pt -% \cftbeforesubsecskip=0pt plus2pt minus2pt -% -% ^^A\vskip-.8\baselineskip % \tocsetup{ % title/top-=6pt, % title=Contents\quad\leaders\vrule height3.4pt depth-3pt\hfill\null\kern0pt\vskip-6pt, % bookmark={text=Contents,bold}, % after=\leavevmode\leaders\vrule height3.4pt depth-3pt\hfill\null, -% twocolumns} +% twocolumns, +% dot=$\scriptscriptstyle\ldotp$, +% dotsep=1mu, +% section/leaders,section/dotsep, +% section/skip=4pt plus2pt minus2pt, +% subsection/skip=0pt plus2pt minus2pt, +% } % \tableofcontents -% -% % \hypersetup{bookmarksopenlevel=2} % -% % \MakeShortVerb{\+} % % % \section{User interface} % \label{userinterface} % -% \bottomtitles=.3\textwidth +% \bottomtitles=.3\textwidth \enlargethispage\baselineskip % % \subsection[The parse lines environment]{The \textttbf{parse lines} environment} % @@ -352,17 +363,18 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr> % \cs{end}\M{\red parse lines} % \end{declcs} % -% Example (with \xpackage{xcolor}) -- inside the environment \cs[\red]{row} expands to the current row number (stored in \cs{count@}): +% Example (with \xpackage{xcolor}) -- inside the environment \cs[\red]{row} expands to the current row number +% (stored in plain \TeX{} register \cs{count@}): % % \begin{SaveVerbatim}[commandchars=$(),gobble=1]{myVerb} % ($db(\definecolorseries)){serie}{rgb}{last}{Goldenrod}{DarkSeaGreen} % ($db(\resetcolorseries))[3]{serie} -% \begin{($dr$underline(parse lines))}{($dg(\color{serie!!+}``#1''\par))} +% \begin{($dg$underline(parse lines))}{($db(\color{serie!!+}``#1''\par))} % This is a nice little package % and I really don't know % What to do with it ! % May be tomorrow... -% \end{($dr$underline(parse lines))} +% \end{($dg$underline(parse lines))} % \end{SaveVerbatim} % % \setbox1=\vbox{\hsize=.6\linewidth\UseVerbatim{myVerb}} @@ -378,21 +390,19 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr> % \end{parse lines} % } % -% \begin{tabular}{p{.7\linewidth}p{.25\linewidth}} -% \box1 & \box 0 -% \end{tabular} +% \begin{tabu}{X[3]X}\savetabu{example} +% \copy1 & \copy0 +% \end{tabu} % -% {\small % \definecolorseries{serie}{rgb}{last}{Fuchsia}{MidnightBlue} % \resetcolorseries[3]{serie} % \begin{SaveVerbatim}[commandchars=$(),gobble=1]{myVerb} -% -% \begin{($dr$underline(parse lines))}{($dr(\row)): #1\par} +% \begin{($dg$underline(parse lines))}{($dr(\row)): #1\par} % This is a nice little package % and I really don't know % What to do with it ! % May be tomorrow... -% \end{($dr$underline(parse lines))} +% \end{($dg$underline(parse lines))} % \end{SaveVerbatim} % \setbox1=\vbox{\hsize=.6\linewidth\UseVerbatim{myVerb}} % \setbox0=\vbox{% @@ -404,10 +414,10 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr> % May be tomorrow... % \end{parse lines} % } -% \begin{tabular}{b{.7\linewidth}b{.25\linewidth}} -% \box1 & \box 0 -% \end{tabular} -% } +% +% \begin{tabu}{\usetabu{example}} +% \copy1 & \copy0 +% \end{tabu} % % % \subsection[\cs{dofilebyline}]{\csbf{dofilebyline}} @@ -449,7 +459,7 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr> \NeedsTeXFormat{LaTeX2e}% LaTeX 2.09 can't be used (nor non-LaTeX) [2005/12/01]% LaTeX must be 2005/12/01 or younger \ProvidesPackage{parselines} - [2010/08/13 v1.0 - a simple line parser for TeX] + [2010/11/16 v1.2 - a simple line parser for TeX] % \end{macrocode} % % \subsection{Collecting stuff inside an environment} @@ -478,7 +488,8 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr> \parselin@tk{}\def\parselin@stack{b}\parselin@Collect@Body }% \CollectEnvir \long\def\parselin@Collect@Body#1\end#2{% - \edef\parselin@stack{\parselin@PushBegins#1\begin\end\expandafter\@gobble\parselin@stack}% + \edef\parselin@stack{\parselin@PushBegins#1\begin\end + \expandafter\@gobble\parselin@stack}% \ifx\parselin@stack\@empty \global\parselin@tk\expandafter{\the\parselin@tk#1}% \aftergroup\parselin@Finish @@ -488,7 +499,8 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr> \expandafter\parselin@Collect@Body % recurse \fi }% \parselin@Collect@Body -\long\def\parselin@PushBegins#1\begin#2{\ifx\end#2\else b\expandafter\parselin@PushBegins\fi} +\long\def\parselin@PushBegins#1\begin#2{% + \ifx\end#2\else b\expandafter\parselin@PushBegins\fi} \expandafter\def\expandafter\parselin@isatoken \expandafter#\expandafter1\string\toks#2\relax{\detokenize{#2}\relax}% % \end{macrocode} @@ -560,16 +572,13 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr> % \DeleteShortVerb{\+} % \begin{History} % -% ^^A \begin{Version}{2010/06/20 v1.2} -% ^^A \item -% ^^A \end{Version} -% ^^A -% ^^A \begin{Version}{2010/06/06 v1.1} -% ^^A \item -% ^^A \end{Version} +% \begin{Version}{2010/11/16 v1.2} +% \item Fix in CTAN archive (\xext{ins} file). +% \end{Version} +% % \begin{Version}{2010/10/23 v1.1} % \item \cs{row} counter added -% \item Better documentation. +% \item Improved documentation. % \end{Version} % % \begin{Version}{2010/06/20 v1.0} @@ -578,14 +587,6 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr> % % \end{History} % -% \begin{thebibliography}{9} -% -% \bibitem{docstrip} -% \textit{The \xpackage{docstrip} program}; -% 2009/09/25 v2.5d; -% \CTAN{macros/latex/base/}. -% -% \end{thebibliography} % % \PrintIndex % diff --git a/Master/texmf-dist/source/latex/parselines/parselines.ins b/Master/texmf-dist/source/latex/parselines/parselines.ins index 6a8f5a5d47e..25fd5d2796c 100644 --- a/Master/texmf-dist/source/latex/parselines/parselines.ins +++ b/Master/texmf-dist/source/latex/parselines/parselines.ins @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% parselines : 2010/06/20 v1.0 - parselines : catch file between delimiters or tags +%% parselines : 2010/11/16 v1.2 - parselines : catch file between delimiters or tags %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either @@ -26,7 +26,7 @@ \input docstrip.tex \Msg{************************************************************************} \Msg{* Installation} -\Msg{* Package: 2010/10/23 v1.1 - parselines : a simple line parser for TeX} +\Msg{* Package: 2010/11/16 v1.2 - parselines : a simple line parser for TeX} \Msg{************************************************************************} \keepsilent @@ -37,7 +37,7 @@ This is a generated file. -parselines : 2010/10/23 v1.1 - parselines : catch file between delimiters or tags +parselines : 2010/11/16 v1.2 - parselines : catch file between delimiters or tags This work may be distributed and/or modified under the conditions of the LaTeX Project Public License, either @@ -60,7 +60,7 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr> \file{parselines.sty}{\from{parselines.dtx}{package}}% } -\askforoverwritetrue +\askforoverwritefalse \generate{% \file{parselines.drv}{\from{parselines.dtx}{driver}}% } diff --git a/Master/texmf-dist/tex/latex/parselines/parselines.sty b/Master/texmf-dist/tex/latex/parselines/parselines.sty index 62ae077860e..6d69b67b753 100644 --- a/Master/texmf-dist/tex/latex/parselines/parselines.sty +++ b/Master/texmf-dist/tex/latex/parselines/parselines.sty @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% parselines : 2010/06/20 v1.0 - parselines : catch file between delimiters or tags +%% parselines : 2010/11/16 v1.2 - parselines : catch file between delimiters or tags %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either @@ -26,7 +26,7 @@ \NeedsTeXFormat{LaTeX2e}% LaTeX 2.09 can't be used (nor non-LaTeX) [2005/12/01]% LaTeX must be 2005/12/01 or younger \ProvidesPackage{parselines} - [2010/08/13 v1.0 - a simple line parser for TeX] + [2010/11/16 v1.2 - a simple line parser for TeX] \ifdefined\globtoks \globtoks\parselin@tk \else \newtoks\parselin@tk \fi @@ -50,7 +50,8 @@ \parselin@tk{}\def\parselin@stack{b}\parselin@Collect@Body }% \CollectEnvir \long\def\parselin@Collect@Body#1\end#2{% - \edef\parselin@stack{\parselin@PushBegins#1\begin\end\expandafter\@gobble\parselin@stack}% + \edef\parselin@stack{\parselin@PushBegins#1\begin\end + \expandafter\@gobble\parselin@stack}% \ifx\parselin@stack\@empty \global\parselin@tk\expandafter{\the\parselin@tk#1}% \aftergroup\parselin@Finish @@ -60,7 +61,8 @@ \expandafter\parselin@Collect@Body % recurse \fi }% \parselin@Collect@Body -\long\def\parselin@PushBegins#1\begin#2{\ifx\end#2\else b\expandafter\parselin@PushBegins\fi} +\long\def\parselin@PushBegins#1\begin#2{% + \ifx\end#2\else b\expandafter\parselin@PushBegins\fi} \expandafter\def\expandafter\parselin@isatoken \expandafter#\expandafter1\string\toks#2\relax{\detokenize{#2}\relax}% \newenvironment{parse lines}[2][] |