From 969779c0e50630df6210a15dc83fb0619f2c4002 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 13 Jun 2020 20:59:12 +0000 Subject: latexdiff (13jun20) git-svn-id: svn://tug.org/texlive/trunk@55540 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/man/man1/latexdiff-vc.1 | 2 +- .../texmf-dist/doc/man/man1/latexdiff-vc.man1.pdf | Bin 34060 -> 34169 bytes Master/texmf-dist/doc/man/man1/latexdiff.1 | 2 +- Master/texmf-dist/doc/man/man1/latexdiff.man1.pdf | Bin 68379 -> 68370 bytes Master/texmf-dist/doc/man/man1/latexrevise.1 | 2 +- .../texmf-dist/doc/man/man1/latexrevise.man1.pdf | Bin 29354 -> 29416 bytes .../doc/support/latexdiff/doc/latexdiff-man.pdf | Bin 282069 -> 282140 bytes Master/texmf-dist/doc/support/latexdiff/latexdiff | 12 +++++++----- .../doc/support/latexdiff/latexdiff-fast | 12 +++++++----- .../texmf-dist/scripts/latexdiff/latexdiff-vc.pl | 8 ++++---- Master/texmf-dist/scripts/latexdiff/latexdiff.pl | 12 +++++++----- Master/texmf-dist/scripts/latexdiff/latexrevise.pl | 2 +- 12 files changed, 29 insertions(+), 23 deletions(-) (limited to 'Master/texmf-dist') diff --git a/Master/texmf-dist/doc/man/man1/latexdiff-vc.1 b/Master/texmf-dist/doc/man/man1/latexdiff-vc.1 index c8340e71042..7a031cf1510 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 "2020-05-27" "perl v5.22.1" " " +.TH LATEXDIFF-VC 1 "2020-06-13" "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 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 8e39d963772..8b2faad897a 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 f624ca652d2..1de1d3fd852 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 "2020-05-26" "perl v5.22.1" " " +.TH LATEXDIFF 1 "2020-06-13" "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 diff --git a/Master/texmf-dist/doc/man/man1/latexdiff.man1.pdf b/Master/texmf-dist/doc/man/man1/latexdiff.man1.pdf index 007cb1ddbff..ce609cde472 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 234addcce27..5c5558a8058 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 "2020-05-27" "perl v5.22.1" " " +.TH LATEXREVISE 1 "2020-06-13" "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 diff --git a/Master/texmf-dist/doc/man/man1/latexrevise.man1.pdf b/Master/texmf-dist/doc/man/man1/latexrevise.man1.pdf index 5b002738906..6ed04fc506e 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 diff --git a/Master/texmf-dist/doc/support/latexdiff/doc/latexdiff-man.pdf b/Master/texmf-dist/doc/support/latexdiff/doc/latexdiff-man.pdf index d5a97b67cd3..ebf545df919 100644 Binary files a/Master/texmf-dist/doc/support/latexdiff/doc/latexdiff-man.pdf and b/Master/texmf-dist/doc/support/latexdiff/doc/latexdiff-man.pdf differ diff --git a/Master/texmf-dist/doc/support/latexdiff/latexdiff b/Master/texmf-dist/doc/support/latexdiff/latexdiff index b8fde01b78a..9c2f45e957e 100755 --- a/Master/texmf-dist/doc/support/latexdiff/latexdiff +++ b/Master/texmf-dist/doc/support/latexdiff/latexdiff @@ -3,7 +3,7 @@ # latexdiff - differences two latex files on the word level # and produces a latex file with the differences marked up. # -# Copyright (C) 2004-16 F J Tilmann (tilmann@gfz-potsdam.de) +# Copyright (C) 2004-20 F J Tilmann (tilmann@gfz-potsdam.de) # # Repository/issue tracker: https://github.com/ftilmann/latexdiff # CTAN page: http://www.ctan.org/pkg/latexdiff @@ -23,7 +23,9 @@ # Detailed usage information at the end of the file # - +# Version 1.3.1.1 +# - remove spurious \n to fix error: Unknown regexp modifier "/n" at .../latexdiff line 1974, near "=~ " (see github issue #201) +# # Version 1.3.1 # Bug fixes: # - remove some uninitialised variable $2 warnings in string substitution in flatten function in case included file is not found @@ -201,8 +203,8 @@ my ($algodiffversion)=split(/ /,$Algorithm::Diff::VERSION); my ($versionstring)=< make no change file does not exist $newpage=""; } diff --git a/Master/texmf-dist/doc/support/latexdiff/latexdiff-fast b/Master/texmf-dist/doc/support/latexdiff/latexdiff-fast index a6a7d9164d5..ec3f618daba 100755 --- a/Master/texmf-dist/doc/support/latexdiff/latexdiff-fast +++ b/Master/texmf-dist/doc/support/latexdiff/latexdiff-fast @@ -3,7 +3,7 @@ # latexdiff - differences two latex files on the word level # and produces a latex file with the differences marked up. # -# Copyright (C) 2004-16 F J Tilmann (tilmann@gfz-potsdam.de) +# Copyright (C) 2004-20 F J Tilmann (tilmann@gfz-potsdam.de) # # Repository/issue tracker: https://github.com/ftilmann/latexdiff # CTAN page: http://www.ctan.org/pkg/latexdiff @@ -23,7 +23,9 @@ # Detailed usage information at the end of the file # - +# Version 1.3.1.1 +# - remove spurious \n to fix error: Unknown regexp modifier "/n" at .../latexdiff line 1974, near "=~ " (see github issue #201) +# # Version 1.3.1 # Bug fixes: # - remove some uninitialised variable $2 warnings in string substitution in flatten function in case included file is not found @@ -762,8 +764,8 @@ my ($algodiffversion)=split(/ /,$Algorithm::Diff::VERSION); my ($versionstring)=< make no change file does not exist $newpage=""; } diff --git a/Master/texmf-dist/scripts/latexdiff/latexdiff-vc.pl b/Master/texmf-dist/scripts/latexdiff/latexdiff-vc.pl index 9843238c457..b50a52722ff 100755 --- a/Master/texmf-dist/scripts/latexdiff/latexdiff-vc.pl +++ b/Master/texmf-dist/scripts/latexdiff/latexdiff-vc.pl @@ -3,7 +3,7 @@ # latexdiff-vc - wrapper script for applying latexdiff to rcs managed files # and for automatised creation of postscript or pdf from difference file # -# Copyright (C) 2005-16 F J Tilmann (tilmann@gfz-potsdam.de) +# Copyright (C) 2005-20 F J Tilmann (tilmann@gfz-potsdam.de) # # Repository: https://github.com/ftilmann/latexdiff # CTAN page: http://www.ctan.org/pkg/latexdiff @@ -71,7 +71,7 @@ use strict ; use warnings ; my $versionstring=<0 ) { # make file list (last arguments), initial arguments have to be passed to latexdiff # We assume an argument is a valid file rather than a latexdiff argument -# if it has extension .tex, .bbl or .flt (output of flatex) +# if it has extension .tex, .bbl or .flt (output of flatex), and does not start with a - or -- @files=($file2); while( $file1=pop @ARGV ) { - if ( $file1 =~ /\.(tex|bbl|flt)$/ ) { + if ( $file1 =~ /\.(tex|bbl|flt)$/ && $file1 !~ /^-/) { # $file1 looks like a valid file name and is prepended to file list unshift @files, $file1 ; } else { diff --git a/Master/texmf-dist/scripts/latexdiff/latexdiff.pl b/Master/texmf-dist/scripts/latexdiff/latexdiff.pl index 81387135c58..45e5188bcc7 100755 --- a/Master/texmf-dist/scripts/latexdiff/latexdiff.pl +++ b/Master/texmf-dist/scripts/latexdiff/latexdiff.pl @@ -3,7 +3,7 @@ # latexdiff - differences two latex files on the word level # and produces a latex file with the differences marked up. # -# Copyright (C) 2004-16 F J Tilmann (tilmann@gfz-potsdam.de) +# Copyright (C) 2004-20 F J Tilmann (tilmann@gfz-potsdam.de) # # Repository/issue tracker: https://github.com/ftilmann/latexdiff # CTAN page: http://www.ctan.org/pkg/latexdiff @@ -23,7 +23,9 @@ # Detailed usage information at the end of the file # - +# Version 1.3.1.1 +# - remove spurious \n to fix error: Unknown regexp modifier "/n" at .../latexdiff line 1974, near "=~ " (see github issue #201) +# # Version 1.3.1 # Bug fixes: # - remove some uninitialised variable $2 warnings in string substitution in flatten function in case included file is not found @@ -658,8 +660,8 @@ my ($algodiffversion)=split(/ /,$Algorithm::Diff::VERSION); my ($versionstring)=< make no change file does not exist $newpage=""; } diff --git a/Master/texmf-dist/scripts/latexdiff/latexrevise.pl b/Master/texmf-dist/scripts/latexdiff/latexrevise.pl index f7f88f1b951..2d809fb156d 100755 --- a/Master/texmf-dist/scripts/latexdiff/latexrevise.pl +++ b/Master/texmf-dist/scripts/latexdiff/latexrevise.pl @@ -32,7 +32,7 @@ use strict; use warnings; my $versionstring=<