summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/scripts/latexdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2020-06-13 20:59:12 +0000
committerKarl Berry <karl@freefriends.org>2020-06-13 20:59:12 +0000
commit969779c0e50630df6210a15dc83fb0619f2c4002 (patch)
tree903f07b478ec9b79f2805b4c48eca0f597d82281 /Master/texmf-dist/scripts/latexdiff
parent525515c8d9df4f6ece9b285a88e58f01bee94de8 (diff)
latexdiff (13jun20)
git-svn-id: svn://tug.org/texlive/trunk@55540 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/scripts/latexdiff')
-rwxr-xr-xMaster/texmf-dist/scripts/latexdiff/latexdiff-vc.pl8
-rwxr-xr-xMaster/texmf-dist/scripts/latexdiff/latexdiff.pl12
-rwxr-xr-xMaster/texmf-dist/scripts/latexdiff/latexrevise.pl2
3 files changed, 12 insertions, 10 deletions
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=<<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 @@ if ( scalar(@revs)>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)=<<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 @@ sub flatten {
} 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="";
}
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=<<EOF ;
-This is LATEXREVISE 1.3.1
+This is LATEXREVISE 1.3.1.1
(c) 2005-2020 F J Tilmann
EOF