latexdiff

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

6 files changed, 101 insertions, 94 deletions

diff --git a/Master/texmf-dist/doc/man/man1/latexdiff-vc.1 b/Master/texmf-dist/doc/man/man1/latexdiff-vc.1
index 6b8806d80bd..87341f1e358 100644
--- a/Master/texmf-dist/doc/man/man1/latexdiff-vc.1
+++ b/Master/texmf-dist/doc/man/man1/latexdiff-vc.1
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 2.25 (Pod::Simple 3.16)
+.\" Automatically generated by Pod::Man 2.27 (Pod::Simple 3.28)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -38,6 +38,8 @@
 .    ds PI \(*p
 .    ds L" ``
 .    ds R" ''
+.    ds C`
+.    ds C'
 'br\}
 .\"
 .\" Escape single quotes in literal strings from groff's Unicode transform.
@@ -48,17 +50,24 @@
 .\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index
 .\" entries marked with X<> in POD.  Of course, you'll have to process the
 .\" output yourself in some meaningful fashion.
-.ie \nF \{\
-.    de IX
-.    tm Index:\\$1\t\\n%\t"\\$2"
+.\"
+.\" Avoid warning from groff about undefined register 'F'.
+.de IX
 ..
-.    nr % 0
-.    rr F
-.\}
-.el \{\
-.    de IX
+.nr rF 0
+.if \n(.g .if rF .nr rF 1
+.if (\n(rF:(\n(.g==0)) \{
+.    if \nF \{
+.        de IX
+.        tm Index:\\$1\t\\n%\t"\\$2"
 ..
+.        if !\nF==2 \{
+.            nr % 0
+.            nr F 2
+.        \}
+.    \}
 .\}
+.rr rF
 .\"
 .\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2).
 .\" Fear.  Run.  Save yourself.  No user-serviceable parts.
@@ -124,7 +133,7 @@
 .\" ========================================================================
 .\"
 .IX Title "LATEXDIFF-VC 1"
-.TH LATEXDIFF-VC 1 "2013-06-10" "perl v5.14.2" " "
+.TH LATEXDIFF-VC 1 "2014-07-20" "perl v5.18.2" " "
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
@@ -143,7 +152,7 @@ latexdiff\-vc \- wrapper script that calls latexdiff for different versions of a
 .SH "DESCRIPTION"
 .IX Header "DESCRIPTION"
 \&\fIlatexdiff-vc\fR is a wrapper script that applies \fIlatexdiff\fR to a
-file, or multiple files under version control (\s-1CVS\s0, \s-1RCS\s0 or \s-1SVN\s0), and optionally runs the
+file, or multiple files under version control (\s-1CVS, RCS\s0 or \s-1SVN\s0), and optionally runs the
 sequence of \f(CW\*(C`latex\*(C'\fR and \f(CW\*(C`dvips\*(C'\fR or \f(CW\*(C`pdflatex\*(C'\fR commands necessary to
 produce pdf or postscript output of the difference tex file(s). It can
 also be applied to a pair of files to automatise the generation of difference
@@ -159,12 +168,12 @@ latexdiff-cvs and latexdiff-rcs are variants of latexdiff-vc which default to
 the respective versioning system. However, this default can still be overridden using the options above.
 .IP "\fB\-r\fR, \fB\-r\fR \fIrev\fR or \fB\-\-revision\fR, \fB\-\-revision=\fR\fIrev\fR" 4
 .IX Item "-r, -r rev or --revision, --revision=rev"
-Choose revision (under \s-1RCS\s0, \s-1CVS\s0, \s-1SVN\s0 or \s-1GIT\s0). One or two \fB\-r\fR options can be
+Choose revision (under \s-1RCS, CVS, SVN\s0 or \s-1GIT\s0). One or two \fB\-r\fR options can be
 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 recent version checked into \s-1RCS.\s0
 .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.
@@ -175,7 +184,7 @@ compares revisions \fIrev1\fR and \fIrev2\fR of \fIfile.tex\fR.
 Multiple files can be specified for all of the above options. All files must have the
 extension \f(CW\*(C`.tex\*(C'\fR, though.
 .IP "\fBlatexdiff-vc\fR  \fIold.tex\fR \fInew.tex\fR" 4
-.IX Item "latexdiff-vc  old.tex new.tex"
+.IX Item "latexdiff-vc old.tex new.tex"
 compares two files.
 .RE
 .RS 4
@@ -184,7 +193,7 @@ The name of the difference file is generated automatically and
 reported to stdout.
 .RE
 .IP "\fB\-d\fR or \fB\-\-dir\fR  \fB\-d\fR \fIpath\fR or \fB\-\-dir=\fR\fIpath\fR" 4
-.IX Item "-d or --dir  -d path or --dir=path"
+.IX Item "-d or --dir -d path or --dir=path"
 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
@@ -230,14 +239,11 @@ system and latex to be installed on the system.  Modules from Perl 5.8
 or higher are required.
 .SH "BUG REPORTING"
 .IX Header "BUG REPORTING"
-.Vb 6
-\& Please submit bug reports through
-\&the latexdiff project page I<http://developer.berlios.de/projects/latexdiff/> or send
-\&to I<tilmann@gfz\-potsdam.de>.  Include the serial number of I<latexdiff\-vc>
-\&(option C<\-\-version>)
+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@gfz\-potsdam.de\fR.  Include the serial number of \fIlatexdiff-vc\fR
+(option \f(CW\*(C`\-\-version\*(C'\fR)
 \&.
-\&=head1 AUTHOR
-.Ve
+=head1 \s-1AUTHOR\s0
 .PP
 Copyright (C) 2005,2012 Frederik Tilmann
 .PP
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 684f73277b8..f934e07627e 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 03007f9272b..cc7c69a5fd5 100644
--- a/Master/texmf-dist/doc/man/man1/latexdiff.1
+++ b/Master/texmf-dist/doc/man/man1/latexdiff.1
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 2.25 (Pod::Simple 3.16)
+.\" Automatically generated by Pod::Man 2.27 (Pod::Simple 3.28)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -38,6 +38,8 @@
 .    ds PI \(*p
 .    ds L" ``
 .    ds R" ''
+.    ds C`
+.    ds C'
 'br\}
 .\"
 .\" Escape single quotes in literal strings from groff's Unicode transform.
@@ -48,17 +50,24 @@
 .\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index
 .\" entries marked with X<> in POD.  Of course, you'll have to process the
 .\" output yourself in some meaningful fashion.
-.ie \nF \{\
-.    de IX
-.    tm Index:\\$1\t\\n%\t"\\$2"
+.\"
+.\" Avoid warning from groff about undefined register 'F'.
+.de IX
 ..
-.    nr % 0
-.    rr F
-.\}
-.el \{\
-.    de IX
+.nr rF 0
+.if \n(.g .if rF .nr rF 1
+.if (\n(rF:(\n(.g==0)) \{
+.    if \nF \{
+.        de IX
+.        tm Index:\\$1\t\\n%\t"\\$2"
 ..
+.        if !\nF==2 \{
+.            nr % 0
+.            nr F 2
+.        \}
+.    \}
 .\}
+.rr rF
 .\"
 .\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2).
 .\" Fear.  Run.  Save yourself.  No user-serviceable parts.
@@ -124,7 +133,7 @@
 .\" ========================================================================
 .\"
 .IX Title "LATEXDIFF 1"
-.TH LATEXDIFF 1 "2013-06-09" "perl v5.14.2" " "
+.TH LATEXDIFF 1 "2014-07-21" "perl v5.18.2" " "
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
@@ -270,7 +279,7 @@ CHANGEBAR CCHANGEBAR CULINECHBAR CFONTCBHBAR\*(C'\fR
 Add code to preamble for selected style for bracketing
 commands (e.g. to mark changes in  margin). This option defines
 \&\f(CW\*(C`\eDIFaddbegin\*(C'\fR, \f(CW\*(C`\eDIFaddend\*(C'\fR, \f(CW\*(C`\eDIFdelbegin\*(C'\fR and \f(CW\*(C`\eDIFdelend\*(C'\fR commands.
-Available styles: \f(CW\*(C`SAFE MARGINAL COLOR DVIPSCOL\*(C'\fR
+Available styles: \f(CW\*(C`SAFE MARGINAL COLOR DVIPSCOL LABEL\*(C'\fR
 .Sp
 [ Default: \f(CW\*(C`SAFE\*(C'\fR ]
 .IP "\fB\-\-floattype=markstyle\fR or \fB\-f markstyle\fR" 4
@@ -293,7 +302,7 @@ obtained by executing
 .Sp
 [Default encoding is utf8 unless the first few lines of the preamble contain
 an invocation \f(CW\*(C`\eusepackage[..]{inputenc}\*(C'\fR in which case the 
-encoding chosen by this command is asssumed. Note that \s-1ASCII\s0 (standard
+encoding chosen by this command is asssumed. Note that \s-1ASCII \s0(standard
 latex) is a subset of utf8]
 .IP "\fB\-\-preamble=file\fR or \fB\-p file\fR" 4
 .IX Item "--preamble=file or -p file"
@@ -330,6 +339,10 @@ 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"
+Redefine the commands recognised as citation commands.
 .RE
 .RS 4
 .Sp
@@ -343,7 +356,7 @@ Print generated or included preamble commands to stdout.
 .IX Subsection "Configuration"
 .ie n .IP "\fB\-\-exclude\-safecmd=exclude\-file\fR or \fB\-A exclude-file\fR or  \fB\-\-exclude\-safecmd=""cmd1,cmd2,...""\fR" 4
 .el .IP "\fB\-\-exclude\-safecmd=exclude\-file\fR or \fB\-A exclude-file\fR or  \fB\-\-exclude\-safecmd=``cmd1,cmd2,...''\fR" 4
-.IX Item "--exclude-safecmd=exclude-file or -A exclude-file or  --exclude-safecmd=cmd1,cmd2,..."
+.IX Item "--exclude-safecmd=exclude-file or -A exclude-file or --exclude-safecmd=cmd1,cmd2,..."
 .PD 0
 .IP "\fB\-\-replace\-safecmd=replace\-file\fR" 4
 .IX Item "--replace-safecmd=replace-file"
@@ -396,7 +409,7 @@ argument is shown as deleted text.
 .PD 0
 .ie n .IP "\fB\-\-append\-context2cmd=append\-file\fR or =item \fB\-\-append\-context2cmd=""cmd1,cmd2,...""\fR As corresponding commands for context1.  The only difference is that context2 commands are completely disabled in deleted sections, including their arguments." 4
 .el .IP "\fB\-\-append\-context2cmd=append\-file\fR or =item \fB\-\-append\-context2cmd=``cmd1,cmd2,...''\fR As corresponding commands for context1.  The only difference is that context2 commands are completely disabled in deleted sections, including their arguments." 4
-.IX Item "--append-context2cmd=append-file or =item --append-context2cmd=cmd1,cmd2,... As corresponding commands for context1.  The only difference is that context2 commands are completely disabled in deleted sections, including their arguments."
+.IX Item "--append-context2cmd=append-file or =item --append-context2cmd=cmd1,cmd2,... As corresponding commands for context1. The only difference is that context2 commands are completely disabled in deleted sections, including their arguments."
 .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,.."
 .IP "\fB\-c configfile\fR" 4
@@ -472,53 +485,47 @@ This mode is most suitable, if only minor changes to equations are
 expected, e.g. correction of typos.
 .IP "\fB\-\-disable\-citation\-markup\fR" 4
 .IX Item "--disable-citation-markup"
-Suppress citation markup in styles using ulem (\s-1UNDERLINE\s0, 
-\&\s-1FONTSTRIKE\s0, \s-1CULINECHBAR\s0)
+Suppress citation markup in styles using ulem (\s-1UNDERLINE, 
+FONTSTRIKE, CULINECHBAR\s0)
 .IP "\fB\-\-enable\-citation\-markup\fR" 4
 .IX Item "--enable-citation-markup"
 Protect citation commands in changed sections with \e\embox command [i.e. use default behaviour for ulem package for other packages]
 .SS "Miscellaneous"
 .IX Subsection "Miscellaneous"
-.RS 4
+.IP "\fB\-\-verbose\fR or \fB\-V\fR" 4
+.IX Item "--verbose or -V"
 Output various status information to stderr during processing.
 Default is to work silently.
-.Sp
-\&\fB\-\-driver=type\fR
-.Sp
+.IP "\fB\-\-driver=type\fR" 4
+.IX Item "--driver=type"
 Choose driver for changebar package (only relevant for styles using
-   changebar: \s-1CCHANGEBAR\s0 \s-1CFONTCHBAR\s0 \s-1CULINECHBAR\s0 \s-1CHANGEBAR\s0). Possible
+   changebar: \s-1CCHANGEBAR CFONTCHBAR CULINECHBAR CHANGEBAR\s0). Possible
 drivers are listed in changebar manual, e.g. pdftex,dvips,dvitops
   [Default: dvips]
-.Sp
-\&\fB\-\-ignore\-warnings\fR
-.Sp
+.IP "\fB\-\-ignore\-warnings\fR" 4
+.IX Item "--ignore-warnings"
 Suppress warnings about inconsistencies in length between input and
 parsed strings and missing characters.  These warning messages are
 often related to non-standard latex or latex constructions with a
 syntax unknown to \f(CW\*(C`latexdiff\*(C'\fR but the resulting difference argument
 is often fully functional anyway, particularly if the non-standard
 latex only occurs in parts of the text which have not changed.
-.Sp
-\&\fB\-\-label=label\fR or
-\&\fB\-L label\fR
-.Sp
+.IP "\fB\-\-label=label\fR or \fB\-L label\fR" 4
+.IX Item "--label=label or -L label"
 Sets the labels used to describe the old and new files.  The first use
 of this option sets the label describing the old file and the second
 use of the option sets the label for the new file, i.e. set both
 labels like this \f(CW\*(C`\-L labelold \-L labelnew\*(C'\fR.
 [Default: use the filename and modification dates for the label]
-.Sp
-\&\fB\-\-no\-label\fR
-.Sp
+.IP "\fB\-\-no\-label\fR" 4
+.IX Item "--no-label"
 Suppress inclusion of old and new file names as comment in output file
-.Sp
-\&\fB\-\-visble\-label\fR
-.Sp
+.IP "\fB\-\-visble\-label\fR" 4
+.IX Item "--visble-label"
 Include old and new filenames (or labels set with \-\-label option) as 
 visible output.
-.Sp
-\&\fB\-\-flatten\fR
-.Sp
+.IP "\fB\-\-flatten\fR" 4
+.IX Item "--flatten"
 Replace \f(CW\*(C`\einput\*(C'\fR and \f(CW\*(C`\einclude\*(C'\fR commands within body by the content
 of the files in their argument.  If \f(CW\*(C`\eincludeonly\*(C'\fR is present in the
 preamble, only those files are expanded into the document. However, 
@@ -532,16 +539,12 @@ respectively, making it possible to organise files into old and new directories.
 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.
-.Sp
-\&\fB\-\-help\fR or
-\&\fB\-h\fR
-.Sp
+.IP "\fB\-\-help\fR or \fB\-h\fR" 4
+.IX Item "--help or -h"
 Show help text
-.Sp
-\&\fB\-\-version\fR
-.Sp
+.IP "\fB\-\-version\fR" 4
+.IX Item "--version"
 Show version number
-.RE
 .SS "Predefined styles"
 .IX Subsection "Predefined styles"
 .SS "Major types"
@@ -712,9 +715,7 @@ Option allow-spaces not implemented entirely consistently. It breaks
 the rules that number and type of white space does not matter, as
 different numbers of inter-argument spaces are treated as significant.
 .PP
-Please submit bug reports on the latexdiff project page \fIhttp://latexdiff.berlios.de\fR, 
-send them to user discussion list \f(CW\*(C`latexdiff\-users@lists.berlios,de\*(C'\fR (prior subscription 
-to list required, also on project webpage)
+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@gfz\-potsdam.de\fR.  Include the serial number of \fIlatexdiff\fR
 (from comments at the top of the source or use \fB\-\-version\fR).  If you come across latex
 files that are error-free and conform to the specifications set out
@@ -739,7 +740,7 @@ version, \fIlatexdiff-so\fR, which has this package inlined, is available, too.
 \&\fIlatexdiff-fast\fR requires the \fIdiff\fR command to be present.
 .SH "AUTHOR"
 .IX Header "AUTHOR"
-Version 1.0.2
+Version 1.0.4
 Copyright (C) 2004\-2012 Frederik Tilmann
 .PP
 This program is free software; you can redistribute it and/or modify
@@ -747,12 +748,4 @@ it under the terms of the \s-1GNU\s0 General Public License Version 3
 .PP
 Contributors of fixes and additions: V. Kuhlmann, J. Paisley, N. Becker, T. Doerges, K. Huebner, 
 T. Connors, Sebastian Gouezel and many others.
-Thanks to the many people who send in bug reports, feature suggestions, and other feedback.
-.SH "POD ERRORS"
-.IX Header "POD ERRORS"
-Hey! \fBThe above document had some coding errors, which are explained below:\fR
-.IP "Around line 2956:" 4
-.IX Item "Around line 2956:"
-=over should be: '=over' or '=over positive_number'
-.Sp
-You can't have =items (as at line 2962) unless the first thing after the =over is an =item
+Thanks to the many people who sent in bug reports, feature suggestions, and other feedback.
diff --git a/Master/texmf-dist/doc/man/man1/latexdiff.man1.pdf b/Master/texmf-dist/doc/man/man1/latexdiff.man1.pdf
index 93dd4f8baf1..c19e2658272 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 8b14197241e..b39017e60fa 100644
--- a/Master/texmf-dist/doc/man/man1/latexrevise.1
+++ b/Master/texmf-dist/doc/man/man1/latexrevise.1
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 2.25 (Pod::Simple 3.16)
+.\" Automatically generated by Pod::Man 2.27 (Pod::Simple 3.28)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -38,6 +38,8 @@
 .    ds PI \(*p
 .    ds L" ``
 .    ds R" ''
+.    ds C`
+.    ds C'
 'br\}
 .\"
 .\" Escape single quotes in literal strings from groff's Unicode transform.
@@ -48,17 +50,24 @@
 .\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index
 .\" entries marked with X<> in POD.  Of course, you'll have to process the
 .\" output yourself in some meaningful fashion.
-.ie \nF \{\
-.    de IX
-.    tm Index:\\$1\t\\n%\t"\\$2"
+.\"
+.\" Avoid warning from groff about undefined register 'F'.
+.de IX
 ..
-.    nr % 0
-.    rr F
-.\}
-.el \{\
-.    de IX
+.nr rF 0
+.if \n(.g .if rF .nr rF 1
+.if (\n(rF:(\n(.g==0)) \{
+.    if \nF \{
+.        de IX
+.        tm Index:\\$1\t\\n%\t"\\$2"
 ..
+.        if !\nF==2 \{
+.            nr % 0
+.            nr F 2
+.        \}
+.    \}
 .\}
+.rr rF
 .\"
 .\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2).
 .\" Fear.  Run.  Save yourself.  No user-serviceable parts.
@@ -124,7 +133,7 @@
 .\" ========================================================================
 .\"
 .IX Title "LATEXREVISE 1"
-.TH LATEXREVISE 1 "2013-01-27" "perl v5.14.2" " "
+.TH LATEXREVISE 1 "2014-07-20" "perl v5.18.2" " "
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
@@ -209,10 +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 through
-the latexdiff project page \fIhttp://developer.berlios.de/projects/latexdiff/\fR or send
-to \fItilmann@gfz\-potsdam.de\fR.  Include the serial number of \fIlatexrevise\fR
-(from comments at the top of the source).  If you come across latexdiff
+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@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,
 ideally edited to only contain the offending passage as long as that still
diff --git a/Master/texmf-dist/doc/man/man1/latexrevise.man1.pdf b/Master/texmf-dist/doc/man/man1/latexrevise.man1.pdf
index 4fe9c927fd9..1a569f1dc7c 100644
--- a/Master/texmf-dist/doc/man/man1/latexrevise.man1.pdf
+++ b/Master/texmf-dist/doc/man/man1/latexrevise.man1.pdf