Release 1.1.1

.gitignore

@@ -11,6 +11,5 @@ latexdiff.aux
 latexdiff.tex
 latexrevise.aux
 latexrevise.tex
-latexdiff-1.0.5a
 dist
-
+latexdiff-?.*.*

Makefile

@@ -1,5 +1,5 @@
 # Makefile for preparing files for distribution
-VERSION=1.1.1alpha
+VERSION=1.1.1
 
 
 .PHONY: distribution release test mkdirs clean cleanall cleantest webmanual

latexdiff

@@ -24,18 +24,18 @@
 #
 # ToDo:
 ###  
-###  - recursive processing of included files and bibliography with latexdiff-vc  
 ###  - add possibility to store configuration options for latexdiff in a file rather than as options
 ###  - use kdiff3 as a merge tool
 ###  - make style that allows (forward and backjumping with hyperref)
 ###  - --flatten option only expands first including command per line if there is more than one
 #
-# Version 1.1.1alpha
+# Version 1.1.1
 #    - patch mhchem: allow ce in equations
 #    - flatten now also expands \input etc. in the preamble (but not \usepackage!)
 #    - Better support for Japanese ( contributed by github user kshramt )
 #    - prevent duplicated verbatim hashes (patch contributed by github user therussianjig, issue #36)
 #    - disable deleted label commands (fixes issue #31)
+#    - introduce post-processing to reinstate most deleted environments and all needed item commands (fixes issue #1)
 #
 # Version 1.1.0
 #    - treat diacritics (\",\', etc) as safe commands
@@ -138,7 +138,7 @@ my ($algodiffversion)=split(/ /,$Algorithm::Diff::VERSION);
 
 
 my ($versionstring)=<<EOF ;
-This is LATEXDIFF 1.1.1alpha  (Algorithm::Diff $Algorithm::Diff::VERSION, Perl $^V)
+This is LATEXDIFF 1.1.1  (Algorithm::Diff $Algorithm::Diff::VERSION, Perl $^V)
   (c) 2004-2015 F J Tilmann
 EOF
 
