Skip to content

Commit

Permalink
Preparation for release 1.3.0
Browse files Browse the repository at this point in the history
  • Loading branch information
ftilmann committed Oct 7, 2018
1 parent 96249e3 commit 1a3ca7c
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 13 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Makefile for preparing files for distribution
VERSION=1.2.2a
VERSION=1.3.0


.PHONY: distribution release test mkdirs clean cleanall cleantest webmanual
Expand Down
12 changes: 6 additions & 6 deletions latexdiff
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
### - move --show-xxx options so that they are also capable of showing preamble (and commands) after all modificationsbased on source file packages
### - change meaning of --packages option such that this packages are used in addition of automatically detected packages (possibly introduce option --only-packages that overrides automatic choices completely

# Version 1.2.2a:
# Version 1.3.0 (7 October 2018):
# - treat options to \documentclass as potential package names (some packages allow implicit loading of or imply selected packages
# - improved pattern matching: now allows nested angular brackets, and is no longer confused by escaped curly braces
# - improved pattern matching in COARSE mode: occasionally, the closing bracket or some other elements would be matched in an 'unnatural' way due to another sequence being more minimal in the computational sense, sometimes even causing errors due to tokens moving in or out of the scope of math environments. This is now discouraged by adding internal \DIFANCHOR commands (which are removed again in post-processing) (fixes issues reported via email by li_ruomeng .
Expand Down Expand Up @@ -186,8 +186,8 @@ my ($algodiffversion)=split(/ /,$Algorithm::Diff::VERSION);


my ($versionstring)=<<EOF ;
This is LATEXDIFF 1.2.2a (Algorithm::Diff $Algorithm::Diff::VERSION, Perl $^V)
(c) 2004-2017 F J Tilmann
This is LATEXDIFF 1.3.0 (Algorithm::Diff $Algorithm::Diff::VERSION, Perl $^V)
(c) 2004-2018 F J Tilmann
EOF

# Hash with defaults for configuration variables. These marked undef have default values constructed from list defined in the DATA block
Expand Down Expand Up @@ -3081,7 +3081,7 @@ sub postprocess {
# Interior of deleted verbatim environment should consist entirely of delete DIFVRB comments, i.e. match only lines beginning with % DIF < DIFVRB
# Captures: $4: all lines combined
((?:\%\Q$DELCOMMENT$VERBCOMMENT\E[^\n]*?\n)*)
# Deleted \end command of verbatim environment. Note that the type is forced to match the opening. Captures: $5: Whole deleted environment
# Deleted \end command of verbatim environment. Note that the type is forced to match the opening. Captures: $5: Whole deleted environment (previous way this line was written: (\Q$DELCMDOPEN\E\\end\{\2\}(?:\n|\s|\Q$DELCMDOPEN\E)*\Q$DELCMDCLOSE\E)
(\Q$DELCMDOPEN\E\\end\{\2\})
/ # Substitution part
$1 # Leave expression as is
Expand Down Expand Up @@ -4628,8 +4628,8 @@ I<latexdiff-fast> requires the I<diff> command to be present.
=head1 AUTHOR
Version 1.2.2a
Copyright (C) 2004-2017 Frederik Tilmann
Version 1.3.0
Copyright (C) 2004-2018 Frederik Tilmann
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License Version 3
Expand Down
12 changes: 7 additions & 5 deletions latexdiff-vc
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,9 @@
#
# TODO/IDEAS: - option to call external pre-processing codes
# - choose type of latex processor / bibtex (luatex, xelatex etc)
# version 1.2.2a
# - option only-changes with hyperref will suppress hyperrefs (pull request jprotze_
# version 1.3.0 ((7 October 2018)
# - option --only-changes with hyperref will suppress hyperrefs (pull request jprotze)_
# - option --only-changes now moves (rather than copies) file with only changes
# version 1.2.1 (22 June 2017):
# - update: use qpdf (instead of pdftk) to select particular pages of output (pull request #102 submited by Tom Scogland via github). This was necessary because pdftk is being deprecated. pdftk is still used as a fall-back
# - bug fix: --hg option was not recognised (partially fixes github issue #93 )
Expand Down Expand Up @@ -71,8 +72,8 @@ use strict ;
use warnings ;

my $versionstring=<<EOF ;
This is LATEXDIFF-VC 1.2.1
(c) 2005-2017 F J Tilmann
This is LATEXDIFF-VC 1.3.0
(c) 2005-2018 F J Tilmann
EOF

# output debug and intermediate files, set to 0 in final distribution
Expand Down Expand Up @@ -238,6 +239,7 @@ if ( defined($dir) && ( -f $dir || $dir =~ /^-/ ) ) {
$dir="";
}
# check whether the first file name or first passed-through option for latexdiff got misinterpreted as an option to an empty --flatten option

if ( defined($flatten) && ( -f $flatten || $flatten =~ /^-/ ) ) {
unshift @ARGV,$flatten;
$flatten="";
Expand Down Expand Up @@ -565,7 +567,7 @@ foreach $diff ( @difffiles ) {
print "Executing ".$command;
system($command) == 0
or die("could not execute <".$command."> to strip pages. Return code: $?");
copy("$diffbase-changedpage.pdf","$diffbase.pdf");
move("$diffbase-changedpage.pdf","$diffbase.pdf");
}
push @ptmpfiles, "$diffbase.aux","$diffbase.log";
}
Expand Down
2 changes: 1 addition & 1 deletion testsuite/verify
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/tcsh
set refversion=1.2.2a
set refversion=1.3.0
#set refversion=1.1.0
# for comparison with 0.5:
#set options="-V -t UNDERLINE -s SAFE -f FLOATSAFE --disable-citation-markup"
Expand Down

0 comments on commit 1a3ca7c

Please sign in to comment.