summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2021-05-14 20:21:34 +0000
committerKarl Berry <karl@freefriends.org>2021-05-14 20:21:34 +0000
commitb4583f3261f68cd979a19ad2ed6681e9c6140c64 (patch)
tree8ce3b62d05c3966efbfc49717e24a3bc5c9cb11d /Master/texmf-dist/source
parent21813d5f1f8535663b9f8c75dd5c013a41982552 (diff)
changes (14may21)
git-svn-id: svn://tug.org/texlive/trunk@59198 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source')
-rw-r--r--Master/texmf-dist/source/latex/changes/changes.drv5
-rw-r--r--Master/texmf-dist/source/latex/changes/changes.dtx24
-rw-r--r--Master/texmf-dist/source/latex/changes/changes.ins9
-rw-r--r--Master/texmf-dist/source/latex/changes/regression.dtx187
4 files changed, 215 insertions, 10 deletions
diff --git a/Master/texmf-dist/source/latex/changes/changes.drv b/Master/texmf-dist/source/latex/changes/changes.drv
index 213bf8ba414..e8e7868fb14 100644
--- a/Master/texmf-dist/source/latex/changes/changes.drv
+++ b/Master/texmf-dist/source/latex/changes/changes.drv
@@ -1,5 +1,6 @@
%%%
% driver file of changes package
+\newcommand{\docversion}{4.0.4}
\documentclass[titlepage, parskip=half, toc=flat, cleardoublepage=empty, captions=nooneline, origlongtable, english]{scrartcl}
@@ -259,11 +260,11 @@
% document title
\ifENGLISH
\title{The \docpackage{changes}-package}
- \subtitle{Manual change markup --- version 4.0.2}
+ \subtitle{Manual change markup --- version~\docversion}
\fi
\ifGERMAN
\title{Das \docpackage{changes}-Paket}
- \subtitle{Manuelle Änderungsmarkierung -- Version 4.0.2}
+ \subtitle{Manuelle Änderungsmarkierung -- Version~\docversion}
\fi
\author{Ekkart Kleinod}
diff --git a/Master/texmf-dist/source/latex/changes/changes.dtx b/Master/texmf-dist/source/latex/changes/changes.dtx
index 5e29a4c9907..cdb43d7d46f 100644
--- a/Master/texmf-dist/source/latex/changes/changes.dtx
+++ b/Master/texmf-dist/source/latex/changes/changes.dtx
@@ -1,4 +1,4 @@
-% \CheckSum{1262}
+% \CheckSum{1263}
%
% \iffalse meta-comment
%
@@ -65,6 +65,8 @@
% \changes{v4.0.0}{2021/01/28}{new: convenience macros, setlocextension, option commandnameprefix, defaultcolor; removed: xifthen, remark}
% \changes{v4.0.1}{2021/02/14}{bugfix: Command do undefined}
% \changes{v4.0.2}{2021/04/05}{bugfix: documentation with ifthenelse references}
+% \changes{v4.0.3}{2021/05/09}{bugfix: compile error with cite command in change markup with final option}
+% \changes{v4.0.4}{2021/05/13}{bugfix: added missing regression.dtx to ctan archive; no code change}
% \GetFileInfo{changes.dtx}
% \RecordChanges
%
@@ -104,9 +106,8 @@
% Type some information to the console.
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{changes}
-[2021/04/05 v4.0.2 changes package]
-\typeout{*** changes package 2021/04/05 v4.0.2 ***}
+\ProvidesPackage{changes}[2021/05/13 v4.0.4 changes package]
+\typeout{*** changes package 2021/05/13 v4.0.4 ***}
% \end{macrocode}
%
% Package \docpackage{xkeyval} provides options with key-value-pairs.
@@ -573,12 +574,16 @@
%
% Corresponds to the if macros of \docpackage{etoolbox}, so it can be used in it's boolean tests.
% Mainly the last two parameters are the results of \emph{true} and \emph{false} computation.
+%
+% I cannot add the test with \doccommand{IfStrEq} to \doccommand{IfIsEmpty} because it breaks e.g. with a \doccommand{cite} command in the final option, see issue \#102.
+% This test does not work (yet) with \doccommand{csuse} as parameter, see \doccommand{Changes@output@author} for the problem.
% \begin{macrocode}
\newrobustcmd{\IfIsEmpty}[3]{%
\ifboolexpr{%
test {\ifblank{#1}} or%
- test {\IfStrEq{#1}{}} or%
- test {\IfStrEq{#1}{\@empty}}%
+ test {\ifstrempty{#1}} or%
+ test {\ifdefstring{#1}{}} or%
+ test {\ifdefstring{#1}{\@empty}}%
}%
{#2}%
{#3}%
@@ -1131,7 +1136,12 @@
{}%
\IfStrEq{\Changes@optionauthormarkuptext}{name}%
{%
- \IfIsEmpty{\csuse{Changes@AuthorName#1}}%
+ % \end{macrocode}
+ %
+ % I cannot use \doccommand{IfIsEmpty} here, because it does not work in this case.
+ % I cannot add the test with \doccommand{IfStrEq} to \doccommand{IfIsEmpty} because it breaks e.g. with a \doccommand{cite} command in the final option.
+ % \begin{macrocode}
+ \IfStrEq{\csuse{Changes@AuthorName#1}}{}%
{#1}%
{\csuse{Changes@AuthorName#1}}%
}%
diff --git a/Master/texmf-dist/source/latex/changes/changes.ins b/Master/texmf-dist/source/latex/changes/changes.ins
index 489d804e35b..537ecf5d1ed 100644
--- a/Master/texmf-dist/source/latex/changes/changes.ins
+++ b/Master/texmf-dist/source/latex/changes/changes.ins
@@ -1,6 +1,6 @@
%% This file creates the needed files from changes.dtx
%%
-\def\filedate{2021/02/14}
+\def\filedate{2021/05/13}
\def\batchfile{changes.ins}
\input docstrip
@@ -28,6 +28,7 @@ This work consists of the files
source/latex/changes/changes.dtx
source/latex/changes/changes.ins
source/latex/changes/examples.dtx
+ source/latex/changes/regression.dtx
source/latex/changes/README
source/latex/changes/userdoc/*.tex
@@ -40,6 +41,9 @@ and the derived files
doc/latex/changes/examples/changes.example.*.tex
doc/latex/changes/examples/changes.example.*.pdf
+ doc/latex/changes/regression/changes.regression.*.tex
+ doc/latex/changes/regression/changes.regression.*.pdf
+
tex/latex/changes/changes.sty
\endpreamble
@@ -148,6 +152,9 @@ Copyright 2007-2021 Ekkart Kleinod
\file{examples/changes.example.packageoptions.xcolor.tex}{\from{examples.dtx}{example:packageoptions.xcolor}}
%
\file{examples/changes.example.screenshot.tex}{\from{example-screenshot.dtx}{example:screenshot}}
+%
+ \file{regression/changes.regression.draft.tex}{\from{regression.dtx}{regression:draft}}
+ \file{regression/changes.regression.final.tex}{\from{regression.dtx}{regression:final}}
}
\endinput
diff --git a/Master/texmf-dist/source/latex/changes/regression.dtx b/Master/texmf-dist/source/latex/changes/regression.dtx
new file mode 100644
index 00000000000..a3fe6c903a9
--- /dev/null
+++ b/Master/texmf-dist/source/latex/changes/regression.dtx
@@ -0,0 +1,187 @@
+% \iffalse meta-comment
+%
+% Copyright (C) 2007-2021
+% Ekkart Kleinod (ekleinod@edgesoft.de)
+% --------------------------------------------------------------------------
+%
+% This work may be distributed and/or modified under the
+% conditions of the \LaTeX\ Project Public License, either version~1.3
+% of this license or any later version.
+% The latest version of this license is in\\
+% \url{http://www.latex-project.org/lppl.txt}\\
+% and version~1.3 or later is part of all distributions of \LaTeX\
+% version 2005/12/01 or later.
+%
+% This work has the LPPL maintenance status "maintained".
+% The current maintainer of this work is Ekkart Kleinod.
+% \fi
+%
+% \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
+% Lower-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
+% Digits \0\1\2\3\4\5\6\7\8\9
+% Exclamation \! Double quote \" Hash (number) \#
+% Dollar \$ Percent \% Ampersand \&
+% Acute accent \' Left paren \( Right paren \)
+% Asterisk \* Plus \+ Comma \,
+% Minus \- Point \. Solidus \/
+% Colon \: Semicolon \; Less than \<
+% Equals \= Greater than \> Question mark \?
+% Commercial at \@ Left bracket \[ Backslash \\
+% Right bracket \] Circumflex \^ Underscore \_
+% Grave accent \` Left brace \{ Vertical bar \|
+% Right brace \} Tilde \~}
+%
+% \GetFileInfo{regression.dtx}
+%
+%^^A --------------------------------------------------------------------------
+%
+% Start the \LaTeX document the standard way.
+%
+% \begin{macrocode}
+\documentclass[11pt, a4paper, notitlepage, english]{article}
+\usepackage{babel}
+% \end{macrocode}
+%
+% \begin{macrocode}
+%<*regression:draft>
+\usepackage[authormarkuptext=name]{changes}
+%</regression:draft>
+%<*regression:final>
+\usepackage[final]{changes}
+%</regression:final>
+%
+% Define some authors.
+%
+% \begin{macrocode}
+\definechangesauthor[color=green]{Green}
+\definechangesauthor[name={Mister Orange}, color=orange]{OA}
+\definechangesauthor{nochanges}
+% \end{macrocode}
+%
+% \begin{macrocode}
+\begin{document}
+
+%<*regression:draft>
+ \section{Test empty string}
+
+ Anonymous author should have no space before the \added[comment=no space]{number} in the comment.
+
+ Author name should \added[id=OA]{appear here} but \added[id=Green]{id here}.
+
+ \listofchanges[title={List of changes should not contain empty author brackets}]
+
+ \listofchanges[style=compactsummary, title={Summary should not contain empty author brackets either}]
+%</regression:draft>
+
+%<*regression:final>
+ \section{Compile errors to avoid}
+
+ no compile error here (just a missing citation): --- \added{a cite inside added \cite{bibid}} ---
+
+ \section{Errors with empty replacement}
+
+ All corresponding lines should have the same width.
+
+ Text before deletion.
+ \deleted{Deleted text.}
+ Text after deletion.
+
+ Text before deletion. \deleted{Deleted text.} Text after deletion.
+
+ Text before deletion.
+ Text after deletion.
+
+
+ Text before replacement.
+ \replaced{}{Replaced text.}
+ Text after replacement.
+
+ Text before replacement. \replaced{}{Replaced text.} Text after replacement.
+
+ Text before replacement.
+ Text after replacement.
+
+
+ Text before replacement.
+ \replaced{}{}
+ Text after replacement.
+
+ Text before replacement. \replaced{}{} Text after replacement.
+
+ Text before replacement.
+ Text after replacement.
+
+
+ Text before addition.
+ \added{}
+ Text after addition.
+
+ Text before addition. \added{} Text after addition.
+
+ Text before addition.
+ Text after addition.
+
+ Text before comment.
+ \comment{Comment.}
+ Text after comment.
+
+ Text before comment. \comment{Comment.} Text after comment.
+
+ Text before comment.
+ Text after comment.
+
+ Text before empty comment.
+ \comment{}
+ Text after empty comment.
+
+ Text before empty comment. \comment{} Text after empty comment.
+
+ Text before empty comment.
+ Text after empty comment.
+
+ Text before highlight.
+ \highlight[comment={Highlight comment}]{Highlighted text.}
+ Text after highlight.
+
+ Text before highlight. \highlight[comment={Highlight comment}]{Highlighted text.} Text after highlight.
+
+ Text before highlight.
+ Highlighted text.
+ Text after highlight.
+
+ Text before empty highlight text.
+ \highlight[comment={Highlight comment}]{}
+ Text after empty highlight text.
+
+ Text before empty highlight text. \highlight[comment={Highlight comment}]{} Text after empty highlight text.
+
+ Text before empty highlight text.
+ Text after empty highlight text.
+
+ Text before empty highlight comment.
+ \highlight[comment={}]{Highlighted text.}
+ Text after empty highlight comment.
+
+ Text before empty highlight comment. \highlight[comment={}]{Highlighted text.} Text after empty highlight comment.
+
+ Text before empty highlight comment.
+ Highlighted text.
+ Text after empty highlight comment.
+
+ Text before empty highlight.
+ \highlight[comment={}]{}
+ Text after empty highlight.
+
+ Text before empty highlight. \highlight[comment={}]{} Text after empty highlight.
+
+ Text before empty highlight.
+ Text after empty highlight.
+
+%</regression:final>
+
+\end{document}
+% \end{macrocode}
+%
+%\Finale
+\endinput