@@ -517,17 +517,17 @@ if ($showtext) {
 
 if ($showconfig) {
   print "Configuration variables:\n";
-  print "MINWORDSBLOCK=$MINWORDSBLOCK\n";
+  print "ARRENV=$ARRENV\n";
+  print "COUNTERCMD=$COUNTERCMD\n";
   print "FLOATENV=$FLOATENV\n";
   print "ITEMCMD=$ITEMCMD\n";
   print "LISTENV=$LISTENV\n";
-  print "PICTUREENV=$PICTUREENV\n";
-  print "MATHENV=$MATHENV\n";
-  print "MATHREPL=$MATHREPL\n";
   print "MATHARRENV=$MATHARRENV\n";
   print "MATHARRREPL=$MATHARRREPL\n";
-  print "ARRENV=$ARRENV\n";
-  print "COUNTERCMD=$COUNTERCMD\n";
+  print "MATHENV=$MATHENV\n";
+  print "MATHREPL=$MATHREPL\n";
+  print "MINWORDSBLOCK=$MINWORDSBLOCK\n";
+  print "PICTUREENV=$PICTUREENV\n";
 }
 if ($showconfig || $showtext || $showsafe || $showpreamble) {
   exit 0; }
@@ -2938,17 +2938,17 @@ format as new.tex but has all changes relative to old.tex marked up or commented
 --config var1=val1,var2=val2,...
 -c var1=val1,..        Set configuration variables.
 -c configfile           Available variables: 
-                          MINWORDSBLOCK (integer)
+                          ARRENV (RegEx)
+                          COUNTERCMD (RegEx)
                           FLOATENV (RegEx)
                           ITEMCMD (RegEx)
                           LISTENV (RegEx)
-                          PICTUREENV (RegEx)
-                          MATHENV (RegEx)
-                          MATHREPL (String)
                           MATHARRENV (RegEx)
                           MATHARRREPL (String)
-                          ARRENV (RegEx)
-                          COUNTERCMD (RegEx)
+                          MATHENV (RegEx)
+                          MATHREPL (String)
+                          MINWORDSBLOCK (integer)
+                          PICTUREENV (RegEx)
                        This option can be repeated.
 
 
@@ -3399,27 +3399,27 @@ Set configuration variables.  The option can be repeated to set different
 variables (as an alternative to the comma-separated list).
 Available variables (see below for further explanations): 
 
-C<MINWORDSBLOCK> (integer)
+C<ARRENV> (RegEx)
+
+C<COUNTERCMD> (RegEx)
 
 C<FLOATENV> (RegEx)
 
 C<ITEMCMD> (RegEx)
 
 C<LISTENV>  (RegEx)
 
-C<PICTUREENV> (RegEx)
+C<MATHARRENV> (RegEx)
+
+C<MATHARRREPL> (String)
 
 C<MATHENV> (RegEx)
 
 C<MATHREPL> (String)
 
-C<MATHARRENV> (RegEx)
-
-C<MATHARRREPL> (String)
-
-C<ARRENV> (RegEx)
+C<MINWORDSBLOCK> (integer)
 
-C<COUNTERCMD> (RegEx)
+C<PICTUREENV> (RegEx)
 
 =item B<--show-safecmd>
 
@@ -3693,12 +3693,22 @@ Make no difference between the main text and floats.
 
 =over 10
 
-=item C<MINWORDSBLOCK>
+=item C<ARRENV>
 
-Minimum number of tokens required to form an independent block. This value is
-used in the algorithm to detect changes of complete blocks by merging identical text parts of less than C<MINWORDSBLOCK> to the preceding added and discarded parts.
+If a match to C<ARRENV> is found within an inline math environment within a deleted or added block, then the inlined math 
+is surrounded by C<\mbox{>...C<}>.  This is necessary as underlining does not work within inlined array environments.
 
-[ Default: 3 ]
+[ Default: C<ARRENV>=S<C<(?:array|[pbvBV]matrix)> >
+
+=item C<COUNTERCMD>
+
+If a command in a deleted block which is also in the textcmd list matches C<COUNTERCMD> then an
+additional command C<\addtocounter{>F<cntcmd>C<}{-1}>, where F<cntcmd> is the matching command, is appended in the diff file such that the numbering in the diff file remains synchronized with the
+numbering in the new file.
+
+[ Default: C<COUNTERCMD>=C<(?:footnote|part|section|subsection> ...
+
+C<|subsubsection|paragraph|subparagraph)>  ]
 
 =item C<FLOATENV>
 
@@ -3720,14 +3730,6 @@ Environments whose name matches the regular expression in C<LISTENV> are list en
 
 [ Default: S<C<(?:itemize|enumerate|description)> >]
 
-=item C<PICTUREENV>
-
-Within environments whose name matches the regular expression in C<PICTUREENV>
-all latexdiff markup is removed (in pathologic cases this might lead to
-inconsistent markup but this situation should be rare).
-
-[ Default: S<C<(?:picture|DIFnomarkup)[\w\d*@]*> >]
-
 =item C<MATHENV>,C<MATHREPL>
 
 If both \begin and \end for a math environment (environment name matching C<MATHENV> or \[ and \])
@@ -3742,22 +3744,20 @@ as C<MATHENV>,C<MATHREPL> but for equation arrays
 
 [ Default: C<MATHARRENV>=S<C<eqnarray\*?> >, C<MATHREPL>=S<C<eqnarray> >]
 
-=item C<ARRENV>
-
-If a match to C<ARRENV> is found within an inline math environment within a deleted or added block, then the inlined math 
-is surrounded by C<\mbox{>...C<}>.  This is necessary as underlining does not work within inlined array environments.
+=item C<MINWORDSBLOCK>
 
-[ Default: C<ARRENV>=S<C<(?:array|[pbvBV]matrix)> >
+Minimum number of tokens required to form an independent block. This value is
+used in the algorithm to detect changes of complete blocks by merging identical text parts of less than C<MINWORDSBLOCK> to the preceding added and discarded parts.
 
-=item C<COUNTERCMD>
+[ Default: 3 ]
 
-If a command in a deleted block which is also in the textcmd list matches C<COUNTERCMD> then an
-additional command C<\addtocounter{>F<cntcmd>C<}{-1}>, where F<cntcmd> is the matching command, is appended in the diff file such that the numbering in the diff file remains synchronized with the
-numbering in the new file.
+=item C<PICTUREENV>
 
-[ Default: C<COUNTERCMD>=C<(?:footnote|part|section|subsection> ...
+Within environments whose name matches the regular expression in C<PICTUREENV>
+all latexdiff markup is removed (in pathologic cases this might lead to
+inconsistent markup but this situation should be rare).
 
-C<|subsubsection|paragraph|subparagraph)>  ]
+[ Default: S<C<(?:picture|DIFnomarkup)[\w\d*@]*> >]
 
 =back
 
@@ -3802,7 +3802,7 @@ different numbers of inter-argument spaces are treated as significant.
 =back
 
 Please submit bug reports using the issue tracker of the github repository page I<https://github.com/ftilmann/latexdiff.git>, 
-or send them to I<tilmann -- AT -- gfz-potsdam.de>.  Include the serial number of I<latexdiff>
+or send them to I<tilmann -- AT -- gfz-potsdam.de>.  Include the version number of I<latexdiff>
 (from comments at the top of the source or use B<--version>).  If you come across latex
 files that are error-free and conform to the specifications set out
 above, and whose differencing still does not result in error-free
@@ -3829,7 +3829,7 @@ I<latexdiff-fast> requires the I<diff> command to be present.
 
 =head1 AUTHOR
 
-Version 1.1.1alpha
+Version 1.1.1
 Copyright (C) 2004-2015 Frederik Tilmann
 
 This program is free software; you can redistribute it and/or modify
@@ -3840,9 +3840,6 @@ T. Connors, Sebastian Gouezel and many others.
 Thanks to the many people who sent in bug reports, feature suggestions, and other feedback.
 
 =cut
-### scratch Text bits
-###(otherwise readibility is reduced because common words such as "the" and "and" which can be found both in the discarded and added block are considered to be identical text parts and thus not marked up, and added and discarded
-###text parts are interspersed between these common words).
 
 __END__
 %%BEGIN SAFE COMMANDS

latexdiff-vc

@@ -27,9 +27,11 @@
 #
 # TODO/IDEAS: - option to call external pre-processing codes
 #
-# version 1.1.1alpha:
+# version 1.1.1:
 #    - better detection of RCS system 
 #    - undocumented option --debug/--nodebug to override default setting for debug mode (Default: 0)#
+#    - bug fix: --flatten option combined with --pdf caused confusion of old and new file
+#
 # version 1.1.0:
 #
 #      - with option --flatten and version control option, checkout the whole tree into a temporary directory
@@ -58,7 +60,7 @@ use strict ;
 use warnings ;
 
 my $versionstring=<<EOF ;
-This is LATEXDIFF-VC 1.1.1alpha
+This is LATEXDIFF-VC 1.1.1
   (c) 2005-2015 F J Tilmann
 EOF
 
@@ -658,11 +660,12 @@ or higher are required.
 =head1 BUG REPORTING
 
 Please submit bug reports using the issue tracker of the github repository page I<https://github.com/ftilmann/latexdiff.git>, 
-or send them to I<tilmann -- AT -- gfz-potsdam.de>.  Include the serial number of I<latexdiff-vc>
+or send them to I<tilmann -- AT -- gfz-potsdam.de>.  Include the version number of I<latexdiff-vc>
 (option C<--version>).
 
 =head1 AUTHOR
 
+Version 1.1.1
 Copyright (C) 2005-2015 Frederik Tilmann
 
 This program is free software; you can redistribute it and/or modify

testsuite/verify

@@ -1,5 +1,5 @@
 #!/bin/csh
-set refversion=1.1.1alpha
+set refversion=1.1.1
 # for comparison with 0.5:
 #set options="-V -t UNDERLINE -s SAFE -f FLOATSAFE  --disable-citation-markup"
 set options="-V -t UNDERLINE -s SAFE -f FLOATSAFE "