From 1dd12f0cdb395b2f0be720638566c238b2354a71 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 8 Dec 2010 23:09:48 +0000 Subject: linegoal (8dec10) git-svn-id: svn://tug.org/texlive/trunk@20691 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/source/latex/linegoal/linegoal.drv | 19 ++-- .../texmf-dist/source/latex/linegoal/linegoal.dtx | 108 +++++++++++++-------- .../texmf-dist/source/latex/linegoal/linegoal.ins | 7 +- 3 files changed, 78 insertions(+), 56 deletions(-) (limited to 'Master/texmf-dist/source/latex/linegoal') diff --git a/Master/texmf-dist/source/latex/linegoal/linegoal.drv b/Master/texmf-dist/source/latex/linegoal/linegoal.drv index b3ae9351879..1488356a350 100644 --- a/Master/texmf-dist/source/latex/linegoal/linegoal.drv +++ b/Master/texmf-dist/source/latex/linegoal/linegoal.drv @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% linegoal : 2010/11/30 v2.6 - linegoal : a new dimen corresponding to the remainder of the line +%% linegoal : 2010/12/07 v2.7 - linegoal : a new dimen corresponding to the remainder of the line %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either @@ -25,13 +25,10 @@ %% \edef\thisfile{\jobname} \def\thisinfo{A new ``dimen'' corresponding to the remainder of the line} -\def\thisdate{2010/11/30} -\def\thisversion{2.6} -\def\CTANbaseurl{http://www.ctan.org/tex-archive/macros/latex} -\def\CTANdisplay{CTAN:macros/latex} -\makeatletter\protected\def\CTANhref{\@ifstar\CTANhrefstar\CTANhrefnost}\makeatother -\newcommand*\CTANhrefstar[3][/contrib/]{\href{\CTANbaseurl#1#2}{#3}} -\newcommand*\CTANhrefnost[2][/contrib/]{\href{\CTANbaseurl#1#2}{\nolinkurl{\CTANdisplay#1#2}}} +\def\thisdate{2010/12/07} +\def\thisversion{2.7} +\def\CTANbaseurl{http://www.ctan.org/tex-archive/} +\def\CTANhref#1#2{\href{\CTANbaseurl/help/Catalogue/entries/#1.html}{\nolinkurl{CTAN:help/Catalogue/entries/#1.html}}} \let\loadclass\LoadClass \def\LoadClass#1{\loadclass[abstracton]{scrartcl}\let\scrmaketitle\maketitle\AtEndOfClass{\let\maketitle\scrmaketitle}} \PassOptionsToPackage{svgnames}{xcolor} @@ -40,14 +37,16 @@ \usepackage{inputenc,babel} \usepackage[T1]{fontenc} \usepackage{etoolbox,geometry,xcolor,bbding,txfonts,xspace,hologo,graphicx} -\usepackage{lastpage,fancyhdr,titlesec,enumitem,framed,tocloft,tabu,multirow,makecell,tabularx} +\usepackage{lastpage,fancyhdr,titlesec,enumitem,framed,tocloft,multirow,makecell} +\usepackage[linegoal,delarray]{tabu} \usepackage{embedfile} \usepackage{interfaces} -\csname endofdump\endcsname \CodelineNumbered\lastlinefit999 \usepackage{holtxdoc,bookmark} \usepackage{linegoal} \usepackage{fancyvrb}\fvset{gobble=1,listparameters={\topsep=0pt}} +\usepackage{tabularx} +\csname endofdump\endcsname \hypersetup{% pdftitle={The linegoal package}, pdfsubject={A new dimen corresponding to the remainder of the line}, diff --git a/Master/texmf-dist/source/latex/linegoal/linegoal.dtx b/Master/texmf-dist/source/latex/linegoal/linegoal.dtx index bf5f95c2d36..baeae66608b 100644 --- a/Master/texmf-dist/source/latex/linegoal/linegoal.dtx +++ b/Master/texmf-dist/source/latex/linegoal/linegoal.dtx @@ -1,5 +1,5 @@ % \iffalse meta-comment -% linegoal : 2010/11/30 v2.6 - linegoal : a new dimen corresponding to the remainder of the line] +% linegoal : 2010/12/07 v2.7 - linegoal : a new dimen corresponding to the remainder of the line] % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either @@ -37,7 +37,7 @@ \tracingall \tracingonline=0 \Msg{************************************************************************} \Msg{* Installation} -\Msg{* Package: 2010/11/30 v2.6 - linegoal : a new dimen corresponding to the remainder of the line} +\Msg{* Package: 2010/12/07 v2.7 - linegoal : a new dimen corresponding to the remainder of the line} \Msg{************************************************************************} \keepsilent @@ -48,7 +48,7 @@ This is a generated file. -linegoal : 2010/11/30 v2.6 - linegoal : a new dimen corresponding to the remainder of the line +linegoal : 2010/12/07 v2.7 - linegoal : a new dimen corresponding to the remainder of the line This work may be distributed and/or modified under the conditions of the LaTeX Project Public License, either @@ -69,7 +69,6 @@ Copyright (C) 2010 by Florent Chervet \generate{% \file{linegoal.ins}{\from{linegoal.dtx}{install}}% \file{linegoal.sty}{\from{linegoal.dtx}{package}}% - \file{linegoal.tex}{\from{linegoal.dtx}{example}}% } \askforoverwritefalse @@ -100,13 +99,10 @@ Copyright (C) 2010 by Florent Chervet %<*driver> \edef\thisfile{\jobname} \def\thisinfo{A new ``dimen'' corresponding to the remainder of the line} -\def\thisdate{2010/11/30} -\def\thisversion{2.6} -\def\CTANbaseurl{http://www.ctan.org/tex-archive/macros/latex} -\def\CTANdisplay{CTAN:macros/latex} -\makeatletter\protected\def\CTANhref{\@ifstar\CTANhrefstar\CTANhrefnost}\makeatother -\newcommand*\CTANhrefstar[3][/contrib/]{\href{\CTANbaseurl#1#2}{#3}} -\newcommand*\CTANhrefnost[2][/contrib/]{\href{\CTANbaseurl#1#2}{\nolinkurl{\CTANdisplay#1#2}}} +\def\thisdate{2010/12/07} +\def\thisversion{2.7} +\def\CTANbaseurl{http://www.ctan.org/tex-archive/} +\def\CTANhref#1#2{\href{\CTANbaseurl/help/Catalogue/entries/#1.html}{\nolinkurl{CTAN:help/Catalogue/entries/#1.html}}} \let\loadclass\LoadClass \def\LoadClass#1{\loadclass[abstracton]{scrartcl}\let\scrmaketitle\maketitle\AtEndOfClass{\let\maketitle\scrmaketitle}} \PassOptionsToPackage{svgnames}{xcolor} @@ -115,14 +111,16 @@ Copyright (C) 2010 by Florent Chervet \usepackage{inputenc,babel} \usepackage[T1]{fontenc} \usepackage{etoolbox,geometry,xcolor,bbding,txfonts,xspace,hologo,graphicx} -\usepackage{lastpage,fancyhdr,titlesec,enumitem,framed,tocloft,tabu,multirow,makecell,tabularx} +\usepackage{lastpage,fancyhdr,titlesec,enumitem,framed,tocloft,multirow,makecell} +\usepackage[linegoal,delarray]{tabu} \usepackage{embedfile} \usepackage{interfaces} -\csname endofdump\endcsname \CodelineNumbered\lastlinefit999 \usepackage{holtxdoc,bookmark} \usepackage{linegoal} \usepackage{fancyvrb}\fvset{gobble=1,listparameters={\topsep=0pt}} +\usepackage{tabularx} +\csname endofdump\endcsname \hypersetup{% pdftitle={The linegoal package}, pdfsubject={A new dimen corresponding to the remainder of the line}, @@ -138,7 +136,7 @@ Copyright (C) 2010 by Florent Chervet % % \fi % -% \CheckSum{155} +% \CheckSum{149} % % \CharacterTable % {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z @@ -197,7 +195,8 @@ Copyright (C) 2010 by Florent Chervet % \def\ThisPackage{\Xpackage{\thisfile}\xspace} % \def\Xpackage{\@dblarg\X@package} % \def\X@package[#1]#2{\@testopt{\X@@package{#1}{#2}}{}} -% \def\X@@package#1#2[#3]{\xpackage{#2\footnote{\noindent\xpackage{#2}: \CTANhref{#1}#3}}} +% \def\X@@package#1#2[#3]{\xpackage{#2\footnote{\noindent\xpackage{#2}: \CTANhref{#1}#3}}\xspace} +% \def\XPackage#1{\href{\CTANbaseurl/help/Catalogue/entries/#1.html}{\xpackage{#1}}} % \newrobustcmd*\thisyear{\begingroup % \def\thisyear##1/##2\@nil{\endgroup % \oldstylenums{##1\ifnum##1=\year\else\,\textendash\,\the\year\fi}% @@ -210,12 +209,13 @@ Copyright (C) 2010 by Florent Chervet % \DefineVerbatimEnvironment{VerbLines}{Verbatim}{gobble=1,frame=lines,framesep=6pt,fontfamily=\ttdefault,fontseries=m} % \DefineVerbatimEnvironment{Verb*}{Verbatim}{gobble=1,fontfamily=\ttdefault,fontseries=m,commandchars=$()} % \def\smex{\leavevmode\hb@xt@2em{\hfil$\longrightarrow$\hfil}} +% \newcommand\texorpdf[2]{\texorpdfstring{#1{#2}}{#2}} % \renewrobustcmd\#[1]{{\usefont{T1}{pcr}{bx}{n}\char`\##1}} % \newrobustcmd\csred[1]{\textcolor{red}{\cs{#1}}} % \renewrobustcmd\cs[2][]{\mbox{\ttfamily#1\expandafter\@gobble\string\\#2}} % \newrobustcmd\csbf[2][]{\textbf{\cs[{#1}]{#2}}} -% \newrobustcmd\textt[2][]{\texttt{#1{#2}}} -% \newrobustcmd\texttbf{\textt[\bfseries]} +% \newcommand\textt[1]{\texorpdf\texttt{#1}} +% \newcommand\texttbf[1]{\textt{\bfseries#1}} % \newcommand\nnn{\normalfont\mdseries\upshape}\newcommand\nbf{\normalfont\bfseries\upshape} % \newrobustcmd*\blue{\color{blue}}\newcommand*\red{\color{dr}}\newcommand*\green{\color{green}}\newcommand\rred{\color{red}} % \definecolor{copper}{rgb}{0.67,0.33,0.00} \newcommand\copper{\color{copper}} @@ -294,7 +294,7 @@ Copyright (C) 2010 by Florent Chervet % \end{tabular}\par} % % sets \cs{somedimen} to be the (horizontal) length of the remainder of the current line. This can be useful for -% use with \textt{tabularx},\, \textt{tabular\stform*}\, or\, \textt{tabu}\, for example.§ +% use with \XPackage{tabu},\, \XPackage{tabularx},\, or\, \textt{tabular\stform*}\, for example.§ % {\centering\extrarowheight\parskip % \begin{tabu} to\linewidth{@{}lX} % At first run: &\cs{linegoal} expands to \cs{linewidth} and writes the correct line goal into the \xext{aux} file. \\ @@ -302,9 +302,25 @@ Copyright (C) 2010 by Florent Chervet % correct line-goal into the \xext{aux} file, if the value has changed. % \end{tabu}\par} % -% \thispackage requires pdf\TeX{} (in \textt{pdf} or \textt{dvi} mode) and the module \xpackage{zref-savepos} of \Xpackage[/oberdiek/]{zref} package. +% \textbf{Limitation:} if \cs{linegoal} is used inside an expression with \cs{dimexpr}, \cs{glueexpr} or +% inside \cs{setlength} (package \xpackage{calc}), then \cs{linegoal} must be at the very last position in the expression: +% +% +% \begin{tabu}to\linewidth{XX[-1m]} +% \begin{tabu}[c].{X}\} +% \verbatim{^^A +% \begin{tabu} to\dimexpr-2in + .5\linegoal{XX} ....^^@ +% \setlength \dimen@ {-2in + .5\linegoal}} +% \end{tabu} +% & +% are admissible +% \end{tabu} +% +% +% \thispackage requires pdf\TeX{} (in \textt{pdf} or \textt{dvi} mode) +% and the module \xpackage{zref-savepos} of \XPackage{zref} package. % -% \end{abstract} +% \end{abstract}} % % \tocsetup{% % section/skip=4pt plus2pt minus2pt, @@ -315,7 +331,7 @@ Copyright (C) 2010 by Florent Chervet % title=Contents\quad\leaders\vrule height3.4pt depth-3pt\hfill\null, % title/bottom=6pt, % after=\leavevmode\hrule, -% columns=1, +% columns=2, % } % % \tableofcontents @@ -355,7 +371,7 @@ Copyright (C) 2010 by Florent Chervet % % \begin{VerbLines} % This is a tabu that fills the half of the remainder of the line: -% $\begin{tabu}to .5\linegoal{|[red]X[$c]|[red]X[2$c]|[red]} \tabucline[red]- +% $\begin{tabu}to .5\linegoal{|[red]X[$c]|[red]X[2$c]|[red]} \tabucline[red]- % \alpha & \beta \\ \tabucline[on 2pt,red]- % \gamma & \delta \\ \tabucline[red]- % \end{tabu}$ @@ -365,7 +381,7 @@ Copyright (C) 2010 by Florent Chervet % $\begin{tabu}to .5\linegoal{|[red]X[$c]|[red]X[2$c]|[red]} \tabucline[red]- % \alpha & \beta \\ \tabucline[on 2pt,red]- % \gamma & \delta \\ \tabucline[red]- -% \end{tabu}$ +% \end{tabu}$ % % Please, refer to \xpackage{tabu} documentation for more information on the preamble and % the command \cs{tabucline} used here as an example. @@ -394,7 +410,7 @@ Copyright (C) 2010 by Florent Chervet \NeedsTeXFormat{LaTeX2e}% LaTeX 2.09 can't be used (nor non-LaTeX) [2005/12/01]% LaTeX must be 2005/12/01 or younger \ProvidesPackage{linegoal} - [2010/11/30 v2.6 - A new dimen corresponding to the remainder of the line] + [2010/12/07 v2.7 - A new dimen corresponding to the remainder of the line] % \end{macrocode} % % \subsection{Requirements} @@ -470,15 +486,12 @@ Copyright (C) 2010 by Florent Chervet \MessageBreak please check the value of \string\if@filesw!}\@ehd }% \LNGL@noauxerr \def\LNGL@warn#1\relax{\PackageWarning{linegoal} - {\string\linegoal\space value on page #1 - \MessageBreak has changed since last run - \MessageBreak Please rerun to get correct values}% + {\string\linegoal\space value on page #1 has changed + \MessageBreak since last run. Please rerun to get + \MessageBreak the correct value}% }% \LNGL@warn -\def\LNGL@@info{\PackageInfo{linegoal} - {\string\linegoal=\the\LNGL@tempdim\space - (on page \number\zref@extractdefault{linegoal/posx.\the\LNGL@unique}{page}\c@page)}% -%% \showthe\linewidth -}% \LNGL@@info +\def\LNGL@@info{\message{Package linegoal Info: + \string\linegoal=\the\LNGL@tempdim\on@line, page \the\c@page}} \let\LNGL@info\@empty % \end{macrocode} % @@ -497,8 +510,27 @@ Copyright (C) 2010 by Florent Chervet % \end{macrocode} % % \DeleteShortVerb{\+} +% +% \begin{thebibliography}{9} +% +% \bibitem{zref} +% \textit{The \xpackage{zref} package} by Heiko Oberdiek \\ +% 2010/05/01 v2.17 New reference scheme for LaTeX2e \\ +% \href{http://www.ctan.org/tex-archive/help/Catalogue/entries/zref.html}{\nolinkurl{CTAN:help/Catalogue/entries/zref.html}} +% +% \bibitem{tabu} +% \textit{The \xpackage{tabu} package} by \FC \\ +% 2010/12/07 v1.5 - flexible LaTeX tabulars \\ +% \href{http://www.ctan.org/tex-archive/help/Catalogue/entries/tabu.html}{\nolinkurl{CTAN:help/Catalogue/entries/tabu.html}} +% +% \end{thebibliography} +% % \begin{History} -% \sectionformat\subsection{font=\large\bfseries,bottom=\smallskipamount,top=\medskipamount} +% \sectionformat\subsection{font=,bottom=\smallskipamount,top=\medskipamount} +% +% \begin{Version}{2010/12/07 v2.7} +% \item Updated documentation. Compatibility with \xpackage{tabu} package (version \textt{1.5 -- 2010/12/07}). +% \end{Version} % % \begin{Version}{2010/11/30 v2.6} % \item Added the \textt{verbose} package option. @@ -535,15 +567,7 @@ Copyright (C) 2010 by Florent Chervet % % \end{History} % -% \begin{thebibliography}{9} -% -% \bibitem{zref} -% Heiko Oberdiek: -% \textit{The \xpackage{zref} package}; -% 2010/05/01 v2.17; -% \CTAN{macros/latex/contrib/oberdiek/}. -% -% \end{thebibliography} +% % \bookmarksetup{openlevel=1} % \PrintIndex % diff --git a/Master/texmf-dist/source/latex/linegoal/linegoal.ins b/Master/texmf-dist/source/latex/linegoal/linegoal.ins index 9cb7dac0364..270650d1e06 100644 --- a/Master/texmf-dist/source/latex/linegoal/linegoal.ins +++ b/Master/texmf-dist/source/latex/linegoal/linegoal.ins @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% linegoal : 2010/11/30 v2.6 - linegoal : a new dimen corresponding to the remainder of the line +%% linegoal : 2010/12/07 v2.7 - linegoal : a new dimen corresponding to the remainder of the line %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either @@ -27,7 +27,7 @@ \tracingall \tracingonline=0 \Msg{************************************************************************} \Msg{* Installation} -\Msg{* Package: 2010/11/30 v2.6 - linegoal : a new dimen corresponding to the remainder of the line} +\Msg{* Package: 2010/12/07 v2.7 - linegoal : a new dimen corresponding to the remainder of the line} \Msg{************************************************************************} \keepsilent @@ -38,7 +38,7 @@ This is a generated file. -linegoal : 2010/11/30 v2.6 - linegoal : a new dimen corresponding to the remainder of the line +linegoal : 2010/12/07 v2.7 - linegoal : a new dimen corresponding to the remainder of the line This work may be distributed and/or modified under the conditions of the LaTeX Project Public License, either @@ -59,7 +59,6 @@ Copyright (C) 2010 by Florent Chervet \generate{% \file{linegoal.ins}{\from{linegoal.dtx}{install}}% \file{linegoal.sty}{\from{linegoal.dtx}{package}}% - \file{linegoal.tex}{\from{linegoal.dtx}{example}}% } \askforoverwritefalse -- cgit v1.2.3