From 6b0dba844eeab4f1d26d299a162e71a3405ffc36 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 8 May 2022 20:21:01 +0000 Subject: changebar (8may22) git-svn-id: svn://tug.org/texlive/trunk@63259 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/changebar/CATALOG | 6 +- Master/texmf-dist/doc/latex/changebar/README | 4 +- .../texmf-dist/doc/latex/changebar/cbtest1-ltx.pdf | Bin 31002 -> 0 bytes .../texmf-dist/doc/latex/changebar/cbtest1-pdf.pdf | Bin 97927 -> 0 bytes Master/texmf-dist/doc/latex/changebar/cbtest1.tex | 322 --------------------- .../texmf-dist/doc/latex/changebar/cbtest1good.pdf | Bin 61872 -> 0 bytes .../doc/latex/changebar/cbtest1wrong.pdf | Bin 45449 -> 0 bytes .../texmf-dist/doc/latex/changebar/cbtest2-ltx.pdf | Bin 30930 -> 0 bytes .../texmf-dist/doc/latex/changebar/cbtest2-pdf.pdf | Bin 97839 -> 0 bytes Master/texmf-dist/doc/latex/changebar/cbtest2.tex | 322 --------------------- .../texmf-dist/doc/latex/changebar/changebar.bug | 5 +- .../texmf-dist/doc/latex/changebar/changebar.pdf | Bin 373858 -> 380646 bytes Master/texmf-dist/doc/latex/changebar/chbar.1 | 117 -------- Master/texmf-dist/doc/latex/changebar/chbar.sh | 240 --------------- .../source/latex/changebar/changebar.dtx | 15 +- .../source/latex/changebar/changebar.ins | 2 +- .../texmf-dist/tex/latex/changebar/changebar.sty | 12 +- 17 files changed, 23 insertions(+), 1022 deletions(-) delete mode 100644 Master/texmf-dist/doc/latex/changebar/cbtest1-ltx.pdf delete mode 100644 Master/texmf-dist/doc/latex/changebar/cbtest1-pdf.pdf delete mode 100644 Master/texmf-dist/doc/latex/changebar/cbtest1.tex delete mode 100644 Master/texmf-dist/doc/latex/changebar/cbtest1good.pdf delete mode 100644 Master/texmf-dist/doc/latex/changebar/cbtest1wrong.pdf delete mode 100644 Master/texmf-dist/doc/latex/changebar/cbtest2-ltx.pdf delete mode 100644 Master/texmf-dist/doc/latex/changebar/cbtest2-pdf.pdf delete mode 100644 Master/texmf-dist/doc/latex/changebar/cbtest2.tex delete mode 100644 Master/texmf-dist/doc/latex/changebar/chbar.1 delete mode 100644 Master/texmf-dist/doc/latex/changebar/chbar.sh (limited to 'Master/texmf-dist') diff --git a/Master/texmf-dist/doc/latex/changebar/CATALOG b/Master/texmf-dist/doc/latex/changebar/CATALOG index 93611fa94a0..a4ecdec11f1 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: texniek(at)braams.xs4all.nl +Problems-To: johannes.braams(at)texniek.nl Author: J.L. Braams -Version: 3.6c +Version: 3.6d Description: @@ -15,6 +15,4 @@ See-Also: Address: TeXniek J.L. Braams -Kersengaarde 33 -2723 BP Zoetermeer The Netherlands diff --git a/Master/texmf-dist/doc/latex/changebar/README b/Master/texmf-dist/doc/latex/changebar/README index 1f51eec6e69..ffc63526e75 100644 --- a/Master/texmf-dist/doc/latex/changebar/README +++ b/Master/texmf-dist/doc/latex/changebar/README @@ -1,6 +1,6 @@ changebar bundle - March 08, 2018 + May 06, 2022 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) 2018 Johannes L. Braams texniek(at)braams.xs4all.nl +Copyright (C) 2022 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/cbtest1-ltx.pdf b/Master/texmf-dist/doc/latex/changebar/cbtest1-ltx.pdf deleted file mode 100644 index a146caad90b..00000000000 Binary files a/Master/texmf-dist/doc/latex/changebar/cbtest1-ltx.pdf and /dev/null differ diff --git a/Master/texmf-dist/doc/latex/changebar/cbtest1-pdf.pdf b/Master/texmf-dist/doc/latex/changebar/cbtest1-pdf.pdf deleted file mode 100644 index fcdb761c734..00000000000 Binary files a/Master/texmf-dist/doc/latex/changebar/cbtest1-pdf.pdf and /dev/null differ diff --git a/Master/texmf-dist/doc/latex/changebar/cbtest1.tex b/Master/texmf-dist/doc/latex/changebar/cbtest1.tex deleted file mode 100644 index 040518bbd94..00000000000 --- a/Master/texmf-dist/doc/latex/changebar/cbtest1.tex +++ /dev/null @@ -1,322 +0,0 @@ -\documentclass[12pt,twoside]{article} -\usepackage{amsmath} -\usepackage[outerbars,color]{changebar} -\ifx\pdfoutput\undefined -\else\ifnum\pdfoutput>0 - \usepackage{pdfcolmk} -\fi\fi - -%\setcounter{changebargrey}{60} -\cbcolor{red} - -\usepackage{fancyhdr} - -%Header-footer instructions -\pagestyle{fancy} -\setlength{\headheight}{15pt} -\lhead{\scriptsize Changebar test file} -\chead{} -\rhead{v3.5} -\lfoot{Onecolumn text} -\cfoot{Page \thepage} -\rfoot{} -\renewcommand{\headrulewidth}{0.4pt} %print a rule below the header -\renewcommand{\footrulewidth}{0.4pt} %print a rule above the footer - -\setcounter{page}{16} -\setlength{\emergencystretch}{4em} - -\begin{document} - -%\tableofcontents - -\title{CHANGEBAR TEST FILE \\FOR ADVANCED FEATURES} -\author{Piet van Oostrum} -\maketitle - -\raggedbottom - -\begin {abstract} - -This file tests various advanced features of the changebar package. -\cbstart\textcolor{red}{\textbf{Text that should have a changebar is - printed in red, so that it can easily be checked that the changebars are - in the proper position.} This changebar should be on the left. -\cbend} - -This file contains the following features which in combinations used to -give problems in versions of changebar before version 3.5: -Twoside document, onecolumn and towcolumn text, figures, columns of -figures, page changes in the midst of a document. - -This file tests various advanced features of the changebar package. -This file contains the following features which in combinations used to -give problems in versions of changebar before version 3.5: -Twoside document, onecolumn and towcolumn text, figures, columns of -figures, page changes in the midst of a document. -It should work both with latex, followed by a supported Postscript driver, -and with pdflatex. -\end{abstract} - -\newpage - -This file tests various advanced features of the changebar package. -\cbstart\textcolor{red}{Text that should have a changebar (like this) is - printed in red, so that it can easily be checked that the changebars are - in the proper position.On this page, the changebar should be on the right. -\cbend} -This file contains the following features which in combinations used to -give problems in versions of changebar before version 3.5: -Twoside document, onecolumn and towcolumn text, figures, columns of -figures, page changes in the midst of a document. - -This file tests various advanced features of the changebar package. -This file contains the following features which in combinations used to -give problems in versions of changebar before version 3.5: -Twoside document, onecolumn and towcolumn text, figures, columns of -figures, page changes in the midst of a document. - -\cbstart[3mm] \textcolor{red}{Here is a thicker changebar. Text that should - have a changebar (like this) is printed in red, so that it can easily be - checked that the changebars are in the proper position.On this page, the - changebar should be on the right. We also include a formula with large - descenders which should be completely covered by the changebar: - $\displaystyle \cfrac{1}{2+\cfrac{1}{3+\cfrac{1}{4+\cdots}}}$ - \cbend} - -\twocolumn -\lfoot{Twocolumn page} - -\section{Introduction} - -\cbstart -\color{red} -This file tests various advanced features of the changebar package. -This file contains the following features which in combinations used to -give problems in versions of changebar before version 3.5: -Twoside document, onecolumn and towcolumn text, figures, columns of -figures, page changes in the midst of a document. -It should work both with latex, followed by a supported Postscript driver, -and with pdflatex. -\cbend -\color{black} - -\begin{figure} - \centering - \cbstart \color{red} - \fbox{ - \parbox{0.8\linewidth}{ - This is a figure. It has its - own changebar. This is a figure. This is a figure. It has its own - changebar. This is a figure. This is a figure. It has its own - changebar. This is a figure. This is a figure.\cbend}} - \color{black} - \caption{This is a test figure} -\end{figure} - -This file tests various advanced features of the changebar package. -This file contains the following features which in combinations used to -give problems in versions of changebar before version 3.5: -Twoside document, onecolumn and towcolumn text, figures, columns of -figures, page changes in the midst of a document. - -\cbstart -\color{red} -Sections that have been added or modified are marked with a bar in -the margins. This is a small paragraph that crosses a column boundary. It -should have a changebar in both parts.\cbend -\color{black} - -\section{Continuation} -\cbstart -\color{red} - -\begin{figure} -\centering -\color{red} - \fbox{ - \parbox{0.8\linewidth}{ This is a figure. It inherits a changebar from - the environment. This is a figure. This is a figure. This is a - figure. This is a figure. It inherits a changebar from the - environment. This is a figure. This is a figure.}} -\caption{This is a test figure} -\color{black} -\end{figure} -\cbend -\color{black} - -\begin{figure}[p] -\centering \fbox{\parbox{.9\linewidth}{ - This is a figure. This is a figure. This is a figure. This is a figure. - This is a figure. This is a figure. This is a figure. This is a figure. - This is a figure. This is a figure. This is a figure. This is a figure. - This is a figure. This is a figure. This is a figure. This is a figure. - }} - \caption{Test figure} -\end{figure} - -\begin{figure}[p] -\cbstart \color{red} -\centering \fbox{\parbox{.9\linewidth}{ - This is a figure. It has its own changebar. This is a figure. It has - its own changebar. - This is a figure. It has its own changebar. This is a figure. It has - its own changebar. - This is a figure. It has its own changebar. This is a figure. It has - its own changebar. - }} \cbend\color{black} - \caption{Test figure} -\end{figure} - -\color{red} -\cbstart - -\begin{figure}[p] -\color{red} -\centering \fbox{\parbox{.9\linewidth}{ - This is a figure. It has a changebar from the environment. This is a - figure. It has a changebar from the environment. - This is a figure. It has a changebar from the environment. This is a - figure. It has a changebar from the environment. - }} - \caption{Test figure} -\end{figure} - -This part contains a changebar that crosses several column and page -boundaries. Please note that it crosses several figures also but those have -their own changebars (or not), they do not fall inside the continuation -changebar. - -\enlargethispage{1cm} -\subsection{Enlarged column} - -\noindent\parbox{\linewidth}{% -This file tests various advanced features of the changebar package. -This file contains the following features which in combinations used to -give problems in versions of changebar before version 3.5: -Twoside document, onecolumn and towcolumn text, figures, columns of -figures, page changes in the midst of a document. -\\ -\textbf{This column is enlarged, therefore its extends in the footer. -The changebar should also cover the extended text.}} - -This file contains the following features which in combinations used to -give problems in versions of changebar before version 3.5: -Twoside document, onecolumn and towcolumn text, figures, columns of -figures, page changes in the midst of a document. -It should work both with latex, followed by a supported Postscript driver, -and with pdflatex. - -\section*{Specific issues} - -\addtocounter{page}{1} -\textbf{Here we change the page number (skipping one page). Therefore we - have two even pages in a row. The page change is in the righthand column - which is not proper LaTeX coding, but it should be handled properly.} -This file tests various advanced features of the changebar package. -This file contains the following features which in combinations used to -give problems in versions of changebar before version 3.5: -Twoside document, onecolumn and towcolumn text, figures, columns of -figures, page changes in the midst of a document. -It should work both with latex, followed by a supported Postscript driver, -and with pdflatex. - -This part contains a changebar that crosses several column and page -boundaries. Please note that it crosses several figures also but those have -their own changebars (or not), they do not fall inside the continuation -changebar. - - -This file tests various advanced features of the changebar package. -This file contains the following features which in combinations used to -give problems in versions of changebar before version 3.5: -Twoside document, onecolumn and towcolumn text, figures, columns of -figures, page changes in the midst of a document. -It should work both with latex, followed by a supported Postscript driver, -and with pdflatex. - -This part contains a changebar that crosses several column and page -boundaries. Please note that it crosses several figures also but those have -their own changebars (or not), they do not fall inside the continuation -changebar. - -This file tests various advanced features of the changebar package. -This file contains the following features which in combinations used to -give problems in versions of changebar before version 3.5: -Twoside document, onecolumn and towcolumn text, figures, columns of -figures, page changes in the midst of a document. -It should work both with latex, followed by a supported Postscript driver, -and with pdflatex. - -\begin{figure}[p] -\color{red} -\centering \fbox{\parbox{.9\linewidth}{ - This is a figure. It has a changebar from the environment. This is a - figure. It has a changebar from the environment. - This is a figure. It has a changebar from the environment. This is a - figure. It has a changebar from the environment. - }} - \caption{Test figure} -\end{figure} - -\begin{figure}[p] -\color{red} -\centering \fbox{\parbox{.9\linewidth}{ - This is a figure. It has a changebar from the environment. This is a - figure. It has a changebar from the environment. - This is a figure. It has a changebar from the environment. This is a - figure. It has a changebar from the environment. - This is a figure. It has a changebar from the environment. This is a - figure. It has a changebar from the environment. - }} - \caption{Test figure} -\end{figure} - -\begin{figure}[p] -\color{red} -\centering \fbox{\parbox{.9\linewidth}{ - This is a figure. It has a changebar from the environment. This is a - figure. It has a changebar from the environment. - This is a figure. It has a changebar from the environment. This is a - figure. It has a changebar from the environment. - }} - \caption{Test figure} -\end{figure} - -\begin{figure}[p] -\color{red} -\centering \fbox{\parbox{.9\linewidth}{ - This is a figure. It has a changebar from the environment. This is a - figure. It has a changebar from the environment. - This is a figure. It has a changebar from the environment. This is a - figure. It has a changebar from the environment. - }} - \caption{Test figure} -\end{figure} - -This part contains a changebar that crosses several column and page -boundaries. Please note that it crosses several figures also but those have -their own changebars (or not), they do not fall inside the continuation -changebar. \cbend -\color{black} The last sentence of this part is outside the changebar. -\\[1ex] - -\color{red}\cbstart -\noindent\fbox{\parbox[t]{0.95\linewidth}{% -This is a parbox. It should have a changebar along its total height. -This is a parbox. It should have a changebar along its total height. -This is a parbox. It should have a changebar along its total height. -This is a parbox. It should have a changebar along its total height. -This is a parbox. It should have a changebar along its total height. -This is a parbox. It should have a changebar along its total height. -This is a parbox. It should have a changebar along its total height. -This is a parbox. It should have a changebar along its total height. -}}\cbend\color{black} -\\[2cm] -There should be a lonely figure with a changebar at the right. -\end{document} - -%%% Local Variables: -%%% mode: latex -%%% TeX-master: t -%%% End: diff --git a/Master/texmf-dist/doc/latex/changebar/cbtest1good.pdf b/Master/texmf-dist/doc/latex/changebar/cbtest1good.pdf deleted file mode 100644 index 1ebbe7300d4..00000000000 Binary files a/Master/texmf-dist/doc/latex/changebar/cbtest1good.pdf and /dev/null differ diff --git a/Master/texmf-dist/doc/latex/changebar/cbtest1wrong.pdf b/Master/texmf-dist/doc/latex/changebar/cbtest1wrong.pdf deleted file mode 100644 index 2281a41da93..00000000000 Binary files a/Master/texmf-dist/doc/latex/changebar/cbtest1wrong.pdf and /dev/null differ diff --git a/Master/texmf-dist/doc/latex/changebar/cbtest2-ltx.pdf b/Master/texmf-dist/doc/latex/changebar/cbtest2-ltx.pdf deleted file mode 100644 index dbc4221f5c0..00000000000 Binary files a/Master/texmf-dist/doc/latex/changebar/cbtest2-ltx.pdf and /dev/null differ diff --git a/Master/texmf-dist/doc/latex/changebar/cbtest2-pdf.pdf b/Master/texmf-dist/doc/latex/changebar/cbtest2-pdf.pdf deleted file mode 100644 index 769b847f2e5..00000000000 Binary files a/Master/texmf-dist/doc/latex/changebar/cbtest2-pdf.pdf and /dev/null differ diff --git a/Master/texmf-dist/doc/latex/changebar/cbtest2.tex b/Master/texmf-dist/doc/latex/changebar/cbtest2.tex deleted file mode 100644 index 1f53624e4e6..00000000000 --- a/Master/texmf-dist/doc/latex/changebar/cbtest2.tex +++ /dev/null @@ -1,322 +0,0 @@ -\documentclass[12pt,twoside]{article} -\usepackage{amsmath} -\usepackage[outerbars,xcolor]{changebar} -\ifx\pdfoutput\undefined -\else\ifnum\pdfoutput>0 - \usepackage{pdfcolmk} -\fi\fi - -%\setcounter{changebargrey}{60} -\cbcolor{red} - -\usepackage{fancyhdr} - -%Header-footer instructions -\pagestyle{fancy} -\setlength{\headheight}{15pt} -\lhead{\scriptsize Changebar test file} -\chead{} -\rhead{v3.5} -\lfoot{Onecolumn text} -\cfoot{Page \thepage} -\rfoot{} -\renewcommand{\headrulewidth}{0.4pt} %print a rule below the header -\renewcommand{\footrulewidth}{0.4pt} %print a rule above the footer - -\setcounter{page}{16} -\setlength{\emergencystretch}{4em} - -\begin{document} - -%\tableofcontents - -\title{CHANGEBAR TEST FILE \\FOR ADVANCED FEATURES} -\author{Piet van Oostrum} -\maketitle - -\raggedbottom - -\begin {abstract} - -This file tests various advanced features of the changebar package. -\cbstart\textcolor{red}{\textbf{Text that should have a changebar is - printed in red, so that it can easily be checked that the changebars are - in the proper position.} This changebar should be on the left. -\cbend} - -This file contains the following features which in combinations used to -give problems in versions of changebar before version 3.5: -Twoside document, onecolumn and towcolumn text, figures, columns of -figures, page changes in the midst of a document. - -This file tests various advanced features of the changebar package. -This file contains the following features which in combinations used to -give problems in versions of changebar before version 3.5: -Twoside document, onecolumn and towcolumn text, figures, columns of -figures, page changes in the midst of a document. -It should work both with latex, followed by a supported Postscript driver, -and with pdflatex. -\end{abstract} - -\newpage - -This file tests various advanced features of the changebar package. -\cbstart\textcolor{red}{Text that should have a changebar (like this) is - printed in red, so that it can easily be checked that the changebars are - in the proper position.On this page, the changebar should be on the right. -\cbend} -This file contains the following features which in combinations used to -give problems in versions of changebar before version 3.5: -Twoside document, onecolumn and towcolumn text, figures, columns of -figures, page changes in the midst of a document. - -This file tests various advanced features of the changebar package. -This file contains the following features which in combinations used to -give problems in versions of changebar before version 3.5: -Twoside document, onecolumn and towcolumn text, figures, columns of -figures, page changes in the midst of a document. - -\cbstart[3mm] \textcolor{red}{Here is a thicker changebar. Text that should - have a changebar (like this) is printed in red, so that it can easily be - checked that the changebars are in the proper position.On this page, the - changebar should be on the right. We also include a formula with large - descenders which should be completely covered by the changebar: - $\displaystyle \cfrac{1}{2+\cfrac{1}{3+\cfrac{1}{4+\cdots}}}$ - \cbend} - -\twocolumn -\lfoot{Twocolumn page} - -\section{Introduction} - -\cbstart -\color{red} -This file tests various advanced features of the changebar package. -This file contains the following features which in combinations used to -give problems in versions of changebar before version 3.5: -Twoside document, onecolumn and towcolumn text, figures, columns of -figures, page changes in the midst of a document. -It should work both with latex, followed by a supported Postscript driver, -and with pdflatex. -\cbend -\color{black} - -\begin{figure} - \centering - \cbstart \color{red} - \fbox{ - \parbox{0.8\linewidth}{ - This is a figure. It has its - own changebar. This is a figure. This is a figure. It has its own - changebar. This is a figure. This is a figure. It has its own - changebar. This is a figure. This is a figure.\cbend}} - \color{black} - \caption{This is a test figure} -\end{figure} - -This file tests various advanced features of the changebar package. -This file contains the following features which in combinations used to -give problems in versions of changebar before version 3.5: -Twoside document, onecolumn and towcolumn text, figures, columns of -figures, page changes in the midst of a document. - -\cbstart -\color{red} -Sections that have been added or modified are marked with a bar in -the margins. This is a small paragraph that crosses a column boundary. It -should have a changebar in both parts.\cbend -\color{black} - -\section{Continuation} -\cbstart -\color{red} - -\begin{figure} -\centering -\color{red} - \fbox{ - \parbox{0.8\linewidth}{ This is a figure. It inherits a changebar from - the environment. This is a figure. This is a figure. This is a - figure. This is a figure. It inherits a changebar from the - environment. This is a figure. This is a figure.}} -\caption{This is a test figure} -\color{black} -\end{figure} -\cbend -\color{black} - -\begin{figure}[p] -\centering \fbox{\parbox{.9\linewidth}{ - This is a figure. This is a figure. This is a figure. This is a figure. - This is a figure. This is a figure. This is a figure. This is a figure. - This is a figure. This is a figure. This is a figure. This is a figure. - This is a figure. This is a figure. This is a figure. This is a figure. - }} - \caption{Test figure} -\end{figure} - -\begin{figure}[p] -\cbstart \color{red} -\centering \fbox{\parbox{.9\linewidth}{ - This is a figure. It has its own changebar. This is a figure. It has - its own changebar. - This is a figure. It has its own changebar. This is a figure. It has - its own changebar. - This is a figure. It has its own changebar. This is a figure. It has - its own changebar. - }} \cbend\color{black} - \caption{Test figure} -\end{figure} - -\color{red} -\cbstart - -\begin{figure}[p] -\color{red} -\centering \fbox{\parbox{.9\linewidth}{ - This is a figure. It has a changebar from the environment. This is a - figure. It has a changebar from the environment. - This is a figure. It has a changebar from the environment. This is a - figure. It has a changebar from the environment. - }} - \caption{Test figure} -\end{figure} - -This part contains a changebar that crosses several column and page -boundaries. Please note that it crosses several figures also but those have -their own changebars (or not), they do not fall inside the continuation -changebar. - -\enlargethispage{1cm} -\subsection{Enlarged column} - -\noindent\parbox{\linewidth}{% -This file tests various advanced features of the changebar package. -This file contains the following features which in combinations used to -give problems in versions of changebar before version 3.5: -Twoside document, onecolumn and towcolumn text, figures, columns of -figures, page changes in the midst of a document. -\\ -\textbf{This column is enlarged, therefore its extends in the footer. -The changebar should also cover the extended text.}} - -This file contains the following features which in combinations used to -give problems in versions of changebar before version 3.5: -Twoside document, onecolumn and towcolumn text, figures, columns of -figures, page changes in the midst of a document. -It should work both with latex, followed by a supported Postscript driver, -and with pdflatex. - -\section*{Specific issues} - -\addtocounter{page}{1} -\textbf{Here we change the page number (skipping one page). Therefore we - have two even pages in a row. The page change is in the righthand column - which is not proper LaTeX coding, but it should be handled properly.} -This file tests various advanced features of the changebar package. -This file contains the following features which in combinations used to -give problems in versions of changebar before version 3.5: -Twoside document, onecolumn and towcolumn text, figures, columns of -figures, page changes in the midst of a document. -It should work both with latex, followed by a supported Postscript driver, -and with pdflatex. - -This part contains a changebar that crosses several column and page -boundaries. Please note that it crosses several figures also but those have -their own changebars (or not), they do not fall inside the continuation -changebar. - - -This file tests various advanced features of the changebar package. -This file contains the following features which in combinations used to -give problems in versions of changebar before version 3.5: -Twoside document, onecolumn and towcolumn text, figures, columns of -figures, page changes in the midst of a document. -It should work both with latex, followed by a supported Postscript driver, -and with pdflatex. - -This part contains a changebar that crosses several column and page -boundaries. Please note that it crosses several figures also but those have -their own changebars (or not), they do not fall inside the continuation -changebar. - -This file tests various advanced features of the changebar package. -This file contains the following features which in combinations used to -give problems in versions of changebar before version 3.5: -Twoside document, onecolumn and towcolumn text, figures, columns of -figures, page changes in the midst of a document. -It should work both with latex, followed by a supported Postscript driver, -and with pdflatex. - -\begin{figure}[p] -\color{red} -\centering \fbox{\parbox{.9\linewidth}{ - This is a figure. It has a changebar from the environment. This is a - figure. It has a changebar from the environment. - This is a figure. It has a changebar from the environment. This is a - figure. It has a changebar from the environment. - }} - \caption{Test figure} -\end{figure} - -\begin{figure}[p] -\color{red} -\centering \fbox{\parbox{.9\linewidth}{ - This is a figure. It has a changebar from the environment. This is a - figure. It has a changebar from the environment. - This is a figure. It has a changebar from the environment. This is a - figure. It has a changebar from the environment. - This is a figure. It has a changebar from the environment. This is a - figure. It has a changebar from the environment. - }} - \caption{Test figure} -\end{figure} - -\begin{figure}[p] -\color{red} -\centering \fbox{\parbox{.9\linewidth}{ - This is a figure. It has a changebar from the environment. This is a - figure. It has a changebar from the environment. - This is a figure. It has a changebar from the environment. This is a - figure. It has a changebar from the environment. - }} - \caption{Test figure} -\end{figure} - -\begin{figure}[p] -\color{red} -\centering \fbox{\parbox{.9\linewidth}{ - This is a figure. It has a changebar from the environment. This is a - figure. It has a changebar from the environment. - This is a figure. It has a changebar from the environment. This is a - figure. It has a changebar from the environment. - }} - \caption{Test figure} -\end{figure} - -This part contains a changebar that crosses several column and page -boundaries. Please note that it crosses several figures also but those have -their own changebars (or not), they do not fall inside the continuation -changebar. \cbend -\color{black} The last sentence of this part is outside the changebar. -\\[1ex] - -\color{red}\cbstart -\noindent\fbox{\parbox[t]{0.95\linewidth}{% -This is a parbox. It should have a changebar along its total height. -This is a parbox. It should have a changebar along its total height. -This is a parbox. It should have a changebar along its total height. -This is a parbox. It should have a changebar along its total height. -This is a parbox. It should have a changebar along its total height. -This is a parbox. It should have a changebar along its total height. -This is a parbox. It should have a changebar along its total height. -This is a parbox. It should have a changebar along its total height. -}}\cbend\color{black} -\\[2cm] -There should be a lonely figure with a changebar at the right. -\end{document} - -%%% Local Variables: -%%% mode: latex -%%% TeX-master: t -%%% End: diff --git a/Master/texmf-dist/doc/latex/changebar/changebar.bug b/Master/texmf-dist/doc/latex/changebar/changebar.bug index 2d239c93e63..bc04f1ca689 100644 --- a/Master/texmf-dist/doc/latex/changebar/changebar.bug +++ b/Master/texmf-dist/doc/latex/changebar/changebar.bug @@ -199,7 +199,10 @@ % % v3.6c JLB: changed the definition of \cb@checkPDF in order to prevent % an extra page at the end of the document, filled with "spsp" - +% +% v3.6d JLB: Added \relax at the end of \openin statements in order to +% prevent teX from looking too far ahead. +% % Known problems % - changebars for mmarginal 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 index 31ddeb649c2..bbe12810887 100644 Binary files a/Master/texmf-dist/doc/latex/changebar/changebar.pdf and b/Master/texmf-dist/doc/latex/changebar/changebar.pdf differ diff --git a/Master/texmf-dist/doc/latex/changebar/chbar.1 b/Master/texmf-dist/doc/latex/changebar/chbar.1 deleted file mode 100644 index f36e68e2bbb..00000000000 --- a/Master/texmf-dist/doc/latex/changebar/chbar.1 +++ /dev/null @@ -1,117 +0,0 @@ -.ds AL L\\v'.3m'A\\v'-.3m'\\*(ET -.TH CHBAR 1 TeX -.SH NAME -chbar \- write \*(AL file with `change bars' showing change between input \*(AL files -.SH SYNOPSIS -.B chbar -[ -.B \-h -] [ -.B \-g -] [ -.B \-G -] [ -.BI \-d " dir" -] [ -.BI \-r " rev" -] -.I old new -[ -.I output -] -.sp -.B chbar -[ -.B \-h -] [ -.B \-g -] [ -.B \-G -] [ -.BI \-d " dir" -] [ -.BI \-r " rev" -] -.I old -.sp -.B chbar -[ -.B \-h -] [ -.B \-g -] [ -.B \-G -] -.BI \-d " dir" -.BI \-r " rev" -.I files -.SH DESCRIPTION -.I chbar -takes two \*(AL files and produce a third which -has change bars highlighting the difference between them. There -are three basic modes of operation: first, pathnames can -be given for -.I old -and -.IR new ; -second, if only -.I old -is named, the -.I new -file is taken from standard input and the output is written to standard -output; thirdly, if the -.B \-r -option is used -.I files -held by RCS must be named - (see the explanation of the -.B \-r -option). -.sp -Change bars are inserted for differences after '\ebegin{document}'. -.SH OPTIONS -.TP -.BI \-d " dir" -Write the output to file -.IR dir/new , -if -.I new -is given or to file -.IR dir/old . -If -.I dir -does not exist, it is created. -If -.I output -is given, it is discarded. -.TP -.BI \-r " rev" -If the \*(AL -.I files -are kept under control of the Revision Control System RCS, the old files of -the revision -.I rev -can be retrieved. -.I rev -is specified using the RCS conventions. -This option must be used together with the -.BI \-d " dir" -option. -.I files -must be a nonempty list of files. -.TP -.B \-h -Print a help text. -.TP -.B \-g -Print some debugging info. -.TP -.B \-G -Even more debug info. -.SH SEE ALSO -.IR diff (1), -.IR rcs (1) -.SH BUGS -The -.I new -file can not be named `-'. - diff --git a/Master/texmf-dist/doc/latex/changebar/chbar.sh b/Master/texmf-dist/doc/latex/changebar/chbar.sh deleted file mode 100644 index 232b1fcc37b..00000000000 --- a/Master/texmf-dist/doc/latex/changebar/chbar.sh +++ /dev/null @@ -1,240 +0,0 @@ -#!/bin/sh -# Gadget to take two LaTeX files and produce a third which -# has changebars highlighting the difference between them. -# -# Version 1.2 -# Author: -# Don Ward, Careful Computing (don@careful.co.uk) -# v1.0 April 1989 -# v1.1 Feb 93 Amended to use changebar.sty (v3.0) and dvips -# v1.2 Aug 95 Added support for LaTeX209/LaTeX2e -# Added RCS support to retrive old files - -CMD=`basename $0` - -SED=sed -RM="rm -f" -DIFF=diff -ED=ed -AWK=awk -GREP=grep -MV=mv -CAT=cat -MKDIR=mkdir -CO="co" - -TMPFILE=/tmp/$CMD.$$ -SED_CMD_FILE=$TMPFILE.sed - -usage() -{ -$CAT << _END_ -Usage: - $CMD [-hgG] [-d dir] old new [output] - default output is stdout - - $CMD [-hgG] [-d dir] old - new file on stdin, output on stdout - - $CMD [-hgG] -d dir -r rev files - old file retrieved using RCS - - Gadget to take two LaTeX files and produce a third which - has changebars highlighting the difference between them. - Changebars are inserted for differences after '\begin{document}'. - - Feature: \`new' can not be named \`-'. - - Options are: - -d dir : Write the output to file \`dir/new', if \`new' is given or - to file \`dir/old'. - If \`dir' does not exist, it is created. - If \`output' is given, it is discarded. - - -r rev : If the LaTeX \`files' are kept under control of the - Revision Control System RCS, the old files of - the revision \`rev' can be retrived. - \`rev' is specified using the RCS conventions. - This option must be used together with the \`-d dir' option. - \`files' must be a nonempty list of files. - - -h : Print this info text. - -g : Print some debugging info. - -G : Even more debug info. - - Version 1.2: August 3. 1995 -_END_ -exit 1 -} - -# parse options and arguments -DEBUG="NO" -DIR= -REV= -# process options -while getopts d:r:gGh i $* -do - case $i in - d ) DIR=$OPTARG;; - r ) REV=$OPTARG;; - g ) DEBUG="YES" ;; - G ) set -x; DEBUG="YES";; - h | \ - * ) usage ;; - esac -done - -shift `expr $OPTIND - 1` - -case $# in - 1 ) OLD=$1; NEW="-"; OUT="" ;; - 2 ) OLD=$1; NEW=$2; OUT="" ;; - 3 ) OLD=$1; NEW=$2; OUT="$3" ;; - * ) usage ;; -esac - -# check correct options -if [ ! -z "$DIR" ] -then - [ -d $DIR ] || $MKDIR $DIR -fi - -if [ ! -z "$REV" ] -then - [ -z "$DIR" ] && usage - FILES=$* -else - FILES=$NEW -fi - -# do the work -for NEW in $FILES -do - if [ ! -z "$DIR" ] - then - if [ $NEW = "-" ] - then - OUT=$DIR/$OLD - else - OUT=$DIR/$NEW - fi - fi - if [ ! -z "$REV" ] - then - OLD=${TMPFILE}.old - $CO -p"$REV" -q $NEW > $OLD - fi - - [ $DEBUG = "YES" ] && echo "OLD=\`$OLD' NEW=\`$NEW' OUT=\`$OUT'" - - # gather some info about the file - # Since we have for sure only the name of the OLD file, ... - $GREP "^\\\\begin{document}" $OLD > /dev/null - if [ $? -eq 0 ] - then - [ $DEBUG = "YES" ] && echo "contains a \\begin{document}" - HAS_BEGIN_DOC="YES" - else - [ $DEBUG = "YES" ] && echo "contains no \\begin{document}" - HAS_BEGIN_DOC="NO" - fi - - # Method to do the work: - # 1 Use diff to get an ed script to go from file1 to file2. - # 2 Breath on it a bit (with sed) to insert changebar commands. - # 3 Apply modified ed script to produce (nearly) the output. - # 4 Use awk to insert the changebars option into the \documentstyle - # and to handle changebar commands inside verbatim environments. - # 5 Remove changebars before \begin{document} with sed - - # SED commands to edit ED commands to edit old file - $CAT > $SED_CMD_FILE <<\_END_ -/^\.$/i\ -\\cbend{}% -/^[0-9][0-9]*[ac]$/a\ -\\cbstart{}% -/^[0-9][0-9]*,[0-9][0-9]*[ac]$/a\ -\\cbstart{}% -/^[0-9][0-9]*d$/a\ -i\ -\\cbdelete{}%\ -. -/^[0-9][0-9]*,[0-9][0-9]*d$/a\ -i\ -\\cbdelete{}%\ -. -_END_ - - # note DIFF accepts `-' as stdin - $DIFF -b -e $OLD $NEW | \ - ( $SED -f $SED_CMD_FILE ; echo w ${TMPFILE}.1 ; echo q ) | \ - $ED - $OLD - - # AWK commands to insert Changebars style and to protect - # changebar commands in verbatim environments - # and to tell what driver is in use; we assume the `dvips' driver - - $AWK ' - BEGIN {kind=""; # we saw now \documentXXX[]{} - } - /^\\documentstyle/{ - kind = "209"; - if (index($0, "changebar") == 0 ) { - opts = index($0, "[") - if (opts > 0) - printf "%schangebar,%s\n",substr($0,1,opts),substr($0,opts+1) - else - printf "\\documentstyle[changebar]%s\n", substr($0,15) - next - } - } - /^\\documentclass/{ - kind = "2e"; - printf "%s\n", $0 - printf "\\usepackage[dvips]{changebar}\n" - next - } - /\\begin{document}/ {if (kind == "209" ) {print "\\driver{dvips}"}} - /\\begin{verbatim}/{++nesting} - /\\end{verbatim}/{--nesting} - /\\cbstart{}%|\\cbend{}%|\cbdelete{}%/ { - if ( nesting > 0) { - # changebar command in a verbatim environment: Temporarily exit, - # do the changebar command and reenter. - # - # The obvious ( printf "\\end{verbatim}%s\\begin{verbatim} , $0 ) - # leaves too much vertical space around the changed line(s). - # The following magic seeems to work - # - print "\\end{verbatim}\\nointerlineskip" - print "\\vskip -\\ht\\strutbox\\vskip -\\ht\\strutbox" - printf "\\vbox to 0pt{\\vskip \\ht\\strutbox%s\\vss}\n", $0 - print "\\begin{verbatim}" - next - } - } - { print $0 } - ' ${TMPFILE}.1 > ${TMPFILE}.2 - - # if a \begin{document} is contained in the file, - # remove the changebar commands before them - - if [ $HAS_BEGIN_DOC = "YES" ] - then - SED_CMD="1,/\\\\begin{document}/s/\(\\\\cb[sed][tne][adl][^{}]*{}%\)$/%%\1/" - $SED "$SED_CMD" ${TMPFILE}.2 > ${TMPFILE}.3 - else - $CAT ${TMPFILE}.2 > ${TMPFILE}.3 - fi - if [ -z "$OUT" ] - then - $CAT ${TMPFILE}.3 - else - $MV ${TMPFILE}.3 $OUT - fi - -done - -[ $DEBUG = "NO" ] && $RM ${TMPFILE}.* - -############################################################### diff --git a/Master/texmf-dist/source/latex/changebar/changebar.dtx b/Master/texmf-dist/source/latex/changebar/changebar.dtx index e146293a0c0..b07d80083f2 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-2018 (C) Johannes Braams. All rights reserved. +%% Copyright 1994-2022 (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{2591} +% \CheckSum{2594} % %\iffalse % This file is built for \LaTeXe, so we make sure an error is @@ -39,7 +39,7 @@ \ProvidesFile{changebar.dtx} % %<+package>\ProvidesPackage{changebar} - [2018/03/09 v3.6c Indicate changes with marginal bars] + [2022-05-06 v3.6d Indicate changes with marginal bars] % \end{macrocode} % % \section{A driver for this document} @@ -2997,6 +2997,7 @@ % Compute the left and right positions of the changebars. % \changes{v3.4g}{2004/01/09}{Added tracing information for the left % and right postions} +% \changes{v3.6d}{2022-05-06}{Added \cs{relax} to end the filename} % \begin{macrocode} \cb@positions \cb@trace{% @@ -3006,7 +3007,7 @@ Even right: \the\cb@even@right }% \immediate\closeout\cb@write - \immediate\openin\cb@read=\jobname.cb} + \immediate\openin\cb@read=\jobname.cb\relax} % \end{macrocode} % \end{macro} % @@ -3021,13 +3022,13 @@ % checking. % \changes{3.2}{1994/04/21}{Use \cs{AtEndDocument} now instead of % redefining \cs{enddocument}} -% +% \changes{v3.6d}{2022-05-06}{Added \cs{relax} to end the filename} % \begin{macrocode} \AtEndDocument{% \clearpage \cb@initstack\cb@historystack \immediate\closein\cb@read - \immediate\openin\cb@read=\jobname.cb% + \immediate\openin\cb@read=\jobname.cb\relax % \end{macrocode} % % \changes{v3.5a}{2005/05/23}{For pdftex we also close and reread the @@ -3037,7 +3038,7 @@ \ifx\cb@readxy\@undefined \else \immediate\closein\cb@readxy - \immediate\openin\cb@readxy=\jobname.cb2% + \immediate\openin\cb@readxy=\jobname.cb2\relax \def\cb@pdfpoints{}% \def\cb@pdfpagenr{0}% \fi diff --git a/Master/texmf-dist/source/latex/changebar/changebar.ins b/Master/texmf-dist/source/latex/changebar/changebar.ins index 8b5a9684f6c..21a53322235 100644 --- a/Master/texmf-dist/source/latex/changebar/changebar.ins +++ b/Master/texmf-dist/source/latex/changebar/changebar.ins @@ -24,7 +24,7 @@ \preamble This is a generated file. -Copyright (C) 1994-2018 Johannes Braams, All rights reserved. +Copyright (C) 1994-2022 Johannes Braams, All rights reserved. This file was generated from file(s) of the changebar package. -------------------------------------------------------------- diff --git a/Master/texmf-dist/tex/latex/changebar/changebar.sty b/Master/texmf-dist/tex/latex/changebar/changebar.sty index 7ff3dbf956e..31b64ec3ccd 100644 --- a/Master/texmf-dist/tex/latex/changebar/changebar.sty +++ b/Master/texmf-dist/tex/latex/changebar/changebar.sty @@ -7,7 +7,7 @@ %% changebar.dtx (with options: `package') %% This is a generated file. %% -%% Copyright (C) 1994-2018 Johannes Braams, All rights reserved. +%% Copyright (C) 1994-2022 Johannes Braams, All rights reserved. %% %% This file was generated from file(s) of the changebar package. %% -------------------------------------------------------------- @@ -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-2018 (C) Johannes Braams. All rights reserved. +%% Copyright 1994-2022 (C) Johannes Braams. All rights reserved. \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{changebar} - [2018/03/09 v3.6c Indicate changes with marginal bars] + [2022-05-06 v3.6d Indicate changes with marginal bars] \def\cb@maxpoint{80} \def\cb@minpoint{1} \def\cb@nil{0} @@ -1021,16 +1021,16 @@ Even right: \the\cb@even@right }% \immediate\closeout\cb@write - \immediate\openin\cb@read=\jobname.cb} + \immediate\openin\cb@read=\jobname.cb\relax} \AtEndDocument{% \clearpage \cb@initstack\cb@historystack \immediate\closein\cb@read - \immediate\openin\cb@read=\jobname.cb% + \immediate\openin\cb@read=\jobname.cb\relax \ifx\cb@readxy\@undefined \else \immediate\closein\cb@readxy - \immediate\openin\cb@readxy=\jobname.cb2% + \immediate\openin\cb@readxy=\jobname.cb2\relax \def\cb@pdfpoints{}% \def\cb@pdfpagenr{0}% \fi -- cgit v1.2.3