latexdiff (28may20)

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

6 files changed, 28 insertions, 21 deletions

diff --git a/Master/texmf-dist/doc/man/man1/latexdiff-vc.1 b/Master/texmf-dist/doc/man/man1/latexdiff-vc.1
index b4a00e943ed..c8340e71042 100644
--- a/Master/texmf-dist/doc/man/man1/latexdiff-vc.1
+++ b/Master/texmf-dist/doc/man/man1/latexdiff-vc.1
@@ -133,7 +133,7 @@
 .\" ========================================================================
 .\"
 .IX Title "LATEXDIFF-VC 1"
-.TH LATEXDIFF-VC 1 "2018-10-07" "perl v5.22.1" " "
+.TH LATEXDIFF-VC 1 "2020-05-27" "perl v5.22.1" " "
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
@@ -175,7 +175,7 @@ specified, and they result in different behaviour:
 .RS 4
 .IP "\fBlatexdiff-vc\fR \-r \fIfile.tex\fR ..." 4
 .IX Item "latexdiff-vc -r file.tex ..."
-compares \fIfile.tex\fR with the most recent version checked into \s-1RCS.\s0
+compares \fIfile.tex\fR with the most recently checked-in version checked.
 .IP "\fBlatexdiff-vc\fR \-r \fIrev1\fR \fIfile.tex\fR ..." 4
 .IX Item "latexdiff-vc -r rev1 file.tex ..."
 compares \fIfile.tex\fR with revision \fIrev1\fR.
@@ -184,7 +184,7 @@ compares \fIfile.tex\fR with revision \fIrev1\fR.
 compares revisions \fIrev1\fR and \fIrev2\fR of \fIfile.tex\fR.
 .Sp
 Multiple files can be specified for all of the above options. All files must have the
