From 78ac54ff7a82154a3acab828f106b2b37c55b644 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 11 Jul 2016 21:03:41 +0000 Subject: autobreak (11jul16) git-svn-id: svn://tug.org/texlive/trunk@41679 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/autobreak/README.md | 3 ++- .../texmf-dist/doc/latex/autobreak/autobreak.pdf | Bin 538815 -> 538686 bytes .../source/latex/autobreak/autobreak.dtx | 23 +++++++-------------- .../texmf-dist/tex/latex/autobreak/autobreak.sty | 8 +++---- 4 files changed, 13 insertions(+), 21 deletions(-) diff --git a/Master/texmf-dist/doc/latex/autobreak/README.md b/Master/texmf-dist/doc/latex/autobreak/README.md index 478af4210ce..27455114309 100644 --- a/Master/texmf-dist/doc/latex/autobreak/README.md +++ b/Master/texmf-dist/doc/latex/autobreak/README.md @@ -1,6 +1,7 @@ autobreak ========= +[![CTAN](https://img.shields.io/ctan/v/autobreak.svg)](https://ctan.org/pkg/autobreak) [![Build Status](https://img.shields.io/travis/tueda/autobreak/master.svg)](https://travis-ci.org/tueda/autobreak) This package implements a simple mechanism of line/page breaking @@ -60,7 +61,7 @@ Example \end{document} ``` -![Example](https://github.com/tueda/autobreak/blob/images/example.png) +![Example](https://raw.githubusercontent.com/tueda/autobreak/images/example.png) Licence diff --git a/Master/texmf-dist/doc/latex/autobreak/autobreak.pdf b/Master/texmf-dist/doc/latex/autobreak/autobreak.pdf index 97dabaeb6a7..c61b24d0176 100644 Binary files a/Master/texmf-dist/doc/latex/autobreak/autobreak.pdf and b/Master/texmf-dist/doc/latex/autobreak/autobreak.pdf differ diff --git a/Master/texmf-dist/source/latex/autobreak/autobreak.dtx b/Master/texmf-dist/source/latex/autobreak/autobreak.dtx index cb372c15e87..f2bc88e2354 100644 --- a/Master/texmf-dist/source/latex/autobreak/autobreak.dtx +++ b/Master/texmf-dist/source/latex/autobreak/autobreak.dtx @@ -193,7 +193,7 @@ version 2005/12/01 or later. % % \fi % -% \CheckSum{336} +% \CheckSum{330} % % \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 @@ -598,7 +598,7 @@ version 2005/12/01 or later. %<*package> \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{autobreak}% - [2016/06/03 v0.1 simple line breaking of long formulae] + [2016/07/03 v0.2 simple line breaking of long formulae] % \end{macrocode} % % \subsection{Registers and constants} @@ -670,15 +670,6 @@ version 2005/12/01 or later. % \end{macrocode} % \end{macro} % -% \begin{macro}{\@autobreak@sep} -% The additional space needed for putting the left-hand side and the -% right-hand side in one line, in other words, the separation for |&|. -% TODO: how can we know the exact extra space to be inserted? -% \begin{macrocode} -\def\@autobreak@sp{7\p@} -% \end{macrocode} -% \end{macro} -% % \begin{macro}{\@autobreak@newlinechar} % The macro representing an active |^^M|. % \begin{macrocode} @@ -1050,11 +1041,14 @@ version 2005/12/01 or later. % \end{macro} % % \begin{macro}{\@autobreak@processline} +% \changes{v0.2}{2016/07/03}{Fix space calculation around alignment +% tabs} % Each line from \cs{autobreak@scanline} should be regarded as a `block' % in the equation. The first block (typically the left-hand side $+$ % `=') determines the indentation for the successive lines. From the % second block, try to append the block to the end of the line and -% insert a line break if it does not fit in a line. +% insert a line break if it does not fit in a line. Note that we measure +% the widths of the blocks with putting |{}| around alignment tabs. % \begin{macrocode} \def\@autobreak@processline#1{% \ifdim\@autobreak@lhswidth=\z@ @@ -1062,7 +1056,7 @@ version 2005/12/01 or later. % For the first block. The rest of the width for the right-hand sides % is determined from \cs{linewidth} and \cs{@autobreak@maxlhswidth}. % \begin{macrocode} - \@autobreak@settowidth\@autobreak@lhswidth{#1}% + \@autobreak@settowidth\@autobreak@lhswidth{#1{}}% \ifdim\@autobreak@lhswidth>\z@ \ifdim\@autobreak@lhswidth>\@autobreak@maxlhswidth \ifdim\@autobreak@maxlhswidth>\z@ @@ -1079,7 +1073,6 @@ version 2005/12/01 or later. \fi \@autobreak@maxrhswidth=\linewidth \advance\@autobreak@maxrhswidth by -\@autobreak@maxlhswidth - \advance\@autobreak@maxrhswidth by -\@autobreak@sp \@autobreak@alltoks={#1{}&}% \fi \else @@ -1087,7 +1080,7 @@ version 2005/12/01 or later. % For the rest of the blocks. % \begin{macrocode} \@autobreak@settowidth\@autobreak@rhswidth - {\the\@autobreak@linetoks#1\the\everybeforeautobreak}% + {{}\the\@autobreak@linetoks#1\the\everybeforeautobreak}% \ifdim\@autobreak@rhswidth>\@autobreak@maxrhswidth % \end{macrocode} % Adding the next block gives an overfull line. Need a line break. diff --git a/Master/texmf-dist/tex/latex/autobreak/autobreak.sty b/Master/texmf-dist/tex/latex/autobreak/autobreak.sty index 7cbd61453f0..cbcae2874de 100644 --- a/Master/texmf-dist/tex/latex/autobreak/autobreak.sty +++ b/Master/texmf-dist/tex/latex/autobreak/autobreak.sty @@ -22,7 +22,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{autobreak}% - [2016/06/03 v0.1 simple line breaking of long formulae] + [2016/07/03 v0.2 simple line breaking of long formulae] \newtoks\everybeforeautobreak \newtoks\everyafterautobreak \newtoks\@autobreak@alltoks @@ -32,7 +32,6 @@ \newdimen\@autobreak@maxlhswidth \newdimen\@autobreak@realmaxlhswidth \newdimen\@autobreak@maxrhswidth -\def\@autobreak@sp{7\p@} \begingroup \catcode`\^^M=\active \gdef\@autobreak@newlinechar{^^M} @@ -227,7 +226,7 @@ } \def\@autobreak@processline#1{% \ifdim\@autobreak@lhswidth=\z@ - \@autobreak@settowidth\@autobreak@lhswidth{#1}% + \@autobreak@settowidth\@autobreak@lhswidth{#1{}}% \ifdim\@autobreak@lhswidth>\z@ \ifdim\@autobreak@lhswidth>\@autobreak@maxlhswidth \ifdim\@autobreak@maxlhswidth>\z@ @@ -240,12 +239,11 @@ \fi \@autobreak@maxrhswidth=\linewidth \advance\@autobreak@maxrhswidth by -\@autobreak@maxlhswidth - \advance\@autobreak@maxrhswidth by -\@autobreak@sp \@autobreak@alltoks={#1{}&}% \fi \else \@autobreak@settowidth\@autobreak@rhswidth - {\the\@autobreak@linetoks#1\the\everybeforeautobreak}% + {{}\the\@autobreak@linetoks#1\the\everybeforeautobreak}% \ifdim\@autobreak@rhswidth>\@autobreak@maxrhswidth \edef\@tempa{\the\@autobreak@linetoks\the\everybeforeautobreak}% \expandafter\@autobreak@addtoks\expandafter\@autobreak@alltoks -- cgit v1.2.3