diff options
author | Karl Berry <karl@freefriends.org> | 2024-01-03 21:19:01 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2024-01-03 21:19:01 +0000 |
commit | 1c739fc36f1e3f221e786e20636ba6478c377cdc (patch) | |
tree | ed9741a4bc3f2dc3c25850c587720871786811ca | |
parent | 1e7f7766f2fd93956c4b9bbb7c91ea1f682cef47 (diff) |
changebar (3jan24)
git-svn-id: svn://tug.org/texlive/trunk@69286 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r-- | Master/texmf-dist/doc/latex/changebar/CATALOG | 2 | ||||
-rw-r--r-- | Master/texmf-dist/doc/latex/changebar/README | 4 | ||||
-rw-r--r-- | Master/texmf-dist/doc/latex/changebar/changebar.bug | 11 | ||||
-rw-r--r-- | Master/texmf-dist/doc/latex/changebar/changebar.pdf | bin | 483608 -> 484332 bytes | |||
-rw-r--r-- | Master/texmf-dist/source/latex/changebar/changebar.dtx | 28 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/changebar/changebar.sty | 19 |
6 files changed, 40 insertions, 24 deletions
diff --git a/Master/texmf-dist/doc/latex/changebar/CATALOG b/Master/texmf-dist/doc/latex/changebar/CATALOG index 4878681f57a..74e408ac34f 100644 --- a/Master/texmf-dist/doc/latex/changebar/CATALOG +++ b/Master/texmf-dist/doc/latex/changebar/CATALOG @@ -1,7 +1,7 @@ Name: ChangeBar Problems-To: johannes.braams(at)texniek.nl Author: J.L. Braams -Version: 3.7b +Version: 3.7c Description: diff --git a/Master/texmf-dist/doc/latex/changebar/README b/Master/texmf-dist/doc/latex/changebar/README index e5ef309494e..847be179da7 100644 --- a/Master/texmf-dist/doc/latex/changebar/README +++ b/Master/texmf-dist/doc/latex/changebar/README @@ -1,6 +1,6 @@ changebar bundle - December 30, 2023 + January 1, 2024 This bundle contains a package that I maintain to add changebars to a LaTeX document. @@ -14,7 +14,7 @@ be used to compare two versions of a document and automatically add the changebars. The file chbar.1, also contributed, documents the workings of chbar.sh -Copyright (C) 2023 Johannes L. Braams johannes.braams(at)texniek.nl +Copyright (C) 2024 Johannes L. Braams johannes.braams(at)texniek.nl This program can be redistributed and/or modified under the terms of the LaTeX Project Public License Distributed from CTAN diff --git a/Master/texmf-dist/doc/latex/changebar/changebar.bug b/Master/texmf-dist/doc/latex/changebar/changebar.bug index aed1dc80a74..4d2b9fa0a79 100644 --- a/Master/texmf-dist/doc/latex/changebar/changebar.bug +++ b/Master/texmf-dist/doc/latex/changebar/changebar.bug @@ -6,6 +6,7 @@ % VTeX (Michael Vulis) % PDFTeX (Piet van Oostrum) % XeTeX (Apostolos Syropoulos) +% luaTeX % % change history % @@ -205,6 +206,16 @@ % % v3.7a JLB: Added support for LuaTeX based on the pdfTEX and XeTeX code % +% v3.7b JLB: In creating the support for luaTeX a XeTeX error message got +% inadvertantly remove, reinserted. +% After adding those four lines the production of changebar.dtx +% led to a runaway argument error. It turned out that the comma's, +% used in were in one instance replaced by \TeX-code. Replaced +% the comma's with ";" to solve this. +% +% v3.7c JLB: Arash Esbati reported inconsistent spacing whit or without the +% optional argumenty to \cbstart or \begin{changebar}. +% % Known problems % - changebars for marginal paragraphs collide with changebars % for the main body of text diff --git a/Master/texmf-dist/doc/latex/changebar/changebar.pdf b/Master/texmf-dist/doc/latex/changebar/changebar.pdf Binary files differindex 549d3e88836..ef79e6b5dca 100644 --- a/Master/texmf-dist/doc/latex/changebar/changebar.pdf +++ b/Master/texmf-dist/doc/latex/changebar/changebar.pdf diff --git a/Master/texmf-dist/source/latex/changebar/changebar.dtx b/Master/texmf-dist/source/latex/changebar/changebar.dtx index e4d71b5c395..2c67180adb7 100644 --- a/Master/texmf-dist/source/latex/changebar/changebar.dtx +++ b/Master/texmf-dist/source/latex/changebar/changebar.dtx @@ -1,6 +1,6 @@ % \iffalse meta-comment % -%% Copyright 1994-2023 (C) Johannes Braams. All rights reserved. +%% Copyright 1994-2024 (C) Johannes Braams. All rights reserved. % % This file is part of the changebar package. % ------------------------------------------- @@ -24,7 +24,7 @@ % and covered by LPPL is defined by the unpacking scripts (with % extension .ins) which are part of the distribution. % \fi -% \CheckSum{2952} +% \CheckSum{2953} % %\iffalse % This file is built for \LaTeXe, so we make sure an error is @@ -39,7 +39,7 @@ \ProvidesFile{changebar.dtx} %</dtx> %<+package>\ProvidesPackage{changebar} - [2023/12/30 v3.7b Indicate changes with marginal bars] + [2024/01/01 v3.7c Indicate changes with marginal bars] % \end{macrocode} % % \section{A driver for this document} @@ -162,7 +162,7 @@ % commands supported by `dvi drivers'. Currently six different % \changes{v3.5a}{2005/05/23}{PDF\TeX{} support added} % \changes{v3.6a}{2011/04/30}{Xe\TeX{} support added} -% drivers are supported, plus pdftex and Xe\TeX +% drivers are supported, plus pdftex, Xe\TeX\ and lua\TeX\ % support. More can easily be added. % \end{abstract} % @@ -752,7 +752,6 @@ % \item V\TeX % \item PDF\TeX % \item Xe\TeX -% % \cbstart\item luaTeX\cbend % \end{itemize} % @@ -2236,7 +2235,7 @@ % grouping errors.} % \changes{v3.4e}{2002/10/28}{Reverted the change from version 3.3i} % \begin{macrocode} -\newcommand*{\cbstart}{\@ifnextchar [%] +\newcommand*{\cbstart}{\@ifnextchar[%] {\cb@start}% {\cb@start[\changebarwidth]}} % \end{macrocode} @@ -2257,7 +2256,7 @@ % The default width (and length) of it are stored in % |\deletebarwidth|. % \begin{macrocode} -\newcommand*{\cbdelete}{\@ifnextchar [%] +\newcommand*{\cbdelete}{\@ifnextchar[%] {\cb@delete}% {\cb@delete[\deletebarwidth]}} % \end{macrocode} @@ -2280,8 +2279,8 @@ % environments. % \begin{macrocode} \newenvironment{changebar}% - {\@ifnextchar [{\cb@start}% - {\cb@start[\changebarwidth]}}% + {\@ifnextchar[{\cb@start}%] + {\cb@start[\changebarwidth]}}% {\cb@end} % \end{macrocode} % \end{macro} @@ -2373,7 +2372,8 @@ % depends on the model. % \begin{macrocode} \DeclareRobustCommand\cbcolor{% - \@ifnextchar[\@undeclaredcbcolor\@declaredcbcolor} + \@ifnextchar[%] + \@undeclaredcbcolor\@declaredcbcolor} % \end{macrocode} % \end{macro} % @@ -2471,9 +2471,11 @@ \fi % \end{macrocode} % Restore |\cb@pagecount|. +% \changes{v3.7c}{2024/01/01}{Added \cs{ignorespaces} at the end to +% prevent a spcae token from creaping into the output} % \begin{macrocode} \cb@pagecount\cb@cnta - \cb@advancePoint} + \cb@advancePoint\ignorespaces} % \end{macrocode} % \end{macro} % @@ -2523,6 +2525,8 @@ \cb@checkpage\thr@@ % \end{macrocode} % Again, we need to temporarily overwrite |\cb@pagecount|. +% \changes{v3.7c}{2024/01/01}{We need \cs{ignorespacesafterend} here, +% not \cs{ignorespaces}} % \begin{macrocode} \cb@cnta\cb@pagecount \cb@pagecount\cb@page\advance\cb@pagecount\m@ne @@ -2533,7 +2537,7 @@ \fi \cb@pagecount\cb@cnta \fi - \ignorespaces} + \ignorespacesafterend} % \end{macrocode} %\end{macro} % diff --git a/Master/texmf-dist/tex/latex/changebar/changebar.sty b/Master/texmf-dist/tex/latex/changebar/changebar.sty index 762a571403e..8a75311761a 100644 --- a/Master/texmf-dist/tex/latex/changebar/changebar.sty +++ b/Master/texmf-dist/tex/latex/changebar/changebar.sty @@ -34,10 +34,10 @@ %% The list of derived (unpacked) files belonging to the distribution %% and covered by LPPL is defined by the unpacking scripts (with %% extension .ins) which are part of the distribution. -%% Copyright 1994-2023 (C) Johannes Braams. All rights reserved. +%% Copyright 1994-2024 (C) Johannes Braams. All rights reserved. \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{changebar} - [2023/12/30 v3.7b Indicate changes with marginal bars] + [2024/01/01 v3.7c Indicate changes with marginal bars] \def\cb@maxpoint{80} \def\cb@minpoint{1} \def\cb@nil{0} @@ -787,17 +787,17 @@ \let\cb@resetpoints\relax \fi \global\let\cb@setup@specials\relax} -\newcommand*{\cbstart}{\@ifnextchar [%] +\newcommand*{\cbstart}{\@ifnextchar[%] {\cb@start}% {\cb@start[\changebarwidth]}} \newcommand*{\cbend}{\cb@end} -\newcommand*{\cbdelete}{\@ifnextchar [%] +\newcommand*{\cbdelete}{\@ifnextchar[%] {\cb@delete}% {\cb@delete[\deletebarwidth]}} \def\cb@delete[#1]{\vbox to \z@{\vss\cb@start[#1]\vskip #1\cb@end}} \newenvironment{changebar}% - {\@ifnextchar [{\cb@start}% - {\cb@start[\changebarwidth]}}% + {\@ifnextchar[{\cb@start}%] + {\cb@start[\changebarwidth]}}% {\cb@end} \newcommand*{\nochangebars}{% \def\cb@start[##1]{}% @@ -814,7 +814,8 @@ \@ifpackagewith{changebar}{\csname cb@color@pkg\endcsname}{% \RequirePackage{\cb@color@pkg}% \DeclareRobustCommand\cbcolor{% - \@ifnextchar[\@undeclaredcbcolor\@declaredcbcolor} + \@ifnextchar[%] + \@undeclaredcbcolor\@declaredcbcolor} \def\@undeclaredcbcolor[#1]#2{% \begingroup \color[#1]{#2}% @@ -853,7 +854,7 @@ \vskip \ht\strutbox}% \fi \cb@pagecount\cb@cnta - \cb@advancePoint} + \cb@advancePoint\ignorespaces} \def\cb@advancePoint{% \global\advance\cb@nextpoint by 4\relax \ifnum\cb@nextpoint>\cb@maxpoint @@ -876,7 +877,7 @@ \fi \cb@pagecount\cb@cnta \fi - \ignorespaces} + \ignorespacesafterend} \def\cb@checkpage#1{% \cb@cnta\cb@topleft\relax \advance\cb@cnta by #1\relax |