linegoal (28nov10)

git-svn-id: svn://tug.org/texlive/trunk@20610 c570f23f-e606-0410-a88d-b1316a301751

6 files changed, 114 insertions, 63 deletions

diff --git a/Master/texmf-dist/doc/latex/linegoal/linegoal.pdf b/Master/texmf-dist/doc/latex/linegoal/linegoal.pdf
index 891efc72463..ea1905371b5 100644
--- a/Master/texmf-dist/doc/latex/linegoal/linegoal.pdf
+++ b/Master/texmf-dist/doc/latex/linegoal/linegoal.pdf
diff --git a/Master/texmf-dist/doc/latex/linegoal/linegoal.tex b/Master/texmf-dist/doc/latex/linegoal/linegoal.tex
index 7e2bd362c0a..e9d9787599e 100644
--- a/Master/texmf-dist/doc/latex/linegoal/linegoal.tex
+++ b/Master/texmf-dist/doc/latex/linegoal/linegoal.tex
@@ -8,7 +8,7 @@
 %% 
 %% This is a generated file.
 %% 
-%% linegoal : 2010/11/19 v2.2 - linegoal : a new dimen corresponding to the remainder of the line
+%% linegoal : 2010/11/30 v2.6 - 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
diff --git a/Master/texmf-dist/source/latex/linegoal/linegoal.drv b/Master/texmf-dist/source/latex/linegoal/linegoal.drv
index ec2d1fee15a..b3ae9351879 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/19 v2.2 - linegoal : a new dimen corresponding to the remainder of the line
+%% linegoal : 2010/11/30 v2.6 - 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,8 +25,8 @@
 %% 
 \edef\thisfile{\jobname}
 \def\thisinfo{A new ``dimen'' corresponding to the remainder of the line}
-\def\thisdate{2010/11/19}
-\def\thisversion{2.2}
+\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
@@ -40,7 +40,7 @@
 \usepackage{inputenc,babel}
 \usepackage[T1]{fontenc}
 \usepackage{etoolbox,geometry,xcolor,bbding,txfonts,xspace,hologo,graphicx}
-\usepackage{lastpage,fancyhdr,enumitem,framed,tocloft,tabu,multirow,makecell,tabularx}
+\usepackage{lastpage,fancyhdr,titlesec,enumitem,framed,tocloft,tabu,multirow,makecell,tabularx}
 \usepackage{embedfile}
 \usepackage{interfaces}
 \csname endofdump\endcsname
diff --git a/Master/texmf-dist/source/latex/linegoal/linegoal.dtx b/Master/texmf-dist/source/latex/linegoal/linegoal.dtx
index c6bb851d6d4..bf5f95c2d36 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/19 v2.2 - linegoal : a new dimen corresponding to the remainder of the line]
+% linegoal : 2010/11/30 v2.6 - 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/19 v2.2 - linegoal : a new dimen corresponding to the remainder of the line}
+\Msg{* Package: 2010/11/30 v2.6 - 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/19 v2.2 - linegoal : a new dimen corresponding to the remainder of the line
+linegoal : 2010/11/30 v2.6 - 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
@@ -100,8 +100,8 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr>
 %<*driver>
 \edef\thisfile{\jobname}
 \def\thisinfo{A new ``dimen'' corresponding to the remainder of the line}
-\def\thisdate{2010/11/19}
-\def\thisversion{2.2}
+\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
@@ -115,7 +115,7 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr>
 \usepackage{inputenc,babel}
 \usepackage[T1]{fontenc}
 \usepackage{etoolbox,geometry,xcolor,bbding,txfonts,xspace,hologo,graphicx}
-\usepackage{lastpage,fancyhdr,enumitem,framed,tocloft,tabu,multirow,makecell,tabularx}
+\usepackage{lastpage,fancyhdr,titlesec,enumitem,framed,tocloft,tabu,multirow,makecell,tabularx}
 \usepackage{embedfile}
 \usepackage{interfaces}
 \csname endofdump\endcsname
@@ -138,7 +138,7 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr>
 %</driver>
 % \fi
 %
-% \CheckSum{141}
+% \CheckSum{155}
 %
 % \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
@@ -203,8 +203,6 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr>
 %       \oldstylenums{##1\ifnum##1=\year\else\,\textendash\,\the\year\fi}%
 %    }\expandafter\thisyear\thisdate\@nil
 % }
