texlive[55540] trunk: latexdiff (13jun20)
commits+karl at tug.org
commits+karl at tug.org
Sat Jun 13 22:59:13 CEST 2020
Revision: 55540
http://tug.org/svn/texlive?view=revision&revision=55540
Author: karl
Date: 2020-06-13 22:59:12 +0200 (Sat, 13 Jun 2020)
Log Message:
-----------
latexdiff (13jun20)
Modified Paths:
--------------
trunk/Build/source/texk/texlive/linked_scripts/latexdiff/latexdiff-vc.pl
trunk/Build/source/texk/texlive/linked_scripts/latexdiff/latexdiff.pl
trunk/Build/source/texk/texlive/linked_scripts/latexdiff/latexrevise.pl
trunk/Master/texmf-dist/doc/man/man1/latexdiff-vc.1
trunk/Master/texmf-dist/doc/man/man1/latexdiff-vc.man1.pdf
trunk/Master/texmf-dist/doc/man/man1/latexdiff.1
trunk/Master/texmf-dist/doc/man/man1/latexdiff.man1.pdf
trunk/Master/texmf-dist/doc/man/man1/latexrevise.1
trunk/Master/texmf-dist/doc/man/man1/latexrevise.man1.pdf
trunk/Master/texmf-dist/doc/support/latexdiff/doc/latexdiff-man.pdf
trunk/Master/texmf-dist/doc/support/latexdiff/latexdiff
trunk/Master/texmf-dist/doc/support/latexdiff/latexdiff-fast
trunk/Master/texmf-dist/scripts/latexdiff/latexdiff-vc.pl
trunk/Master/texmf-dist/scripts/latexdiff/latexdiff.pl
trunk/Master/texmf-dist/scripts/latexdiff/latexrevise.pl
Modified: trunk/Build/source/texk/texlive/linked_scripts/latexdiff/latexdiff-vc.pl
===================================================================
--- trunk/Build/source/texk/texlive/linked_scripts/latexdiff/latexdiff-vc.pl 2020-06-13 20:58:46 UTC (rev 55539)
+++ trunk/Build/source/texk/texlive/linked_scripts/latexdiff/latexdiff-vc.pl 2020-06-13 20:59:12 UTC (rev 55540)
@@ -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 at gfz-potsdam.de)
+# Copyright (C) 2005-20 F J Tilmann (tilmann at gfz-potsdam.de)
#
# Repository: https://github.com/ftilmann/latexdiff
# CTAN page: http://www.ctan.org/pkg/latexdiff
@@ -71,7 +71,7 @@
use warnings ;
my $versionstring=<<EOF ;
-This is LATEXDIFF-VC 1.3.1
+This is LATEXDIFF-VC 1.3.1.1
(c) 2005-2020 F J Tilmann
EOF
@@ -315,11 +315,11 @@
# 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 {
Modified: trunk/Build/source/texk/texlive/linked_scripts/latexdiff/latexdiff.pl
===================================================================
--- trunk/Build/source/texk/texlive/linked_scripts/latexdiff/latexdiff.pl 2020-06-13 20:58:46 UTC (rev 55539)
+++ trunk/Build/source/texk/texlive/linked_scripts/latexdiff/latexdiff.pl 2020-06-13 20:59:12 UTC (rev 55540)
@@ -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 at gfz-potsdam.de)
+# Copyright (C) 2004-20 F J Tilmann (tilmann at 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 ($versionstring)=<<EOF ;
-This is LATEXDIFF 1.3.1a (Algorithm::Diff $Algorithm::Diff::VERSION, Perl $^V)
- (c) 2004-2018 F J Tilmann
+This is LATEXDIFF 1.3.1.1 (Algorithm::Diff $Algorithm::Diff::VERSION, Perl $^V)
+ (c) 2004-2020 F J Tilmann
EOF
# Hash with defaults for configuration variables. These marked undef have default values constructed from list defined in the DATA block
@@ -1971,7 +1973,7 @@
} else {
# if file does not exist, do not expand include or input command (do not warn if fname contains #[0-9] as it is then likely part of a command definition
# and is not meant to be expanded directly
- print STDERR "WARNING: Could not find included file ",$fullfile,". I will continue but not expand |$inputcmd|\n" unless $fname =~ m(#[0-9])n ;
+ print STDERR "WARNING: Could not find included file ",$fullfile,". I will continue but not expand |$inputcmd|\n" unless $fname =~ m(#[0-9]) ;
$replacement = $inputcmd ; # i.e. just the original command again -> make no change file does not exist
$newpage="";
}
Modified: trunk/Build/source/texk/texlive/linked_scripts/latexdiff/latexrevise.pl
===================================================================
--- trunk/Build/source/texk/texlive/linked_scripts/latexdiff/latexrevise.pl 2020-06-13 20:58:46 UTC (rev 55539)
+++ trunk/Build/source/texk/texlive/linked_scripts/latexdiff/latexrevise.pl 2020-06-13 20:59:12 UTC (rev 55540)
@@ -32,7 +32,7 @@
use warnings;
my $versionstring=<<EOF ;
-This is LATEXREVISE 1.3.1
+This is LATEXREVISE 1.3.1.1
(c) 2005-2020 F J Tilmann
EOF
Modified: trunk/Master/texmf-dist/doc/man/man1/latexdiff-vc.1
===================================================================
--- trunk/Master/texmf-dist/doc/man/man1/latexdiff-vc.1 2020-06-13 20:58:46 UTC (rev 55539)
+++ trunk/Master/texmf-dist/doc/man/man1/latexdiff-vc.1 2020-06-13 20:59:12 UTC (rev 55540)
@@ -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
Modified: trunk/Master/texmf-dist/doc/man/man1/latexdiff-vc.man1.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/man/man1/latexdiff.1
===================================================================
--- trunk/Master/texmf-dist/doc/man/man1/latexdiff.1 2020-06-13 20:58:46 UTC (rev 55539)
+++ trunk/Master/texmf-dist/doc/man/man1/latexdiff.1 2020-06-13 20:59:12 UTC (rev 55540)
@@ -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
Modified: trunk/Master/texmf-dist/doc/man/man1/latexdiff.man1.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/man/man1/latexrevise.1
===================================================================
--- trunk/Master/texmf-dist/doc/man/man1/latexrevise.1 2020-06-13 20:58:46 UTC (rev 55539)
+++ trunk/Master/texmf-dist/doc/man/man1/latexrevise.1 2020-06-13 20:59:12 UTC (rev 55540)
@@ -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
Modified: trunk/Master/texmf-dist/doc/man/man1/latexrevise.man1.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/support/latexdiff/doc/latexdiff-man.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/support/latexdiff/latexdiff
===================================================================
--- trunk/Master/texmf-dist/doc/support/latexdiff/latexdiff 2020-06-13 20:58:46 UTC (rev 55539)
+++ trunk/Master/texmf-dist/doc/support/latexdiff/latexdiff 2020-06-13 20:59:12 UTC (rev 55540)
@@ -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 at gfz-potsdam.de)
+# Copyright (C) 2004-20 F J Tilmann (tilmann at 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 ($versionstring)=<<EOF ;
-This is LATEXDIFF 1.3.1a (Algorithm::Diff $Algorithm::Diff::VERSION, Perl $^V)
- (c) 2004-2018 F J Tilmann
+This is LATEXDIFF 1.3.1.1 (Algorithm::Diff $Algorithm::Diff::VERSION, Perl $^V)
+ (c) 2004-2020 F J Tilmann
EOF
# Hash with defaults for configuration variables. These marked undef have default values constructed from list defined in the DATA block
@@ -1514,7 +1516,7 @@
} else {
# if file does not exist, do not expand include or input command (do not warn if fname contains #[0-9] as it is then likely part of a command definition
# and is not meant to be expanded directly
- print STDERR "WARNING: Could not find included file ",$fullfile,". I will continue but not expand |$inputcmd|\n" unless $fname =~ m(#[0-9])n ;
+ print STDERR "WARNING: Could not find included file ",$fullfile,". I will continue but not expand |$inputcmd|\n" unless $fname =~ m(#[0-9]) ;
$replacement = $inputcmd ; # i.e. just the original command again -> make no change file does not exist
$newpage="";
}
Modified: trunk/Master/texmf-dist/doc/support/latexdiff/latexdiff-fast
===================================================================
--- trunk/Master/texmf-dist/doc/support/latexdiff/latexdiff-fast 2020-06-13 20:58:46 UTC (rev 55539)
+++ trunk/Master/texmf-dist/doc/support/latexdiff/latexdiff-fast 2020-06-13 20:59:12 UTC (rev 55540)
@@ -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 at gfz-potsdam.de)
+# Copyright (C) 2004-20 F J Tilmann (tilmann at 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 ($versionstring)=<<EOF ;
-This is LATEXDIFF 1.3.1a (Algorithm::Diff $Algorithm::Diff::VERSION, Perl $^V)
- (c) 2004-2018 F J Tilmann
+This is LATEXDIFF 1.3.1.1 (Algorithm::Diff $Algorithm::Diff::VERSION, Perl $^V)
+ (c) 2004-2020 F J Tilmann
EOF
# Hash with defaults for configuration variables. These marked undef have default values constructed from list defined in the DATA block
@@ -2075,7 +2077,7 @@
} else {
# if file does not exist, do not expand include or input command (do not warn if fname contains #[0-9] as it is then likely part of a command definition
# and is not meant to be expanded directly
- print STDERR "WARNING: Could not find included file ",$fullfile,". I will continue but not expand |$inputcmd|\n" unless $fname =~ m(#[0-9])n ;
+ print STDERR "WARNING: Could not find included file ",$fullfile,". I will continue but not expand |$inputcmd|\n" unless $fname =~ m(#[0-9]) ;
$replacement = $inputcmd ; # i.e. just the original command again -> make no change file does not exist
$newpage="";
}
Modified: trunk/Master/texmf-dist/scripts/latexdiff/latexdiff-vc.pl
===================================================================
--- trunk/Master/texmf-dist/scripts/latexdiff/latexdiff-vc.pl 2020-06-13 20:58:46 UTC (rev 55539)
+++ trunk/Master/texmf-dist/scripts/latexdiff/latexdiff-vc.pl 2020-06-13 20:59:12 UTC (rev 55540)
@@ -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 at gfz-potsdam.de)
+# Copyright (C) 2005-20 F J Tilmann (tilmann at gfz-potsdam.de)
#
# Repository: https://github.com/ftilmann/latexdiff
# CTAN page: http://www.ctan.org/pkg/latexdiff
@@ -71,7 +71,7 @@
use warnings ;
my $versionstring=<<EOF ;
-This is LATEXDIFF-VC 1.3.1
+This is LATEXDIFF-VC 1.3.1.1
(c) 2005-2020 F J Tilmann
EOF
@@ -315,11 +315,11 @@
# 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 {
Modified: trunk/Master/texmf-dist/scripts/latexdiff/latexdiff.pl
===================================================================
--- trunk/Master/texmf-dist/scripts/latexdiff/latexdiff.pl 2020-06-13 20:58:46 UTC (rev 55539)
+++ trunk/Master/texmf-dist/scripts/latexdiff/latexdiff.pl 2020-06-13 20:59:12 UTC (rev 55540)
@@ -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 at gfz-potsdam.de)
+# Copyright (C) 2004-20 F J Tilmann (tilmann at 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 ($versionstring)=<<EOF ;
-This is LATEXDIFF 1.3.1a (Algorithm::Diff $Algorithm::Diff::VERSION, Perl $^V)
- (c) 2004-2018 F J Tilmann
+This is LATEXDIFF 1.3.1.1 (Algorithm::Diff $Algorithm::Diff::VERSION, Perl $^V)
+ (c) 2004-2020 F J Tilmann
EOF
# Hash with defaults for configuration variables. These marked undef have default values constructed from list defined in the DATA block
@@ -1971,7 +1973,7 @@
} else {
# if file does not exist, do not expand include or input command (do not warn if fname contains #[0-9] as it is then likely part of a command definition
# and is not meant to be expanded directly
- print STDERR "WARNING: Could not find included file ",$fullfile,". I will continue but not expand |$inputcmd|\n" unless $fname =~ m(#[0-9])n ;
+ print STDERR "WARNING: Could not find included file ",$fullfile,". I will continue but not expand |$inputcmd|\n" unless $fname =~ m(#[0-9]) ;
$replacement = $inputcmd ; # i.e. just the original command again -> make no change file does not exist
$newpage="";
}
Modified: trunk/Master/texmf-dist/scripts/latexdiff/latexrevise.pl
===================================================================
--- trunk/Master/texmf-dist/scripts/latexdiff/latexrevise.pl 2020-06-13 20:58:46 UTC (rev 55539)
+++ trunk/Master/texmf-dist/scripts/latexdiff/latexrevise.pl 2020-06-13 20:59:12 UTC (rev 55540)
@@ -32,7 +32,7 @@
use warnings;
my $versionstring=<<EOF ;
-This is LATEXREVISE 1.3.1
+This is LATEXREVISE 1.3.1.1
(c) 2005-2020 F J Tilmann
EOF
More information about the tex-live-commits
mailing list.