From 856ff1f6f5b3f90f70a7026ffa5076cc55a120f5 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 28 Dec 2021 22:52:08 +0000 Subject: latexdiff (28dec21) git-svn-id: svn://tug.org/texlive/trunk@61434 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/man/man1/latexdiff-vc.1 | 17 +++++++------- .../texmf-dist/doc/man/man1/latexdiff-vc.man1.pdf | Bin 34169 -> 36424 bytes Master/texmf-dist/doc/man/man1/latexdiff.1 | 26 ++++++++++++--------- Master/texmf-dist/doc/man/man1/latexdiff.man1.pdf | Bin 68370 -> 71363 bytes Master/texmf-dist/doc/man/man1/latexrevise.1 | 19 +++++++++------ .../texmf-dist/doc/man/man1/latexrevise.man1.pdf | Bin 29416 -> 31252 bytes 6 files changed, 36 insertions(+), 26 deletions(-) (limited to 'Master/texmf-dist/doc/man') diff --git a/Master/texmf-dist/doc/man/man1/latexdiff-vc.1 b/Master/texmf-dist/doc/man/man1/latexdiff-vc.1 index 7a031cf1510..d484c79d6eb 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.28 (Pod::Simple 3.29) +.\" Automatically generated by Pod::Man 4.11 (Pod::Simple 3.35) .\" .\" Standard preamble: .\" ======================================================================== @@ -46,7 +46,7 @@ .ie \n(.g .ds Aq \(aq .el .ds Aq ' .\" -.\" If the F register is turned on, we'll generate index entries on stderr for +.\" If the F register is >0, we'll generate index entries on stderr for .\" 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. @@ -56,12 +56,12 @@ .. .nr rF 0 .if \n(.g .if rF .nr rF 1 -.if (\n(rF:(\n(.g==0)) \{ -. if \nF \{ +.if (\n(rF:(\n(.g==0)) \{\ +. if \nF \{\ . de IX . tm Index:\\$1\t\\n%\t"\\$2" .. -. if !\nF==2 \{ +. if !\nF==2 \{\ . nr % 0 . nr F 2 . \} @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "LATEXDIFF-VC 1" -.TH LATEXDIFF-VC 1 "2020-06-13" "perl v5.22.1" " " +.TH LATEXDIFF-VC 1 "2021-12-27" "perl v5.30.0" " " .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l @@ -211,9 +211,10 @@ The generic usage of this function is : \f(CW\*(C`latexdiff\-vc \-\-flatten \-r 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\-\-only\-changes\fR" 4 .IX Item "--only-changes" -Post-process the output such that only pages with changes on them are displayed. This requires the use of subtype \s-1ZLABEL \s0 +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) +be installed). This option also disables internal links (as implemented by hyperref package) and graphics markup. +(note that this option must be combined with \-\-ps or \-\-pdf to make sense) .IP "\fB\-\-force\fR" 4 .IX Item "--force" Overwrite existing diff files without asking for confirmation. Default 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 8b2faad897a..e2d31b4f25b 100644 Binary files a/Master/texmf-dist/doc/man/man1/latexdiff-vc.man1.pdf and b/Master/texmf-dist/doc/man/man1/latexdiff-vc.man1.pdf differ diff --git a/Master/texmf-dist/doc/man/man1/latexdiff.1 b/Master/texmf-dist/doc/man/man1/latexdiff.1 index 1de1d3fd852..f7df05a6b81 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.28 (Pod::Simple 3.29) +.\" Automatically generated by Pod::Man 4.11 (Pod::Simple 3.35) .\" .\" Standard preamble: .\" ======================================================================== @@ -46,7 +46,7 @@ .ie \n(.g .ds Aq \(aq .el .ds Aq ' .\" -.\" If the F register is turned on, we'll generate index entries on stderr for +.\" If the F register is >0, we'll generate index entries on stderr for .\" 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. @@ -56,12 +56,12 @@ .. .nr rF 0 .if \n(.g .if rF .nr rF 1 -.if (\n(rF:(\n(.g==0)) \{ -. if \nF \{ +.if (\n(rF:(\n(.g==0)) \{\ +. if \nF \{\ . de IX . tm Index:\\$1\t\\n%\t"\\$2" .. -. if !\nF==2 \{ +. if !\nF==2 \{\ . nr % 0 . nr F 2 . \} @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "LATEXDIFF 1" -.TH LATEXDIFF 1 "2020-06-13" "perl v5.22.1" " " +.TH LATEXDIFF 1 "2021-12-27" "perl v5.30.0" " " .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l @@ -305,7 +305,7 @@ obtained by executing If this option is used, then old.tex, new.tex are only opened once. [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" @@ -566,7 +566,11 @@ scale, and crossed out with a red diagonal cross. Use configuration variable \s-1SCALEDELGRAPHICS\s0 to set size of deleted figures. .Sp Note that changes to the optional parameters will make the figure appear as changed -to latexdiff, and this figure will thus be highlighted +to latexdiff, and this figure will thus be highlighted. +.Sp +In some circumstances \*(L"Misplaced \enoalign\*(R" error can occur if there are certain types +of changes in tables. In this case please use \f(CW\*(C`\-\-graphics\-markup=none\*(C'\fR as a +work-around. .IP "\fB\-\-disable\-citation\-markup\fR or \fB\-\-disable\-auto\-mbox\fR" 4 .IX Item "--disable-citation-markup or --disable-auto-mbox" Suppress citation markup and markup of other vulnerable commands in styles @@ -588,7 +592,7 @@ Default is to work silently. Choose driver for changebar package (only relevant for styles using changebar: \s-1CCHANGEBAR CFONTCHBAR CULINECHBAR CHANGEBAR\s0). Possible drivers are listed in changebar manual, e.g. pdftex,dvips,dvitops - [Default: dvips] + [Default: pdftex] .IP "\fB\-\-ignore\-warnings\fR" 4 .IX Item "--ignore-warnings" Suppress warnings about inconsistencies in length between input and @@ -923,8 +927,8 @@ 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.3.0 -Copyright (C) 2004\-2018 Frederik Tilmann +Version 1.3.2 +Copyright (C) 2004\-2021 Frederik Tilmann .PP This program is free software; you can redistribute it and/or modify it under the terms of the \s-1GNU\s0 General Public License Version 3 diff --git a/Master/texmf-dist/doc/man/man1/latexdiff.man1.pdf b/Master/texmf-dist/doc/man/man1/latexdiff.man1.pdf index ce609cde472..09a60992f27 100644 Binary files a/Master/texmf-dist/doc/man/man1/latexdiff.man1.pdf and b/Master/texmf-dist/doc/man/man1/latexdiff.man1.pdf differ diff --git a/Master/texmf-dist/doc/man/man1/latexrevise.1 b/Master/texmf-dist/doc/man/man1/latexrevise.1 index 5c5558a8058..a67d09564fd 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.28 (Pod::Simple 3.29) +.\" Automatically generated by Pod::Man 4.11 (Pod::Simple 3.35) .\" .\" Standard preamble: .\" ======================================================================== @@ -46,7 +46,7 @@ .ie \n(.g .ds Aq \(aq .el .ds Aq ' .\" -.\" If the F register is turned on, we'll generate index entries on stderr for +.\" If the F register is >0, we'll generate index entries on stderr for .\" 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. @@ -56,12 +56,12 @@ .. .nr rF 0 .if \n(.g .if rF .nr rF 1 -.if (\n(rF:(\n(.g==0)) \{ -. if \nF \{ +.if (\n(rF:(\n(.g==0)) \{\ +. if \nF \{\ . de IX . tm Index:\\$1\t\\n%\t"\\$2" .. -. if !\nF==2 \{ +. if !\nF==2 \{\ . nr % 0 . nr F 2 . \} @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "LATEXREVISE 1" -.TH LATEXREVISE 1 "2020-06-13" "perl v5.22.1" " " +.TH LATEXREVISE 1 "2021-12-27" "perl v5.30.0" " " .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l @@ -183,7 +183,7 @@ markup from body). .PP Note that the three mode options are mutually exclusive. If no mode option is given, \&\fIlatexrevise\fR simply removes user annotations and markup according to the following four -options. +options. These functions can be very useful outside the latexdiff context, too .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 @@ -208,6 +208,11 @@ turn \f(CW\*(C`\ecmd{abc}\*(C'\fR into \f(CW\*(C`abc\*(C'\fR. .IX Item "-n envir or --markup-environment=envir" Similarly, remove \f(CW\*(C`\ebegin{envir}\*(C'\fR and \f(CW\*(C`\eend{envir}\*(C'\fR commands but leave content of the environment in the text. +.IP "\fB\-r cmd\fR or \fB\-\-replace=cmd\fR" 4 +.IX Item "-r cmd or --replace=cmd" +For constructions \f(CW\*(C`\e\ecmd{..}{..}\*(C'\fR, remove the command, leave the +content of first argument, and delete second argument, i.e. turn +\&\f(CW\*(C`\ecmd{abc}{def}\*(C'\fR into \f(CW\*(C`abc\*(C'\fR. .IP "\fB\-V\fR or \fB\-\-verbose\fR" 4 .IX Item "-V or --verbose" Verbose output diff --git a/Master/texmf-dist/doc/man/man1/latexrevise.man1.pdf b/Master/texmf-dist/doc/man/man1/latexrevise.man1.pdf index 6ed04fc506e..b05c07dd614 100644 Binary files a/Master/texmf-dist/doc/man/man1/latexrevise.man1.pdf and b/Master/texmf-dist/doc/man/man1/latexrevise.man1.pdf differ -- cgit v1.2.3