-% \g@addto@macro\macro@font{\macrocodecolor\let\AltMacroFont\macro@font}
-% \g@addto@macro\@list@extra{\parsep\parskip\topsep\z@\itemsep\z@}
 % \newcommand\macrocodecolor{\color{macrocode}}\definecolor{macrocode}{rgb}{0.08,0.00,0.15}
 % \newcommand\reflinkcolor{\color{reflink}}\colorlet{reflink}{DarkSlateBlue}
 % \newrobustcmd\stform{\@ifnextchar*{\@stform[]\textasteriskcentered\@gobble}\@stform}
@@ -228,6 +226,19 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr>
 % \newrobustcmd\bk{\color{black}}
 % \newrobustcmd\ie{\emph{ie.}}
 % \let\cellstrut\bottopstrut
+% \let\plainllap\llap
+% \newrobustcmd\macro@llap[1]{\global\let\llap\plainllap\setbox0\hbox{#1}^^A
+%  \ifdim\wd0>2cm\hbox to\z@{\hss\hbox to2cm{#1\hss}}^^A
+%        \edef\@tempa{\the\everypar\hskip\dimexpr\the\wd0-2cm\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}{}{}
+%  \sectionformat\section[hang]{
+%     bookmark={color=MidnightBlue},
+%     bottom=\smallskipamount,top=\medskipamount,
+%  }
 % \pagesetup{%
 %  norules,
 %  font=\scriptsize\color[gray]{.55},
@@ -298,21 +309,24 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr>
 % \tocsetup{%
 %  section/skip=4pt plus2pt minus2pt,
 %  subsection/skip=0pt plus2pt minus2pt,
-%  section/dotsep,
+%  section/dotsep,subsection/dotsep=,subsection/pagenumbers=off,
 %  dotsep=1.5mu,
 %  dot=\hbox{\scriptsize.},
 %  title=Contents\quad\leaders\vrule height3.4pt depth-3pt\hfill\null,
 %  title/bottom=6pt,
 %  after=\leavevmode\hrule,
+%  columns=1,
 %  }
 %
 % \tableofcontents
 %
-% \ClearPage*
+% \clearpage \bookmarksetup{bold*}
 %
 % \section{User interface}
 % \label{userinterface}
 %
+% \subsection{\cs{linegoal}: a macro which behaves mostly like a \textt{dimen}}
+%
 % The first aim of \cs{linegoal} is to give a facility to get the length of the remainder of the line.
 % This is possible with \hologo{pdfTeX} and its \cs{pdfsavepos} primitive. For convenience, \thispackage loads
 % and uses the \xpackage{zref-savepos} package from H. Oberdiek.
@@ -328,7 +342,7 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr>
 %     \end{tabularx}
 % \end{VerbLines}
 %
-% \textbf{Typical application is for tabular of variable width} like \xpackage{tabularx} or \xpackage{tabu}.
+% \textbf{Typical application is for tabulars of variable width} like \xpackage{tabularx} or \xpackage{tabu}.
 % Package \xpackage{tabu} has a \textt{linegoal} option to use \cs{linegoal} as default target for the whole
 % tabular.
 %
@@ -356,10 +370,16 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr>
 % Please, refer to \xpackage{tabu} documentation for more information on the preamble and
 % the command \cs{tabucline} used here as an example.
 %
+% \subsection{The \textt{verbose} package option}
+%
+% You can load \thispackage with the \M*[verbose] option to get the line-goals
+% as information in your \xext{log} file.
+%
 %
 % \StopEventually{
 % }
 %
+% \bookmarksetup{bold=false}
 % \section{Implementation} \label{sec:implementation}
 % \csdef{HDorg@PrintMacroName}#1{\hbox to4em{\strut \MacroFont \string #1\ \hss}}
 %
@@ -374,7 +394,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{linegoal}
-         [2010/11/19 v2.2 - A new dimen corresponding to the remainder of the line]
+         [2010/11/30 v2.6 - A new dimen corresponding to the remainder of the line]
 %    \end{macrocode}
 %
 % \subsection{Requirements}
@@ -392,35 +412,33 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr>
    \gdef\linegoal{\linewidth}%
    \expandafter\endinput
 \fi
-\RequirePackage{etex,zref,zref-savepos,scrlfile}
+\RequirePackage{etex,zref,zref-savepos}
 %    \end{macrocode}
 %
-% \subsection{zref property : page as arabic number}
-%
-% \subsection{The linegoal macro}
+% \subsection{zref properties}
 %
-%\begin{macro}{\linegoal}
 %    \begin{macrocode}
-\newcommand*\linegoal{%
-   \zref@extract{linegoal.\the\LNGL@unique}{linegoal}\LNGL@setlinegoal
-}% \linegoal
 \zref@newprop*{linegoal}[\linewidth]{\dimexpr
    \linewidth-\the\pdflastxpos sp
-   +\ifodd\zref@extractdefault{linegoal/page.\the\LNGL@unique}{page}\c@page
+   +\ifodd\zref@extractdefault{linegoal/posx.\the\LNGL@unique}{page}\c@page
       \oddsidemargin
    \else\evensidemargin
    \fi
    +1in+\hoffset
    \relax
 }% linegoal zref-property
+%    \end{macrocode}
+%
+%
+% \subsection{The linegoal macro}
+%
+%    \begin{macro}{\linegoal}
+%    \begin{macrocode}
+\newcommand*\linegoal{%
+   \zref@extract{linegoal.\the\LNGL@unique}{linegoal}\LNGL@setlinegoal
+}% \linegoal
 \globcount\LNGL@unique
 \globdimen\LNGL@tempdim
-\let\LNGL@calc@stop=\relax
-\let\LNGL@calc@cleanup\relax
-\AfterPackage*{calc}{%
-   \let\LNGL@calc@stop=!%
-   \def\LNGL@calc@cleanup!{}%
-}
 \def\LNGL@setlinegoal{\relax\csname LNGL@set\ifdefined\calc@next!\fi\endcsname}
 \expandafter\def\csname LNGL@set!\endcsname!{!\LNGL@set}
 \protected\def\LNGL@set{%
@@ -429,32 +447,62 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr>
          \pdfsavepos
          \zref@refused{linegoal.\the\LNGL@unique}%
          \LNGL@tempdim\zref@extractdefault{linegoal.\the\LNGL@unique}{linegoal}\maxdimen
-         \zref@labelbyprops{linegoal/page.\the\LNGL@unique}{page,posx}%
+         \zref@labelbyprops{linegoal/posx.\the\LNGL@unique}{page,posx}%
          \zref@labelbyprops{linegoal.\the\LNGL@unique}{linegoal}%
          \ifdim\zref@extract{linegoal.\the\LNGL@unique}{linegoal}=\LNGL@tempdim
+               \LNGL@info
          \else \expandafter\LNGL@warn%
-                  \number\zref@extractdefault{linegoal/page.\the\LNGL@unique}{page}\c@page\relax
+                  \number\zref@extractdefault{linegoal/posx.\the\LNGL@unique}{page}\c@page\relax
          \fi
          \global\advance\LNGL@unique\@ne
       \else\LNGL@noauxerr
       \fi
    \@esphack
 }% \LNGL@set
+%    \end{macrocode}
+%    \end{macro}
+%
+%    \subsection{Error, Warning and Info}
+%
+%    \begin{macrocode}
+\def\LNGL@noauxerr{\PackageError{linegoal}
+   {\string\linegoal\space does not work if output file are disabled
+   \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}%
 }% \LNGL@warn
-\def\LNGL@noauxerr{\PackageError{linegoal}
-   {\string\linegoal\space does not work if output file are disabled
-   \MessageBreak please check the value of \string\if@filesw!}\@ehd
-}% \LNGL@noauxerr
+\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
+\let\LNGL@info\@empty
+%    \end{macrocode}
+%
+% \subsection{The \textt{verbose} package option}
+%
+%    \begin{macro}{\verbose (package option)}
+%    \begin{macrocode}
+\DeclareOption{verbose}{\let\LNGL@info \LNGL@@info}
+\ProcessOptions
+%    \end{macrocode}
+%    \end{macro}
+%
+%
+%    \begin{macrocode}
 %</package>
 %    \end{macrocode}
-%\end{macro}
 %
 % \DeleteShortVerb{\+}
 % \begin{History}
+%   \sectionformat\subsection{font=\large\bfseries,bottom=\smallskipamount,top=\medskipamount}
+%
+%   \begin{Version}{2010/11/30 v2.6}
+%   \item Added the \textt{verbose} package option.
+%   \end{Version}
 %
 %   \begin{Version}{2010/11/19 v2.2}
 %   \item Fix a bug when using a syntax like \textt{.5\cs{linegoal}}. \\
@@ -496,7 +544,7 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr>
 %   \CTAN{macros/latex/contrib/oberdiek/}.
 %
 % \end{thebibliography}
-%
+% \bookmarksetup{openlevel=1}
 % \PrintIndex
 %
 % \Finale
\ No newline at end of file
diff --git a/Master/texmf-dist/source/latex/linegoal/linegoal.ins b/Master/texmf-dist/source/latex/linegoal/linegoal.ins
index 413dc823432..9cb7dac0364 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/19 v2.2 - linegoal : a new dimen corresponding to the remainder of the line
+%% linegoal : 2010/11/30 v2.6 - 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/19 v2.2 - linegoal : a new dimen corresponding to the remainder of the line}
+\Msg{* Package: 2010/11/30 v2.6 - 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/19 v2.2 - linegoal : a new dimen corresponding to the remainder of the line
+linegoal : 2010/11/30 v2.6 - 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
diff --git a/Master/texmf-dist/tex/latex/linegoal/linegoal.sty b/Master/texmf-dist/tex/latex/linegoal/linegoal.sty
index ec9347476fc..331e1705171 100644
--- a/Master/texmf-dist/tex/latex/linegoal/linegoal.sty
+++ b/Master/texmf-dist/tex/latex/linegoal/linegoal.sty
@@ -8,7 +8,7 @@
 %% 
 %% This is a generated file.
 %% 
-%% linegoal : 2010/11/19 v2.2 - linegoal : a new dimen corresponding to the remainder of the line
+%% linegoal : 2010/11/30 v2.6 - 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
@@ -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{linegoal}
-         [2010/11/19 v2.2 - A new dimen corresponding to the remainder of the line]
+         [2010/11/30 v2.6 - A new dimen corresponding to the remainder of the line]
 \ifdefined\pdfsavepos\else % works also in dvi mode
    \PackageWarning{linegoal}
       {This package requires pdfTeX for its \string\pdfsavepos\space primitive\MessageBreak
@@ -35,27 +35,21 @@
    \gdef\linegoal{\linewidth}%
    \expandafter\endinput
 \fi
-\RequirePackage{etex,zref,zref-savepos,scrlfile}
-\newcommand*\linegoal{%
-   \zref@extract{linegoal.\the\LNGL@unique}{linegoal}\LNGL@setlinegoal
-}% \linegoal
+\RequirePackage{etex,zref,zref-savepos}
 \zref@newprop*{linegoal}[\linewidth]{\dimexpr
    \linewidth-\the\pdflastxpos sp
-   +\ifodd\zref@extractdefault{linegoal/page.\the\LNGL@unique}{page}\c@page
+   +\ifodd\zref@extractdefault{linegoal/posx.\the\LNGL@unique}{page}\c@page
       \oddsidemargin
    \else\evensidemargin
    \fi
    +1in+\hoffset
    \relax
 }% linegoal zref-property
+\newcommand*\linegoal{%
+   \zref@extract{linegoal.\the\LNGL@unique}{linegoal}\LNGL@setlinegoal
+}% \linegoal
 \globcount\LNGL@unique
 \globdimen\LNGL@tempdim
-\let\LNGL@calc@stop=\relax
-\let\LNGL@calc@cleanup\relax
-\AfterPackage*{calc}{%
-   \let\LNGL@calc@stop=!%
-   \def\LNGL@calc@cleanup!{}%
-}
 \def\LNGL@setlinegoal{\relax\csname LNGL@set\ifdefined\calc@next!\fi\endcsname}
 \expandafter\def\csname LNGL@set!\endcsname!{!\LNGL@set}
 \protected\def\LNGL@set{%
@@ -64,26 +58,35 @@
          \pdfsavepos
          \zref@refused{linegoal.\the\LNGL@unique}%
          \LNGL@tempdim\zref@extractdefault{linegoal.\the\LNGL@unique}{linegoal}\maxdimen
-         \zref@labelbyprops{linegoal/page.\the\LNGL@unique}{page,posx}%
+         \zref@labelbyprops{linegoal/posx.\the\LNGL@unique}{page,posx}%
          \zref@labelbyprops{linegoal.\the\LNGL@unique}{linegoal}%
          \ifdim\zref@extract{linegoal.\the\LNGL@unique}{linegoal}=\LNGL@tempdim
+               \LNGL@info
          \else \expandafter\LNGL@warn%
-                  \number\zref@extractdefault{linegoal/page.\the\LNGL@unique}{page}\c@page\relax
+                  \number\zref@extractdefault{linegoal/posx.\the\LNGL@unique}{page}\c@page\relax
          \fi
          \global\advance\LNGL@unique\@ne
       \else\LNGL@noauxerr
       \fi
    \@esphack
 }% \LNGL@set
+\def\LNGL@noauxerr{\PackageError{linegoal}
+   {\string\linegoal\space does not work if output file are disabled
+   \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}%
 }% \LNGL@warn
-\def\LNGL@noauxerr{\PackageError{linegoal}
-   {\string\linegoal\space does not work if output file are disabled
-   \MessageBreak please check the value of \string\if@filesw!}\@ehd
-}% \LNGL@noauxerr
+\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
+\let\LNGL@info\@empty
+\DeclareOption{verbose}{\let\LNGL@info \LNGL@@info}
+\ProcessOptions
 \endinput
 %%
 %% End of file `linegoal.sty'.