Skip to content

Commit

Permalink
Prepare 1.3.4 release
Browse files Browse the repository at this point in the history
  • Loading branch information
ftilmann committed Jul 20, 2024
1 parent 33316f4 commit d63eb4d
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 13 deletions.
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Makefile for preparing files for distribution
# VERSION=1.3.3
VERSION=$(shell git describe --abbrev=4 --dirty --always --tags)
#VERSION=$(shell git describe --abbrev=4 --dirty --always --tags)
VERSION=1.3.4

.PHONY: distribution release test mkdirs clean cleanall cleantest webmanual

Expand Down
10 changes: 5 additions & 5 deletions latexdiff
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
#
# Note references to issue numbers are for the github repository of latexdiff: https://github.com/ftilmann/latexdiff
#
# Version 1.3.4a:
# Version 1.3.4:
# New features:
# - Option to use lua-ul instead of ulem (for use with LuaLaTeX) (fix #17, #60, #188, #255, #270)
# Enhancement
Expand Down Expand Up @@ -274,8 +274,8 @@ my ($algodiffversion)=split(/ /,$Algorithm::Diff::VERSION);


my ($versionstring)=<<EOF ;
This is LATEXDIFF 1.3.4a (Algorithm::Diff $Algorithm::Diff::VERSION, Perl $^V)
(c) 2004-2022 F J Tilmann
This is LATEXDIFF 1.3.4 (Algorithm::Diff $Algorithm::Diff::VERSION, Perl $^V)
(c) 2004-2024 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 @@ -5004,8 +5004,8 @@ I<latexdiff-fast> requires the I<diff> command to be present.
=head1 AUTHOR
Version 1.3.4a
Copyright (C) 2004-2022 Frederik Tilmann
Version 1.3.4
Copyright (C) 2004-2024 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
6 changes: 3 additions & 3 deletions latexdiff-vc
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
#
# TODO/IDEAS: - option to call external pre-processing codes
#
# version 1.3.4a:
# version 1.3.4:
# - Enhancement: if --flatten option is used, and no bbl file is included in the version management, then latexdiff-vc will try to run bibtex to generate the bbl file. Implements the suggestion of PR #127 (contributed by github user cousteaulecommandant )
# - Efficiency boost: use -draftmode for non-interactive preliminary runs of latex (idea from #
# - bug fix: minor fix for --only-changed that makes detection of changed pages more reliable [ PR #297 contributed by user nelijuc ]
Expand Down Expand Up @@ -85,7 +85,7 @@ use strict ;
use warnings ;

my $versionstring=<<EOF ;
This is LATEXDIFF-VC 1.3.4a
This is LATEXDIFF-VC 1.3.4x
(c) 2005-2024 F J Tilmann
EOF

Expand Down Expand Up @@ -808,7 +808,7 @@ complete directory hierarchy. Optionally, a pathname F<path> can be specified,
=item B<--flatten,--flatten=keep-intermediate>
If combined with C<--git>, C<--svn> or C<--hg> option or the corresponding modes, check out the revisions to compare in a separate temporary directory, and then pass on option C<--flatten> to latexdiff. The directory in which C<latexdiff-vc> is invoked defines the subtree which will be checked out.
Note that if additional files are needed which are not included in the flatten procedure (package files, included graphics), they need to be accessible in the current directory. If you use bibtex, it is recommended to include the C<.bbl> file in the version management. From latexdiff-vc >=1.3.4 there will be an attempt to create the C<.bbl> file by running bibtex in the retrieved subdirectories; note that the bibtex is run in the temporary subdirectories so any .bib or .bst files either need to be under version management, or in the global search paths for bibtex (shell environment variables C<BIBINPUTS> and C<BSTINPUTS>).
Note that if additional files are needed which are not included in the flatten procedure (package files, included graphics), they need to be accessible in the current directory. If you use bibtex, it is recommended to include the C<.bbl> file in the version management. From latexdiff-vc >=1.3.4 there is an attempt to create the C<.bbl> file by running bibtex in the retrieved subdirectories; note that the bibtex is run in the temporary subdirectories so any .bib or .bst files either need to be under version management, or in the global search paths for bibtex (shell environment variables C<BIBINPUTS> and C<BSTINPUTS>).
The generic usage of this function is : C<latexdiff-vc --flatten -r rev1 [-r rev2] master.tex> where master.tex is the project file containing the highest level of includes etc.
Expand Down
10 changes: 7 additions & 3 deletions testsuite/verify-style
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ set sample = example
# NOT including -t option
set options="-V -s SAFE -f FLOATSAFE"

set pdftypes=( UNDERLINE CTRADITIONAL TRADITIONAL CFONT FONTSTRIKE INVISIBLE BOLD PDFCOMMENT CCHANGEBAR CFONTCHBAR CULINECHBAR CHANGEBAR)
set pdftypes=( UNDERLINE CTRADITIONAL TRADITIONAL CFONT FONTSTRIKE INVISIBLE BOLD PDFCOMMENT CCHANGEBAR CFONTCHBAR CULINECHBAR CHANGEBAR LUAUNDERLINE )
set dvitypes=( )

#set pdftypes=( UNDERLINE PDFCOMMENT )
Expand All @@ -18,7 +18,11 @@ foreach type ( $pdftypes )
echo "========================================="
echo "Differencing ${sample}-old.tex ${sample}-new.tex with type $type"
latexdiff $options -t$type ${sample}-old.tex ${sample}-new.tex > ${sample}-diff-t$type.tex
pdflatex --interaction=batchmode ${sample}-diff-t$type.tex
if ( $type =~ LUA* ) then
lualatex --interaction=batchmode ${sample}-diff-t$type.tex
else
pdflatex --interaction=batchmode ${sample}-diff-t$type.tex
endif
if ($status || ! -e ${sample}-diff-t$type.pdf ) then
echo "Compilation of ${sample}-diff-t$type.tex did not complete as expected."
set failed=($failed ${sample}-diff-t$type.tex)
Expand All @@ -43,7 +47,7 @@ end


foreach out ( $pdfout )
echo "acroread $out"
echo "okular $out"
end
foreach out ( $psout )
echo "gv $out"
Expand Down

0 comments on commit d63eb4d

Please sign in to comment.