-extension \f(CW\*(C`.tex\*(C'\fR, though.
+extensions \f(CW\*(C`.tex\*(C'\fR, \f(CW\*(C`.bbl\*(C'\fR, or \f(CW\*(C`.flt\*(C'\fR, though.
 .IP "\fBlatexdiff-vc\fR  \fIold.tex\fR \fInew.tex\fR" 4
 .IX Item "latexdiff-vc old.tex new.tex"
 compares two files.
@@ -199,7 +199,7 @@ reported to stdout.
 Rather than appending the string \f(CW\*(C`diff\*(C'\fR and optionally the version
 numbers given to the output-file, this will prepend a directory name \f(CW\*(C`diff\*(C'\fR 
 to the
-original filename, creating the directory and subdirectories should they not exist already.  This is particularly useful in order to clone a
+original filename, creating the directory and sub-directories should they not exist already.  This is particularly useful in order to clone a
 complete directory hierarchy.  Optionally, a pathname \fIpath\fR can be specified, which is prepended instead of \f(CW\*(C`diff\*(C'\fR.
 .IP "\fB\-\-flatten,\-\-flatten=keep\-intermediate\fR" 4
 .IX Item "--flatten,--flatten=keep-intermediate"
@@ -209,12 +209,8 @@ Note that if additional files are needed which are not included in the flatten p
 The generic usage of this function is : \f(CW\*(C`latexdiff\-vc \-\-flatten \-r rev1 [\-r rev2] master.tex\*(C'\fR where master.tex is the project file containing the highest level of includes etc.
 .Sp
 With \f(CW\*(C`\-\-flatten=keep\-intermediate\*(C'\fR, the intermediate revision snapshots are kept in the current directory (Default is to store them in a temporary directory and delete them after generating the diff file.)
-.IP "\fB\-\-config var1=val1,var2=val2,...\fR or \fB\-c var1=val1,..\fR" 4
-.IX Item "--config var1=val1,var2=val2,... or -c var1=val1,.."
-.PD 0
 .IP "\fB\-\-only\-changes\fR" 4
 .IX Item "--only-changes"
-.PD
 Post-process the output such that only pages with changes on them are displayed. This requires the use of subtype \s-1ZLABEL \s0
 in latexdiff, which will be set automatically, but any manually set \-s option will be overruled (also requires zref package to 
 be installed). (note that this option must be combined with \-\-ps or \-\-pdf to make sense)
@@ -229,8 +225,8 @@ run latex command on diff file after generation of diff file.
 .IP "\fB\-\-dvi\fR" 4
 .IX Item "--dvi"
 run latex and dvixxx commands after generation of diff file.
-.IP "\fB\-c configfile\fR" 4
-.IX Item "-c configfile"
+.IP "\fB\-c configfile\fR =item \fB\-\-config var1=val1,var2=val2,...\fR or \fB\-c var1=val1,..\fR" 4
+.IX Item "-c configfile =item --config var1=val1,var2=val2,... or -c var1=val1,.."
 Set configuration variables for latexdiff and latexdiff-vc.  The option can be repeated to set different
 variables (as an alternative to the comma-separated list).
 Available variables for latexdiff-vc:
@@ -252,7 +248,7 @@ Available variables for latexdiff-vc:
 .RS 4
 .PD
 .Sp
-All other config variables are passed to latexdiff. Explicity set configuration changes always override implicit
+All other config variables are passed to latexdiff. Explicitly set configuration changes always override implicit
 changes by the following shortcut options \fB\-\-fast\fR, \fB\-\-so\fR, \fB\-\-ps\fR and \fB\-\-pdf\fR.
 .RE
 .IP "\fB\-\-fast\fR or \fB\-\-so\fR" 4
@@ -290,7 +286,7 @@ latexdiff
 .SH "PORTABILITY"
 .IX Header "PORTABILITY"
 \&\fIlatexdiff-vc\fR uses external commands and is therefore dependent on the system architecture; it has been
-tested mainly on Unix-like systems. It also requires the a version control
+tested mainly on Unix-like systems. It also requires a version control
 system and latex to be installed on the system to make use of all features.  Modules from Perl 5.8
 or higher are required.
 .SH "BUG REPORTING"
diff --git a/Master/texmf-dist/doc/man/man1/latexdiff-vc.man1.pdf b/Master/texmf-dist/doc/man/man1/latexdiff-vc.man1.pdf
index 65d92ea9bec..8e39d963772 100644
--- a/Master/texmf-dist/doc/man/man1/latexdiff-vc.man1.pdf
+++ b/Master/texmf-dist/doc/man/man1/latexdiff-vc.man1.pdf
diff --git a/Master/texmf-dist/doc/man/man1/latexdiff.1 b/Master/texmf-dist/doc/man/man1/latexdiff.1
index f48444e3074..f624ca652d2 100644
--- a/Master/texmf-dist/doc/man/man1/latexdiff.1
+++ b/Master/texmf-dist/doc/man/man1/latexdiff.1
@@ -133,7 +133,7 @@
 .\" ========================================================================
 .\"
 .IX Title "LATEXDIFF 1"
-.TH LATEXDIFF 1 "2018-10-07" "perl v5.22.1" " "
+.TH LATEXDIFF 1 "2020-05-26" "perl v5.22.1" " "
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
@@ -343,9 +343,9 @@ Change name of \f(CW\*(C`\eDIFadd\*(C'\fR and \f(CW\*(C`\eDIFdel\*(C'\fR command
 define new \f(CW\*(C`\eDIFadd\*(C'\fR and \f(CW\*(C`\eDIFdel\*(C'\fR commands, which provide a wrapper for these commands,
 using them for the text but not for the link defining command (where any markup would cause
 errors).
-.ie n .IP """apacite""" 8
-.el .IP "\f(CWapacite\fR" 8
-.IX Item "apacite"
+.ie n .IP """apacite"", ""biblatex""" 8
+.el .IP "\f(CWapacite\fR, \f(CWbiblatex\fR" 8
+.IX Item "apacite, biblatex"
 Redefine the commands recognised as citation commands.
 .ie n .IP """siunitx""" 8
 .el .IP "\f(CWsiunitx\fR" 8
@@ -621,11 +621,21 @@ included sections are not expanded.  The included files are assumed to
  be located in the same directories as the old and new master files,
 respectively, making it possible to organise files into old and new directories. 
 \&\-\-flatten is applied recursively, so inputted files can contain further
-\&\f(CW\*(C`\einput\*(C'\fR statements.
+\&\f(CW\*(C`\einput\*(C'\fR statements.  Also handles files included by the import package
+(\f(CW\*(C`\eimport\*(C'\fR and \f(CW\*(C`\esubimport\*(C'\fR), and \f(CW\*(C`\esubfile\*(C'\fR command.
 .Sp
 Use of this option might result in prohibitive processing times for
 larger documents, and the resulting difference document
 no longer reflects the structure of the input documents.
+.IP "\fB\-\-filter\-script=filterscript\fR" 4
+.IX Item "--filter-script=filterscript"
+Run files through this filterscript (full path preferred) before processing.
+The filterscript must take \s-1STDIN\s0 input and output to \s-1STDOUT.\s0
+When coupled with \-\-flatten, each file will be run through the filter as it is brought in.
+.IP "\fB\-\-ignore\-filter\-stderr\fR" 4
+.IX Item "--ignore-filter-stderr"
+When running with \-\-filter\-script, \s-1STDERR\s0 from the script may cause readability issues.
+Turn this flag on to ignore \s-1STDERR\s0 from the filter script.
 .IP "\fB\-\-help\fR or \fB\-h\fR" 4
 .IX Item "--help or -h"
 Show help text
diff --git a/Master/texmf-dist/doc/man/man1/latexdiff.man1.pdf b/Master/texmf-dist/doc/man/man1/latexdiff.man1.pdf
index 93c8dfd23e2..007cb1ddbff 100644
--- a/Master/texmf-dist/doc/man/man1/latexdiff.man1.pdf
+++ b/Master/texmf-dist/doc/man/man1/latexdiff.man1.pdf
diff --git a/Master/texmf-dist/doc/man/man1/latexrevise.1 b/Master/texmf-dist/doc/man/man1/latexrevise.1
index 49c8c35471b..234addcce27 100644
--- a/Master/texmf-dist/doc/man/man1/latexrevise.1
+++ b/Master/texmf-dist/doc/man/man1/latexrevise.1
@@ -133,7 +133,7 @@
 .\" ========================================================================
 .\"
 .IX Title "LATEXREVISE 1"
-.TH LATEXREVISE 1 "2015-12-27" "perl v5.22.1" " "
+.TH LATEXREVISE 1 "2020-05-27" "perl v5.22.1" " "
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
@@ -187,7 +187,7 @@ options.
 .IP "\fB\-c cmd\fR or \fB\-\-comment=cmd\fR" 4
 .IX Item "-c cmd or --comment=cmd"
 Remove \f(CW\*(C`\ecmd{...}\*(C'\fR sequences.  \f(CW\*(C`cmd\*(C'\fR is supposed to mark some explicit 
-anotations which should be removed from the file before 
+annotations which should be removed from the file before 
 release.
 .IP "\fB\-e envir\fR or \fB\-\-comment\-environment=envir\fR" 4
 .IX Item "-e envir or --comment-environment=envir"
@@ -218,8 +218,9 @@ which should have been removed already.
 .SH "BUGS"
 .IX Header "BUGS"
 The current version is a beta version which has not yet been
-extensively tested, but worked fine locally.  Please submit bug reports using the issue tracker of the github repository page \fIhttps://github.com/ftilmann/latexdiff.git\fR, 
-or send them to \fItilmann \*(-- \s-1AT\s0 \*(-- gfz\-potsdam.de\fR..  Include the serial number of \fIlatexrevise\fR
+extensively tested. It has not been actively maintained so might not process output of newer versions of latexdiff entirely correctly.
+Please submit bug reports using the issue tracker of the github repository page \fIhttps://github.com/ftilmann/latexdiff.git\fR, 
+or send them to \fItilmann \*(-- \s-1AT\s0 \*(-- gfz\-potsdam.de\fR.  Include the serial number of \fIlatexrevise\fR
 (Option \-\-version).  If you come across latexdiff
 output which is not processed correctly by \fIlatexrevise\fR please include the
 problem file as well as the old and new files on which it is based,
diff --git a/Master/texmf-dist/doc/man/man1/latexrevise.man1.pdf b/Master/texmf-dist/doc/man/man1/latexrevise.man1.pdf
index 645084d0c82..5b002738906 100644
--- a/Master/texmf-dist/doc/man/man1/latexrevise.man1.pdf
+++ b/Master/texmf-dist/doc/man/man1/latexrevise.man1.pdf