From 556be84e15626e95b60d671dcedfad9856dc4a82 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 26 Jan 2011 23:19:48 +0000 Subject: texapi (26jan11) git-svn-id: svn://tug.org/texlive/trunk@21182 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/generic/texapi/README | 6 ++- .../texmf-dist/doc/generic/texapi/texapi-doc.pdf | Bin 188968 -> 161785 bytes .../texmf-dist/doc/generic/texapi/texapi-doc.tex | 50 ++++----------------- Master/texmf-dist/tex/generic/texapi/texapi.tex | 21 ++++++--- 4 files changed, 26 insertions(+), 51 deletions(-) (limited to 'Master/texmf-dist') diff --git a/Master/texmf-dist/doc/generic/texapi/README b/Master/texmf-dist/doc/generic/texapi/README index c92eb7e27b5..e8104544660 100644 --- a/Master/texmf-dist/doc/generic/texapi/README +++ b/Master/texmf-dist/doc/generic/texapi/README @@ -2,7 +2,7 @@ This is the README file for the texapi package. Author: Paul Isambert. E-mail: zappathustra AT free DOT fr Comments and suggestions are welcome. -Date: July 2010. +Date: January 2011. The package is set of macros to write format-independent (and -aware) packages. @@ -19,5 +19,7 @@ texapi-doc.pdf => The typeset documentation. To process the documentation source, you need the piTeX files (available on CTAN) on top of plain TeX with LuaTeX at least v.0.6. Non-free fonts are used. +... err, no actually, don't typeset it, the PiTeX version +on CTAN is way too old. It'll be updated someday. -Licensing of this package is covered by LPPL. \ No newline at end of file +Licensing of this package is covered by LPPL. diff --git a/Master/texmf-dist/doc/generic/texapi/texapi-doc.pdf b/Master/texmf-dist/doc/generic/texapi/texapi-doc.pdf index b5f012612c5..7e643911aab 100644 Binary files a/Master/texmf-dist/doc/generic/texapi/texapi-doc.pdf and b/Master/texmf-dist/doc/generic/texapi/texapi-doc.pdf differ diff --git a/Master/texmf-dist/doc/generic/texapi/texapi-doc.tex b/Master/texmf-dist/doc/generic/texapi/texapi-doc.tex index 32fe3753151..83d0c3e47d7 100644 --- a/Master/texmf-dist/doc/generic/texapi/texapi-doc.tex +++ b/Master/texmf-dist/doc/generic/texapi/texapi-doc.tex @@ -15,9 +15,9 @@ display = outlines \setparameter page: - pagewidth = 32cm - pageheight = 30cm - lines = 45 + width = 32cm + height = 32cm + lines = 46 hsize = 10cm baselineskip = 14pt left = 10cm @@ -52,21 +52,17 @@ \setparameter font: command = \tcodefont - name = ltype + name = lucon size = 9.5pt type = ttf roman = {} - bold = b - italic = o \setparameter font: command = \cscodefont - name = ltype + name = lucon size = 8.5pt type = ttf roman = {} - bold = b - italic = o \def\codefont{% \ifcslist \cscodefont @@ -220,6 +216,7 @@ \fi \let\exampleskip\relax \cslisttrue \codefont + \overfullrule=0pt \typesetexample \vskip\baselineskip \mainfont @@ -261,7 +258,7 @@ \hfill Date: \usevalue document : date \par \vskip\baselineskip \noindent Typeset in Chaparral Pro (Carol Twombly) - and Lucida Sans Typewriter (Charles Bigelow and Kris Holmes) + and Lucida Console\hfil\penalty-10000 (Charles Bigelow and Kris Holmes) with Lua\TeX\ v.\the\luatexversion.\luatexrevision. } @@ -1504,6 +1501,7 @@ to know (in a perfectly expandable way) the loop we're currently in, hence the \comarg\ as a argument to \com\resumefor: it is the loop one wants to start again. Yes, it means you can also process the rest of the material with another loop, the consequences of which I leave it to you to ponder. +Passed arguments, if any, should follow \comarg\ after \com\resumefor. \Example @@ -1843,35 +1841,3 @@ string is a palindrome. \bye - - - - - - - - - - -\sortbooks{}{% - The Broom of the System (1987),% - Infinite Jest (1995),% - Girl with Curious Hair (1989),% - Brief Interviews with Hideous Men (1999),% - Oblivion (2004),% - The Pale King (2011),} - -\newfor\palin{2}#3{% - \passargs{\numexpr(#1+1)}{#2#3}% - }{\palincheck{\numexpr(#1/2)}{}{#2}} -\newfor\palincheck{2}#3{% - \reverse\straightenif{ifnum}{\numexpr(#1-1)>0 } - {\retrievefor{\compare{#3#2}}} - {\passargs{\numexpr(#1-1)}{#3#2}} - }{} -\def\compare#1#2{% - \ifstring{#1}{#2}{TRUE}{FALSE}% - } - - -+\edef\foo{\palin{0}{}{in noctes .. setconni}}+\foo diff --git a/Master/texmf-dist/tex/generic/texapi/texapi.tex b/Master/texmf-dist/tex/generic/texapi/texapi.tex index 4cb16ddeec9..28f33717fb3 100644 --- a/Master/texmf-dist/tex/generic/texapi/texapi.tex +++ b/Master/texmf-dist/tex/generic/texapi/texapi.tex @@ -4,7 +4,7 @@ % Author: Paul Isambert. % E-mail: zappathustra AT free DOT fr % Comments and suggestions are welcome. -% Date: July 2010. +% Date: January 2011. % \ifx\texapialreadyloaded\somethingtotallyundefined \else @@ -16,7 +16,7 @@ \expandafter\endinput \fi % -\def\texapiversion{1.02} +\def\texapiversion{1.03} \expandafter\edef\csname pi@restorecatcodes\endcsname{% \catcode`\noexpand\@=\the\catcode`@\relax \catcode`\noexpand\_=\the\catcode`_\relax @@ -596,6 +596,9 @@ \long\defcs{getargs@pi@newfor_userdefined:\commandtoname#1}#6###5\pi@newfor_preloop{% #9{\usecs{pi@newfor_userdefined:\commandtoname#1}#7}% }% + \long\defcs{removeargs@pi@newfor_userdefined:\commandtoname#1}#6###5{% + ##1% + }% \passexpandednobraces{\long\defcs{retrievefor@pi@newfor_userdefined:\commandtoname#1}##1##2}% {\pi@temp#8\pi@terminator}% {\passexpanded{##1}{#9{}##2}}% @@ -610,7 +613,11 @@ {\gobbleoneand{#1}} {#1}% } -\long\def\pausefor#1#2\pi@newfor_markloop#3{#1} +\long\def\pausefor#1#2\pi@newfor_markloop#3{% + \ifstring{#3}{pi@dofor_control} + {#1} + {\usecs{removeargs@#3}{#1}}% + } \long\def\resumefor#1{% \ifstring{#1}{\dofor} {\pi@dofor_control} @@ -862,7 +869,7 @@ \long\def\passtrimleft#1#2{% \expandafter\swaprightbraced\expandafter{\romannumeral-`\.\noexpand#1}{#2}% } -\def\trimleft#1{% +\long\def\trimleft#1{% \passtrimleft{#1}\unbrace } \bgroup @@ -877,13 +884,13 @@ #3{#1}% } \egroup -\def\trimright#1{% +\long\def\trimright#1{% \passtrimright{#1}\unbrace } \long\def\passtrim#1{% \passtrimleft{#1}\passtrimright } -\def\trim#1{% +\long\def\trim#1{% \passtrim{#1}\unbrace } \long\pdef\deftrimleft#1#2{% @@ -897,4 +904,4 @@ } \pi@restorecatcodes -\endinput \ No newline at end of file +\endinput -- cgit v1.2.3