latexdiff-1.0.2/0000755000076400007640000000000012063451231013353 5ustar tilmanntilmannlatexdiff-1.0.2/latexdiff-vc0000755000076400007640000003542212063450736015674 0ustar tilmanntilmann#!/usr/bin/env perl # # 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-12 F J Tilmann (tilmann@gfz-potsdam.de, ftilmann@users.berlios.de) # # Project webpages: http://latexdiff.berlios.de/ # CTAN page: http://www.ctan.org/tex-archive/support/latexdiff # # # Contributors: S Utcke, H Bruyninckx # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation, either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # You should have received a copy of the GNU General Public License # along with this program. If not, see . # # Detailed usage information at the end of the file # # version 1.0.2: - option --so to use latexdiff-so # version 1.0.1 (change version numbering to match that of latexdiff) # - Option --fast to use latexdiff-fast, # - git support (thanks to Bjørn Magnus Mathisen, Santi Béjar, Pietro Battiston and Stefan Alfredson for patches) - UNTESTED # version 0.25: # - bbl is allowed as alternative extension (instead of .tex) # version 0.26a # - Bug fix: it copes now correctly with the possibility that there are no changes between current # and archived version use Getopt::Long ; use Pod::Usage qw/pod2usage/ ; use File::Temp qw/tempdir/ ; use File::Basename qw/dirname/; use strict ; use warnings ; my $versionstring=< 1); # Variables my ($file1,$file2,$diff,$diffbase,$answer,$options,$infile,$append,$dirname,$cwd); my (@files,@ldoptions,@tmpfiles,@ptmpfiles,@difffiles); # , Getopt::Long::Configure('pass_through','bundling'); GetOptions('revision|r:s' => \@revs, 'cvs' => \$cvs, 'rcs' => \$rcs, 'svn' => \$svn, 'git' => \$git, 'dir|d:s' => \$dir, 'fast' => \$fast, 'so' => \$so, 'postscript|ps' => \$postscript, 'pdf' => \$pdf, 'force' => \$force, 'version' => \$version, 'help|h' => \$help); if ( $help ) { pod2usage(1) ; } if ( $version ) { die $versionstring ; } if ( $so ) { $latexdiff='latexdiff-so'; } if ( $fast ) { die "Cannot specify more than one of --fast or --so " if ($so); $latexdiff='latexdiff-fast'; } if ( $cvs ) { $vc="CVS"; } if ( $rcs ) { die "Cannot specify more than one of --cvs, --rcs --svn or --git." if ($vc); $vc="RCS"; } if ( $svn ) { die "Cannot specify more than one of --cvs, --rcs --svn or --git." if ($vc); $vc="SVN"; } if ( $git ) { die "Cannot specify more than one of --cvs, --rcs, --svn or --git." if ($vc); $vc="GIT"; } # check whether the first file name or first passed-through option for latexdiff got misinterpreted as an option to an empty -r option if ( @revs && ( -f $revs[$#revs] || $revs[$#revs] =~ /^-/ ) ) { unshift @ARGV,$revs[$#revs]; $revs[$#revs]=""; } # check whether the first file name or first passed-through option for latexdiff got misinterpreted as an option to an empty -d option if ( defined($dir) && ( -f $dir || $dir =~ /^-/ ) ) { unshift @ARGV,$dir; $dir=""; } #print "DEBUG: latexdiff-vc command line: ", join(" ",@ARGV), "\n"; $file2=pop @ARGV; ( defined($file2) && $file2 =~ /\.(tex|bbl)$/ ) or pod2usage("Must specify at least one tex or bbl file"); if (! $vc && scalar(@revs)>0 ) { # have to guess $vc # check whether we have a special name if ( $0 =~ /-cvs$/ ) { $vc="CVS"; } elsif ( $0 =~ /-rcs$/ ) { $vc="RCS"; } elsif ( $0 =~ /-svn$/ ) { $vc="SVN"; } elsif ( $0 =~ /-git$/ ) { $vc="GIT"; } elsif ( -e "CVSROOT" || defined($ENV{"CVSROOT"}) ) { print STDERR "Guess you are using CVS ...\n"; $vc="CVS"; } elsif ( -e "$file2,v" ) { print STDERR "Guess you are using RCS ...\n"; $vc="RCS"; } elsif ( -d ".svn" ) { print STDERR "Guess you are using SVN ...\n"; $vc="SVN"; } elsif ( -d ".git" ) { print STDERR "Guess you are using GIT ...\n"; $vc="GIT"; } else { print STDERR "Cannot figure out version control system, so I default to CVS\n"; $vc="CVS"; } } if (defined($dir) && $dir=~/^\.\/?/ ) { print STDERR "You wrote -dir=. but you do not really like to do that, do you ?\n"; exit 10 } if ( scalar(@revs)>0 ) { if ( $vc eq "CVS" ) { $diffcmd = "cvs diff -u -r"; $patchcmd = "patch -R -p0"; } elsif ( $vc eq "RCS" ) { $diffcmd = "rcsdiff -u -r"; $patchcmd = "patch -R -p0"; } elsif ( $vc eq "SVN" ) { $diffcmd = "svn diff -r "; $patchcmd = "patch -R -p0"; } elsif ( $vc eq "GIT" ) { $diffcmd = "git diff -r --relative --no-prefix "; $patchcmd = "patch -R -p0"; # alternatively: # $diffcmd = "git diff "; # $patchcmd = "patch -R -p1"; } else { print STDERR "Unknown versioning system $vc \n"; exit 10; } } # 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 or .bbl @files=($file2); while( $file1=pop @ARGV ) { if ( $file1 =~ /\.(tex|bbl)$/ ) { # $file1 looks like a valid file name and is prepended to file list unshift @files, $file1 ; } else { # $file1 looks like an option for latexdiff, push it back to argument stack unshift @ldoptions, $file1 ; } } if ( scalar(@revs) == 0 ) { pod2usage("When -r option is not used, two .tex files (old and new) must be given on the command line") unless @files==2; # compare two files $file1=shift @files ; } if ( scalar(@revs) == 2 ) { $append = "-diff$revs[0]-$revs[1]"; } elsif ( scalar(@revs) == 1 || $revs[0] ) { $append = "-diff$revs[0]"; } else { $append = "-diff"; } if ( defined ($dir) && ! $dir ) { # bare -d option => choose directory name ($dir=$append) =~ s/^-//; } if ( ($vc eq "SVN" || $vc eq "CVS") && scalar(@revs)) { length($revs[$#revs]) > 0 or $revs[$#revs]="HEAD"; length($revs[0]) > 0 or $revs[0]="HEAD"; } #exit ; # cycle through all files @difffiles=(); while ( $infile=$file2=shift @files ) { print STDERR "Working on $infile \n"; if ( scalar(@revs) == 1 ) { ($file1=$infile) =~ s/\.(tex|bbl)/-oldtmp-$$.$1/ ; push @tmpfiles,$file1; # compare file with previous version ($revs[0]="") or specified version ### system("$diffcmd$revs[0] $infile| $patchcmd -o$file1") ; if (system("$diffcmd$revs[0] $infile | $patchcmd -o$file1")==0 and -z $file1 ) { # no differences detected, i.e. file is equal to current version system("\cp $infile $file1"); } } elsif ( scalar(@revs) == 2 ) { ($file1=$infile) =~ s/\.(tex|bbl)/-oldtmp-$$.$1/ ; $file2 =~ s/\.(tex|bbl)/-newtmp-$$.$1/ ; push @tmpfiles,$file2; ; if (system("$diffcmd$revs[1] $infile | $patchcmd -o$file2")==0 and -z $file2 ) { system("\cp $infile $file2"); } if (system("$diffcmd$revs[0] $infile | $patchcmd -o$file1")==0 and -z $file1 ) { system("\cp $infile $file1"); }; } if ( -z $file1 || -z $file2) { print STDERR "One or both of the files to compare are empty. Possibly something went wrong in the retrieval of older versions. Aborting ...\n" ; exit(10); } # Get name of difference file if ( defined($dir) ) { $diff="$dir/$infile" ; } else { ($diff=$infile) =~ s/\.(tex|bbl)$/$append.$1/ ; } # make directories if needed $dirname=dirname($diff) ; system("mkdir -p $dirname") unless ( -e $dirname ); # Remaining options are passed to latexdiff $options = join(" ",@ldoptions); if ( -e $diff && ! $force ) { print STDERR "OK to overwrite existing file $diff (y/n)? "; $answer = ; unless ($answer =~ /^y/i ) { unlink @tmpfiles; die "Abort ... " ; } } print "Running $latexdiff\n"; unless ( system("$latexdiff $options $file1 $file2 > $diff") == 0 ) { print STDERR "Something went wrong in $latexdiff. Deleting $diff and abort\n" ; unlink $diff ; exit(5) }; print "Generated difference file $diff\n"; if ( ( $postscript or $pdf ) and !( scalar(@revs) && greptex( qr/\\document(?:class|style)/ , $diff ) ) ) { # save filename for later processing if postscript or pdf conversion is requested and either two-file mode was used (scalar(@revs)==0) or the diff file contains documentclass statement (ie. is a root document) push @difffiles, $diff ; } unlink @tmpfiles; } foreach $diff ( @difffiles ) { chomp($cwd=(`pwd`)); if (defined($dir)) { ( $diff =~ s/$dir\/?// ) ; chdir $dir ; } @ptmpfiles=(); ( $diffbase=$diff) =~ s/\.(tex)$// ; # adapt magically changebar styles to [pdftex] display driver if pdf output was selected if ( $pdf ) { system("sed \"s/Package\\[dvips\\]/Package[pdftex]/\" $diff > $diff.tmp$$ ; \\mv $diff.tmp$$ $diff"); } print STDERR "PDF: $pdf Postscript: $postscript cwd $cwd\n"; if ( system("grep -q \'^[^%]*\\\\bibliography\' $diff") == 0 ) { if ( $postscript) { system("latex --interaction=batchmode $diff; bibtex $diffbase"); push @ptmpfiles, "$diffbase.bbl","$diffbase.bbl" ; } elsif ( $pdf ) { system("pdflatex --interaction=batchmode $diff; bibtex $diffbase"); push @ptmpfiles, "$diffbase.bbl","$diffbase.bbl" ; } } if ( $postscript ) { my $dvi="$diffbase.dvi"; my $ps="$diffbase.ps"; system("latex --interaction=batchmode $diff; latex $diff; dvips -o $ps $dvi"); push @ptmpfiles, "$diffbase.aux","$diffbase.log",$dvi ; print "Generated postscript file $ps\n"; } elsif ( $pdf ) { system("pdflatex --interaction=batchmode $diff; pdflatex $diff"); push @ptmpfiles, "$diffbase.aux","$diffbase.log"; } unlink @ptmpfiles; chdir $cwd; } # greptex returns 1 if regex is not matched in filename # 0 if there is a match sub greptex { my ($regex,$filename)=@_; my ($i)=0; open (FH, $filename) or die("Couldn't open $filename: $!"); while () { next if /^\s*%/; # skip comment lines if ( m/$regex/ ) { close(FH); return(0); } # only scan 25 lines $i++; last if $i>25 ; } close(FH); return(1); } =head1 NAME latexdiff-vc - wrapper script that calls latexdiff for different versions of a file under version management (CVS, RCS or SVN) =head1 SYNOPSIS B [ F ] [ F ] B<-r> [F] [B<-r> F] F [ F ...] or B [ F ] [ F ][ B<--postscript> | B<--pdf> ] F F =head1 DESCRIPTION I is a wrapper script that applies I to a file, or multiple files under version control (CVS, RCS or SVN), and optionally runs the sequence of C and C or C commands necessary to produce pdf or postscript output of the difference tex file(s). It can also be applied to a pair of files to automatise the generation of difference file in postscript or pdf format. =head1 OPTIONS =over 4 =item B<--rcs>, B<--svn>, B<--cvs>, or B<--git> Set the version system. If no version system is specified, latexdiff-vc will venture a guess. latexdiff-cvs and latexdiff-rcs are variants of latexdiff-vc which default to the respective versioning system. However, this default can still be overridden using the options above. =item B<-r>, B<-r> F or B<--revision>, B<--revision=>F Choose revision (under RCS, CVS, SVN or GIT). One or two B<-r> options can be specified, and they result in different behaviour: =over 4 =item B -r F ... compares F with the most recent version checked into RCS. =item B -r F F ... compares F with revision F. =item B -r F -r F F ... compares revisions F and F of F. Multiple files can be specified for all of the above options. All files must have the extension C<.tex>, though. =item B F F compares two files. =back The name of the difference file is generated automatically and reported to stdout. =item B<-d> or B<--dir> B<-d> F or B<--dir=>F Rather than appending the string C and optionally the version numbers given to the output-file, this will prepend a directory name C to the original filename, creating the directory and subdirectories should they not exist already. This is particularly useful in order to clone a complete directory hierarchy. Optionally, a pathname F can be specified, which is prepended instead of C. =item B<--fast> or B<--so> Use C or C, respectively (instead of C). =item B<--ps> or B<--postscript> Generate postscript output from difference file. This will run the sequence C on the difference file (do not use this option in the rare cases, where three C commands are required if you care about correct referencing). If the difference file contains a C<\bibliography> tag, run the sequence C. =item B<--pdf> Generate pdf output from difference file using C. This will run the sequence C on the difference file, or C for files requiring bibtex. =item B<--force> Overwrite existing diff files without asking for confirmation. Default behaviour is to ask for confirmation before overwriting an existing difference file. =item B<--help> or B<-h> Show help text =item B<--version> Show version number =back All other options are passed on to C. =head1 SEE ALSO L =head1 PORTABILITY I uses external commands and is therefore limited to Unix-like systems. It also requires the RCS version control system and latex to be installed on the system. Modules from Perl 5.8 or higher are required. =head1 BUG REPORTING Please submit bug reports through the latexdiff project page I or send to I. Include the serial number of I (option C<--version>) . =head1 AUTHOR Copyright (C) 2005,2012 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 Contributors: S Utcke, H Bruyninckx =cut latexdiff-1.0.2/doc/0000755000076400007640000000000012063451231014120 5ustar tilmanntilmannlatexdiff-1.0.2/doc/latexdiff-man.tex0000644000076400007640000002523712063450740017376 0ustar tilmanntilmann\documentclass[a4]{article} \usepackage{graphicx} %\def\C++{{\rm C\kern-.05em\raise.3ex\hbox{\footnotesize ++}}} %\def\underscore{\leavevmode\kern.04em\vbox{\hrule width 0.4em height 0.3pt}} \setlength{\parindent}{0pt} %\setlength{\textwidth}{6.5in} %\setlength{\oddsidemargin}{0.0in} \title{Marking up differences between latex files with {\em latexdiff}} \author{F.J. Tilmann\thanks{tilmann@gfz-potsdam.de,ftilmann@users.berlios.de}} \date{\today} \begin{document} \maketitle \section*{Preamble} {\em latexdiff} is a Perl script, which compares two latex files and marks up significant differences between them. Various options are available for visual markup using standard latex packages such as {\em color.sty}. Changes not directly affecting visible text, for example in formatting commands, are still marked in the latex source. A rudimentary revision facilility is provided by another Perl script, {\em latexrevise}, which accepts or rejects all changes. Manual editing of the difference file can be used to override this default behaviour and accept or reject selected changes only. There is no explicit support for annotations as these are trivial to implement. For example, I include the following command definition in the preamble \begin{verbatim} \newcommand{\remark}[1]{{ \bf [ \footnotesize #1 ]}} \end{verbatim} and mark up annotations as follows \begin{verbatim} ... The roadrunner is the fastest running bird \remark{Check this again with a zoologist!}. The most famous roadrunner ... \end{verbatim} Alternatively, instead of a command like \verb#\remark# in the example just given, an equivalent annotation environment could be defined. {\em latexrevise} can remove such comments or environments from the text body. %It is planned that the revision capabilities of this system will be %further expanded, dependent on the amount of feedback received. On the following pages you find the {\em man} pages for {\em latexdiff} and {\em latexrevise} and a simple example. \include{latexdiff} \setcounter{section}{0} \include{latexrevise} \setcounter{section}{0} \include{latexdiff-vc} \setcounter{section}{0} \section*{A simple example} We start with a draft text, \verb|example-draft.tex|, listed here in full but also included in the distribution (except that the ``verbatim'' environment had to be renamed to ``Verbatim'' for the listing). {\scriptsize \begin{verbatim} \documentclass[12pt,a4paper]{article} \setlength{\topmargin}{-0.2in} \setlength{\textheight}{9.5in} \setlength{\oddsidemargin}{0.0in} \setlength{\textwidth}{6.5in} \title{latexdiff Example - Draft version} \author{F Tilmann} \begin{document} \maketitle \section*{Introduction} This is an extremely simple document that showcases some of latexdiff features. Type \begin{Verbatim} latexdiff -t UNDERLINE example-draft.tex example-rev.tex > example-diff.tex \end{Verbatim} to create the difference file. You can inspect this file directly. Then run either \begin{Verbatim} pdflatex example-diff.tex xpdf example-diff.pdf \end{Verbatim} or \begin{Verbatim} latex example-diff.tex dvips -o example-diff.ps example-diff.dvi gv example-diff.ps \end{Verbatim} to display the markup. Of course, instead of \verb|xpdf| you can use \verb|okular, evince, acroread| or any other pdf or postscript viewer. \section*{Another section title} A paragraph with a line only in the draft document. More things could be said were it not for the constraints of time and space. More things could be said were it not for the constraints of time and space. And here is a tipo. Here is a table: \begin{tabular}{ll} Name & Description \\ \hline Gandalf & Grey \\ Saruman & White \end{tabular} And sometimes a whole paragraph gets completely rewritten. In this case latexdiff marks up the whole paragraph even if some words in it are identical. No change, no markup! \end{document} \end{verbatim} } We can now edit this text as we would do with any other latex file to create a new revision of the text, \verb|example-rev.tex|. We should run \begin{verbatim} latex example-rev.tex \end{verbatim} and look at the resulting \verb|.dvi| file to make sure that all changes are valid. An example revision is listed here: {\scriptsize \begin{verbatim} \documentclass[12pt,a4paper]{article} \setlength{\topmargin}{-0.2in} \setlength{\textheight}{9.5in} \setlength{\oddsidemargin}{0.0in} \setlength{\textwidth}{6in} \title{latexdiff Example - Revised version} \author{F Tilmann} % Note how in the preamble visual markup is never used (even % if some preamble might eventually end up as visible text.) \begin{document} \maketitle \section*{Introduction} This is an extremely simple document that showcases some of the latexdiff features. Type \begin{Verbatim} latexdiff -t UNDERLINE example-draft.tex example-rev.tex > example-diff.tex \end{Verbatim} to create the difference file. You can inspect this file directly. Then run either \begin{Verbatim} pdflatex example-diff.tex xpdf example-diff.pdf \end{Verbatim} or \begin{Verbatim} latex example-diff.tex dvips -o example-diff.ps example-diff.dvi gv example-diff.ps \end{Verbatim} to display the markup. \section*{Yet another section title} More things could be said were it not for the constraints of time and space. A paragraph with a line only in the revised document. More things could be said were it not for the constraints of time and space. And here is a typo. Here is a table: \begin{tabular}{ll} Name & Description \\ \hline Gandalf & White \\ Saruman & Evil \end{tabular} And now for something completely different, with not a paragraph in sight. No change, no markup! \end{document} \end{verbatim} } To compare both revisions, type \begin{verbatim} latexdiff -t UNDERLINE example-draft.tex example-rev.tex > example-diff.tex \end{verbatim} This results in the following difference file (a few newlines have been added in this listing for legibility reasosn): {\scriptsize \begin{verbatim} \documentclass[12pt,a4paper]{article} \setlength{\topmargin}{-0.2in} \setlength{\textheight}{9.5in} \setlength{\oddsidemargin}{0.0in} %DIF 7c7 %DIF < \setlength{\textwidth}{6.5in} %DIF ------- \setlength{\textwidth}{6in} %DIF > %DIF ------- %DIF 9c9 %DIF < \title{latexdiff Example - Draft version} %DIF ------- \title{latexdiff Example - Revised version} %DIF > %DIF ------- \author{F Tilmann} % Note how in the preamble visual markup is never used (even %DIF > % if some preamble might eventually end up as visible text.) %DIF > %DIF PREAMBLE EXTENSION ADDED BY LATEXDIFF %DIF UNDERLINE PREAMBLE %DIF PREAMBLE \RequirePackage[normalem]{ulem} %DIF PREAMBLE \RequirePackage{color} %DIF PREAMBLE \providecommand{\DIFadd}[1]{{\color{blue}\uline{#1}}} %DIF PREAMBLE \providecommand{\DIFdel}[1]{{\color{red}\sout{#1}}} %DIF PREAMBLE %DIF SAFE PREAMBLE %DIF PREAMBLE \providecommand{\DIFaddbegin}{} %DIF PREAMBLE \providecommand{\DIFaddend}{} %DIF PREAMBLE \providecommand{\DIFdelbegin}{} %DIF PREAMBLE \providecommand{\DIFdelend}{} %DIF PREAMBLE %DIF FLOATSAFE PREAMBLE %DIF PREAMBLE \providecommand{\DIFaddFL}[1]{\DIFadd{#1}} %DIF PREAMBLE \providecommand{\DIFdelFL}[1]{\DIFdel{#1}} %DIF PREAMBLE \providecommand{\DIFaddbeginFL}{} %DIF PREAMBLE \providecommand{\DIFaddendFL}{} %DIF PREAMBLE \providecommand{\DIFdelbeginFL}{} %DIF PREAMBLE \providecommand{\DIFdelendFL}{} %DIF PREAMBLE %DIF END PREAMBLE EXTENSION ADDED BY LATEXDIFF \begin{document} \maketitle \section*{Introduction} This is an extremely simple document that showcases some of latexdiff features. Type \begin{Verbatim} latexdiff -t UNDERLINE example-draft.tex example-rev.tex > example-diff.tex \end{Verbatim} to create the difference file. You can inspect this file directly. Then run either \begin{Verbatim} pdflatex example-diff.tex xpdf example-diff.pdf \end{Verbatim} or \begin{Verbatim} latex example-diff.tex dvips -o example-diff.ps example-diff.dvi gv example-diff.ps \end{Verbatim} to display the markup. \section*{\DIFaddbegin \DIFadd{Yet another }\DIFaddend \DIFdelbegin \DIFdel{Another }\DIFdelend section title} \DIFdelbegin \DIFdel{A paragraph with a line only in the draft document. }\DIFdelend More things could be said were it not for the constraints of time and space. \DIFaddbegin \DIFadd{A paragraph with a line only in the revised document. }\DIFaddend More things could be said were it not for the constraints of time and space. And here is a \DIFaddbegin \DIFadd{typo}\DIFaddend \DIFdelbegin \DIFdel{tipo}\DIFdelend . Here is a table: \begin{tabular}{ll} Name & Description \\ \hline Gandalf & \DIFaddbegin \DIFadd{White }\DIFaddend \DIFdelbegin \DIFdel{Grey }\DIFdelend \\ Saruman & \DIFaddbegin \DIFadd{Evil }\DIFaddend \DIFdelbegin \DIFdel{White }\DIFdelend \end{tabular} And \DIFaddbegin \DIFadd{now for something completely different, with not a paragraph in sight}\DIFaddend \DIFdelbegin \DIFdel{sometimes a whole paragraph gets completely rewritten. In this case latexdiff marks up the whole paragraph even if some words in it are identical}\DIFdelend . No change, no markup! \end{document} \end{verbatim} } Type \begin{verbatim} pdflatex example-diff.tex xpdf example-diff.pdf \end{verbatim} to make the markup visible. This is what it looks like: \vspace{1cm} \framebox[\textwidth]{\includegraphics[width=\textwidth]{example-diff}} \vspace{1cm} If you approve of all the changes in the revision, just continue with \verb|example-rev.tex| for the next revision. If you like to adopt most but not all changes you can use \verb|latexrevise| in the following manner. Simply remove the \verb|\DIFdelbegin| and \verb|\DIFdelend| tags around the text you would like to keep and simply remove the text between \verb|\DIFaddbegin| and \verb|\DIFaddend| tags, if you do not wish to keep them. Say you are happy with all proposed changes for the example above except in the last paragraph where you prefer the original draft. You have to change {\scriptsize \begin{verbatim} ... And \DIFaddbegin \DIFadd{now for something completely different, with not a paragraph in sight}\DIFaddend \DIFdelbegin \DIFdel{sometimes a whole paragraph gets completely rewritten. In this case latexdiff marks up the whole paragraph even if some words in it are identical}\DIFdelend . ... \end{verbatim} } into {\scriptsize \begin{verbatim} ... And \DIFdel{sometimes a whole paragraph gets completely rewritten. In this case latexdiff marks up the whole paragraph even if some words in it are identical}. ... \end{verbatim} } and run \begin{verbatim} latexrevise -a example-rev.tex > example-final.tex \end{verbatim} \verb|example-final.tex| is then almost identical to \verb|example-rev.tex| except for the last paragraph. \end{document} latexdiff-1.0.2/doc/latexdiff-man.pdf0000644000076400007640000057230712063450740017354 0ustar tilmanntilmann%PDF-1.4 % 3 0 obj << /Length 1634 /Filter /FlateDecode >> stream xڕWK6WE֬Dݚ ASeDLp$y7p({U|z[FiDŽK۶n+v\R䱵-f_SNܻqY535`EE+Y5еLqXOSgV噂#ӑ@ӶtP(gEp<,bR{>&Z0%ܐ\+-m`qO < Rq!:Z9i@CoMzs}"ZǺC_Z6WCq\G?EfS~>L'}CU^>e❯09Φ{fQ焜<ר}heO}r bPg-<6ei@6{ | ΨiT`wQxy+@#S~oY7Pp !7-cNUss=C^E P;BB_70MW7򛐆ʢ[7RDC"NaqrG.Uk%8-k~\"n7D_XJ;o?ro^G|Y6 8C'x~i1f Cba9ac0g aNn>H.FC\h_X^|Y`%oA a#vK,oEp|om`kT:s5~B D+ z}|\F>"ng04CeVPL{]W`@ >x(%%'C endstream endobj 2 0 obj << /Type /Page /Contents 3 0 R /Resources 1 0 R /MediaBox [0 0 612 792] /Parent 14 0 R >> endobj 1 0 obj << /Font << /F15 4 0 R /F16 5 0 R /F17 6 0 R /F24 7 0 R /F27 8 0 R /F28 9 0 R /F8 10 0 R /F29 11 0 R /F25 12 0 R /F18 13 0 R >> /ProcSet [ /PDF /Text ] >> endobj 17 0 obj << /Length 2392 /Filter /FlateDecode >> stream xڍYmoܸ_a( ^HXKhCW\ J %rR!9yx/*ZD:VW+E"ӫ$BE>-) ~ӗ W%E$3Yȋ2DQlG\s,*Ԭyp̚2׸jZ~ި4p5}?U?}tW!)d(Y* BFA ]QC=N?^8Jǝ ;\DA{DN^L*EeJD}$q< 3RQ҅ku 1Y옼 !@z!X2+ZޢLX'Iw~d?_i6ݼ' ,tCѡ(hOٖDm~xnX^RC-H*QJO˳7{: Xgېgo"&pٶx(^%{nD⦇ڳ#Z'^P cu=,0{$H4 OcR"r\CczEȶkSAB=s va0+Ow@p(yjcF - ٘(̄/'3sa*R/VaطP0DLo,Fȶ8eEW4ZA_U7:<LLGq| 4 >}PWZԴF$ן>~Y*ҨE.>HS{[o:Y䝿QZNha \a!`kiG`vJy@t[BFcMrlfdܓ ay5Q *(ZϵhYÊa Œ5v'n`|@5<2 Ʈ^GViTu_Q1=:sd)0Q-N I.[Ǫ0v!{u}kn)!!QgxHaf NGe(;$'膡`ټr[,KbDlN=SQ+ƎB(oc;һ:^7,>%^ k?x<Ù|qnBU /٘887jH$ .r4sQ[٪QFL|Z_J&"TfR.U?xԡ]wurVe2B0 gyGq*igQWpM-oӭ:*Q^i@AJ*ka^0|F*6|+ Q ?cs~od5x9/)6zMxD:Yԕ/Sy@sq&ojs BK~c?;ăS#,e>-˘Tt!.vDUYS%ȷg;Vrڼ!JcTv }®5>8Jgǭ:tLiVz(0p H0kPg 2)0Qƹ1.o`BۢH.y,r.ܫa;H{ᕬkV.k[+EKo}z9kaf;wt#t`:QHI@aRḎ*,_+p <(Uh?: ڒ6L8em3mk~ӘxolNMsB ֠bkoZ}ļAPgm~̡  Ij Rx T',Jq2"qj yyU6>YgXݫ?Xs5+ ?tëC. 9.$ ɂ~0=7A{dzT`I~Yrz*%p@aSQg^v_V>_Vr^|l|a 0蘔{,GڵDԘP*'8als>{eK ]ht.yUh@ZAgAɢ6+&z?/VJpHֱXov}"ӡhKHEGVDX=B5 L|& endstream endobj 16 0 obj << /Type /Page /Contents 17 0 R /Resources 15 0 R /MediaBox [0 0 612 792] /Parent 14 0 R >> endobj 15 0 obj << /Font << /F27 8 0 R /F8 10 0 R /F30 18 0 R /F28 9 0 R /F11 19 0 R /F29 11 0 R >> /ProcSet [ /PDF /Text ] >> endobj 22 0 obj << /Length 2657 /Filter /FlateDecode >> stream xڽYo=BؗҀŐ3!>1(V(-$TwKcXAoͻw*Sj[ZMVľfW7*YwZ+gLy!{۬bv:=;xw<pUt:BxtZey9k\*XO]n5 xCs @lZ>x&E[6flaSJ@ 4QUyuQms^T{8^V0DhS*sr z)`t\v 8[Oȫjމ[/S!Uڭk:|\3/Cܑux;?,Ff>| Ս?+vxI DQzfSn0ڊ)\JUE-&aamSB?$zD ]@4a\*#Ja(TB'PJ<XGI羒]jmPf! kA:nryܠiB΅PQ ʚ'18B[Ժ.'H'=0<#p0:~AYr7^h;q%%^ZћN,~_7Ew82Jˊx^rM=[Ѹkmoh X DӐ2"iNr_|b疡<*H%c@(i3@ځ] y9jbZ@Uw<``%MV}%}+D۞ y-x0# 0 cs#?wFq_LPO``ќp.y]~ego'3t+t;uvT._BQd*B@CEƀl bj>fT3dp FWt9Qst0QE!9 Z+Їl?Qy P &*ŋ q@[B#qKx>raf!dyAR4u5_aP15co1k=oyd(',$krNxS,ao%#PfJX=HYV緌Y duRdqG)c#*ɮ%b Oߣ6Ǐ0_x9P?7 {f^^>]v.ex~m: 2ĩs8O|UU1鮪WZ@[/ѯ8|R뙵P$2amK [|:l*P=$6Fs%jpfՅ 98*8Td +S?>B!+[~j d ‡(Ap|ϼrFD C;)q>TTRAws$Fk_r.+ʜaPG#kҠb {LG14C{+=]F{!L`W/1M×RoJ]XHpNk kt(uj@D-;Z e_PŦOT3n5WK;%IU_€Űq;r\{Js2Le0?rq|TWv W*9d[J)!"? xIW]le;sR P4c f`_pYh7!w1|c.6@Ipwɞ=è I}>{Kx"H0٘EDr6}1#de1cPr(dU4n, i!gA&cB[,61Φ!X;Ot0yJnXY`hch0wKa^M]?ߡЉ!*K%7$݄ZX5D_{Y#}$vĶ\NECFk)cPccFVz`蟔E Yj'\7xc@J1W ZR Ě$fFz6q5jF9$86˯kc[_%J#cdk!?˜T*R4z(s:!TH]7*56H,`2Ƨ_.<1h +}$vؾ}X;ѾM7Jx@l~!z6tCI)`!V8]'b! `K>|+K+ `ߧ,Ou5O! M}-$~,Ew7?* endstream endobj 21 0 obj << /Type /Page /Contents 22 0 R /Resources 20 0 R /MediaBox [0 0 612 792] /Parent 14 0 R >> endobj 20 0 obj << /Font << /F8 10 0 R /F14 23 0 R /F29 11 0 R /F30 18 0 R /F28 9 0 R >> /ProcSet [ /PDF /Text ] >> endobj 26 0 obj << /Length 2102 /Filter /FlateDecode >> stream xڭY[s۶~ϯxL %. =3/z;cCZlДߟ],H؝>˷лӑf:hq)Y8Jh} r9HH3o]Z}lPC7N8-|kdWq6(Ӣp5dB}ǖCQ? LGU0v~ϹX*' V+b:1"(2w~baeQ/Ru7clj?}^RI> z$ps"LIgIS~ꖧl<l\[7jo*! )yyG#ɹN;,3uGݸ`zyep?E-㉭|ؘ >/g*ף9J՜i)ϭRԟH*dܓ/%a?_YίO/D\ˉ"m@ V;x x!rd J1 '_v:Gt Y?mf$tzvq#'HȉKF\1~0iF)X"U ;.|vuy[h-.Fъ`F9< u fi!MFuzٻcOq뎀OYzHR85l[4ECݭ8c<^6dh/;gCo{I&9%<( !DZgbE6;4v6P@<ڷ WD2|ayU9q89g_Aߚ F{̔pQ V h5 BHKWB4Z ل[RDPu{L^2Crōd"Cɝ\]\99cO{@csiijؕbZYrY9Af/GAD CFXG$$^8^x[T.$T0r n"B[4 ]E=x‘Ƕ`01XRgmk;HVPwpro?5Q{wGEӽuKjlMTiDP9.KR=ݬ(< &Աs먘%xcc|\F}e/^^v0;=NOD gS`b/Jn\W0dv@'TodJ5:9PKTex0'>_#53ŞEYvE{.3xY8emV[3.?{5Ol }0Đ([TkFX&!4&2m2˗-ɛj[n/ߘ /?`̰=*B =X@2_{GǴkj(*ܟҍGFp?#,ӏ`C|I)tҥPܹAzmTSU#(lP4dͧNu5}e=ƴ>Q?@sEH4}!n|d쓇_ɜ~x_^nMNTg~51CR{up̊N )պV$Y3=Лjv} endstream endobj 25 0 obj << /Type /Page /Contents 26 0 R /Resources 24 0 R /MediaBox [0 0 612 792] /Parent 14 0 R >> endobj 24 0 obj << /Font << /F8 10 0 R /F14 23 0 R /F29 11 0 R /F11 19 0 R /F27 8 0 R /F30 18 0 R >> /ProcSet [ /PDF /Text ] >> endobj 29 0 obj << /Length 2070 /Filter /FlateDecode >> stream xYK6ϯ0r-H`dEX$Sۢme+>U,a['ҦbX~|^-r"]<\*frʌX.j)TmaF~ҸۖFfuA=Q[k;Se( t_;Pd}v I^X;|"+v@OÓ55׾aC<@^Rup["ẋ?"TJ8e؇ښx0ȌD=8) XyPֶ3ibԦ]Yo{ If2!a{ڡ iYMMSpr6 =Tp\v۬02y f K!ғk} }Xj [AvACƂ\\䇺gnV,IsR6),v&k\1x"obs"@.ڄn58:Wg zsbpٱ0cɬҖYl_կ3REc0T/.֐5+ˉcm[#o͈)~]nPk ?3DlWs&>NʳQ[FtCYNΚK3<@-k\nm_mƅ%Tff}o5fC4yjQ_*9t>W⛟: \q|𓈩8Үyv"|_yoi$O&L뷛^%.o.( ^%1ǘ+DpKضCDq3O7bt=9pr5aF iHBiG+W^s;>49ʕT)H(MkޞJ&@w|UPoC P jJ]IʔdOp UCy&p!0TڙvW=Ć4t9 Nj(+6Mwz%mBgwkKw?GRWzUGubXc9t},JdCs/A>1NNYwI_$aW<87I;#c .}tWz5.2qn PȰnJy;(&5h1序|${`ٹ^ =:8nKFF&x3SL@P閈%ĺDŽ)xJPI4:rH܂ܖTh,"97Mn{UK;n0Oo|=CP`$2/ endstream endobj 28 0 obj << /Type /Page /Contents 29 0 R /Resources 27 0 R /MediaBox [0 0 612 792] /Parent 14 0 R >> endobj 27 0 obj << /Font << /F8 10 0 R /F30 18 0 R /F14 23 0 R /F29 11 0 R /F27 8 0 R >> /ProcSet [ /PDF /Text ] >> endobj 32 0 obj << /Length 1941 /Filter /FlateDecode >> stream xڭX[6~ϯ0 Ե@tn[@#cadɑd{nyi"ύw.7g_LeBGhG26Z/^-[ksZh0K&;U7KW3ױA+m‘hۼ)O6nI谖viRo<+C^5Lh0^^_#oqc1mGJZel ^cM`=>n[^T }Lp4'mΕ`CîCyoAֆM>#!];z:8W?Vohkm>FȨ6m֮$k({G\<* cux"Xr%OFlȂXS U^z3|uh?x *3g#E/b. C1ؓP{|m;эMI\sMy@fT$PAEA`lpK^f Lܮ sĘ6ShLg!m܆ͦ`'}L#uȀ y!\Ye=j)sHfXX#4@|:^]V ixN  P:Ќ [ @2\*}nwxx1"^ yo: ~)祒]3]%dVsdD:&=\>X. <'6't$5qb{'f8Q]3EJWϻb] v͟Ys^0}Xzho\] g&Ý TpR8MطC.hvtwY4= |QL%<* pd їc.R.Уaƹ8n;Ԓ{+^* y[#x #( 5A*d:/^2HߍpJ̚:Eue0HZ LXJ15aZvO-U v<J.{DNz/%ǖ45KUZSB)Z&2Ԣ%R"zAʤtЋ_:#0v `8 _TafBI^OX4.="F&d,eƞ(GP3@ mEZz$OGЀeӦZiRZb<d*8lP'oQ-5 U%7NݪeRlrIiK|$xre F+2Psmiv<<|I'OhF'?%f܌Iͅ<9H(lb&?9W˞eEAamSR3}(!3 qfXc㨬`u)[KT"xv|.HH&¸EQfXЙn})=.'+7N8.=.Y.G [f vj}ɃΌiU; I8- +55MPdUy(NV$~\P&I28!Ȼ1U˓#uޏ6p& 1Da zp]3=SyjD(O%$w#5ױl"{ƫG8c9QI3$ywA/El#?ܨf߿yw߾wVVOO73C3|:F޽\]iFJA ?9~7V?^_j"?]؏rY֞UA"t&*RfqLn endstream endobj 31 0 obj << /Type /Page /Contents 32 0 R /Resources 30 0 R /MediaBox [0 0 612 792] /Parent 14 0 R >> endobj 30 0 obj << /Font << /F8 10 0 R /F14 23 0 R /F29 11 0 R /F30 18 0 R >> /ProcSet [ /PDF /Text ] >> endobj 35 0 obj << /Length 1611 /Filter /FlateDecode >> stream xڵWK6W(1#Q)zHE 6n/M\Ȓz;JJ] v{,2\7 O""TZ·7n?gD}R[od/܊f݇gwcW(@6UtVoL_#щß @K;rS-0 ^wRFb]f0ig#-`5i߃T+3~x FGpGG#K!\El>Ebnl4٪k M{uV5ldec Mj.zkI{dLt@l˔cDh {*Mlip,HISޑd*MmcZ,y.j1Ξ[.YH>M5!`0v"%c48T Ўa׿+@,=gh2/`(t ɃDHKx-& \qPs pm;Sm>;E Sj:6 *zD7!Vu6t1v.Κ%vҫ-@ G:MMaEb^tUT@ q0{NP-7,yKA\g2GSgoy{yX OVVX_ <,j>4^Dd0bO@e6 "{[ۆRm}77H^o$`!@:s괠˳8iOϪ03.| xO>'Ԙ`su6 qpAALL5C R"醴D\.\ܺϵI{&-:c~΄FH VLOu xs&+|BD- G8Ls)́riϦnZ{O.v::_ Z#Q Ic'H&PTG%nFaHYH#9)E6M{)*ZJ=cϲ_%> )g cV,/rsOE*pt=;&MO!Mob, t$˫VVd#cP@ L/< :'ߎY//} endstream endobj 34 0 obj << /Type /Page /Contents 35 0 R /Resources 33 0 R /MediaBox [0 0 612 792] /Parent 36 0 R >> endobj 33 0 obj << /Font << /F29 11 0 R /F8 10 0 R /F30 18 0 R /F27 8 0 R >> /ProcSet [ /PDF /Text ] >> endobj 39 0 obj << /Length 1777 /Filter /FlateDecode >> stream xڝWr8+tB*v&8)G9%>"$E^~zdJfUE~2nyg[~QYe[]Q|Fq JECoSxqTzm(5ơ6s̨ꦑq{jk0XÌgk0m'cS_ZhL9$ˇae_+@T뷕wϥ $q`fW ^Y=D+%df#`3Ȗ~"qy~qk^>@O_w7s§I>y?6}efսv|sNNC1vsJ@p2 pdI؉?U )Ӡ VCBUpRPG|T$8xn_coTSՒ$`ơZ`y2k4U'< fH$ q؏ػ˴s0;#bS`fzԔk50yRzq(A4y36=[QR\98 PZ-AG,l[H'i^sLITv$~,U  -^?ѩ#h5Bޞ> 흝}zǙCsH]t> endobj 37 0 obj << /Font << /F8 10 0 R /F29 11 0 R /F30 18 0 R /F14 23 0 R /F27 8 0 R >> /ProcSet [ /PDF /Text ] >> endobj 42 0 obj << /Length 1769 /Filter /FlateDecode >> stream xڭXAw6 W(WIұ[l]zmŢc.R HɎ%Yw)$@(߭_`EƳzH`*Yb]-~V$-^7??̏vpɊX-VITӆk}ˍ&Di ҄/bH˓`,Iʦ,^biS>%chk`.W"ѽw5n+G[-TnNmP*In8bU")* h_!5vk:-WiVDW۹*yi|ڦ~8Q0%ޓ3w ITQ֯)BR ^ܫhUxl>InF~r$7#z7} k\u_6I}O}i{ݑ_A0y"p ٗwݦC꒵~l҉H2w'E Âܗ. _%zzjIϧ/(@]X;ΡwB.hm/0R ChN$T)@b/h2e>RX/,jn, q1~M%5J̍  !%h}hvAy!AUS-g+#OX -g,] OGTdv_wæ\̻X W%d ZMUhL8h{liע{rlBS_'=I'C f l1LOi~ WL _:]adX KHT-D"\BџCx \ɞ_3Q#Kt`ENR4ٽiTn800Q"l{u@/s<c[S!c5,m޿GExHg0(Q8WEJ zW?}V-y@(_D,T A_[6veug2~pSCNi@caЌ<H:3R!Hz~n_掆sPOOd8?o(pD,(0JT=y+*Cʁ %\LcR|O0?/ڳM0ŧO/pEgy \yT䞠9OtJ›'R2b,X{ |bP4 endstream endobj 41 0 obj << /Type /Page /Contents 42 0 R /Resources 40 0 R /MediaBox [0 0 612 792] /Parent 36 0 R >> endobj 40 0 obj << /Font << /F30 18 0 R /F8 10 0 R /F14 23 0 R /F29 11 0 R /F27 8 0 R >> /ProcSet [ /PDF /Text ] >> endobj 45 0 obj << /Length 1535 /Filter /FlateDecode >> stream xWKs6WHX g#wl%J%)R%)+(=;Dp,v?~} AQ O? ]A$r0M:WW_.&o./Ot6=5 t/ԤQ)1?ENVdo9 t"4IuIMS;kHucU5K;@;ˤX20viK #<嬒(f͒G fI+t`I*c˼*[Z{['y(A2{pn+{O՗.c{H]E -8Jvku 8R$F寄xr~&7X].J¨R*p; # sO;ܬb<7u.ʣ0T" AI4ڬ[>3C@ knବŰ'£;\5KO K6>x}89<%YnZ]D' YT``yZ׼r9@8bD83D1< `AfՀ! :  f CyŃ}=#L˜7LcŦɠb&ξ(p-s~"qҰ<+n:U-q9-@DCu.C߃J()4G3wΜUvk>{d/%Ph';(. iè6_`~5<> endobj 43 0 obj << /Font << /F29 11 0 R /F8 10 0 R /F27 8 0 R /F14 23 0 R >> /ProcSet [ /PDF /Text ] >> endobj 48 0 obj << /Length 1910 /Filter /FlateDecode >> stream xڭX[s۸~ϯ#zc6q:vw:i`PJR񺿾Ri[3 O*]DZZ~d$N}źX|˕NcoԡxIneןEJpXw~jvT57<*kǶ r+@p^nRAFsG-;[ dw(N A[ukZYlZ kH|w̢quW kM5m[TʍD]{^ LUmQ5 ܯbϴWHS"wvB =JAah-waVDgbZ*bK0Tptq}* {b?Bf+ bܘI`|O 2ee'#ݑ=-?Qlt @W4K}ƣec㜯UI@l- x , wg-ЫX + . !aUՊjp* sL{͑ywʼn3:Q|o@"Ea Kd'4ǖg;@o70GT _nnbG~FI@99IA43wMYঃi^9Bc,8Wy'q4fDMg#* \ȸ*j)mf}ޠT1dXSee3D%(u {K,AxrrN0mlz5[̀=V2T\Q ^ qXw!t~3iih0YT'#j^;x àh1ZЃ"F`T@2 VHش_+rvnXF`2F-a60X;cU0TsFs7H!\q / !$d&o_>/UNUi5f_zLNs/ax)h{Gy)[qZ TpN0q4 7W뛷sd uB%mk=-ږ|@Y;zht:=TgY&0ij E[c% zji_}xQu<"2_1A _ NDzv0:%9ЈʺҵcīSLf#HS~T^  )"lM `/ M4ju0`':=Jp*},k*͑\.`yG.*9RF ЃB C6m:xh^^A mLRpۡ[̜"HzTnn;%i Woޛc=/6"_vfR \SrWb"PkEp7=V60t!=P`®y92.K+9@+ <V~|@{Kq.;cI}1㡞Us~ߕ3R.7.*q(s-v!%Ĕ#Ҟ:{5%glAѣUKp$^=vOg҉gW-~f.T\lyչAp3@K$2q㈣8(FN=bGqQ_RbxqL}Ӑ4_`zdvߐD*!x0-oLge|Zg1ٚG\ s}Qz11~]쏮;i'-=+_o.o|.^ >= }GiJ!Z/S endstream endobj 47 0 obj << /Type /Page /Contents 48 0 R /Resources 46 0 R /MediaBox [0 0 612 792] /Parent 36 0 R >> endobj 46 0 obj << /Font << /F27 8 0 R /F8 10 0 R /F29 11 0 R /F14 23 0 R /F28 9 0 R >> /ProcSet [ /PDF /Text ] >> endobj 51 0 obj << /Length 2441 /Filter /FlateDecode >> stream xڭYKs8WHmELTZovʣɁ(kTۍ)Q@`no*fqë*0 f\w~owi[1(Xn zE;ƁdQS19MYƊKo:+%]Ox.PJ,>fINC\,3FآTz1L,Vnh_ݟEJqq Q95 Hˬxt]J ނL'*#,TRe|蕇L/XqUJY턎fikԓiʶaF?tx@.6o޹`-Xҿ4Ӳ?Y F=4ޡ sv&MVć)T X$/?we5ibx/_*B#ABxv_~js` iMD@whᤪ(i\r46$wqnkW7@y(Ou`"ϊʒZ|09bQ +.c:a|NCaL:Ę\LұArq&16ZUxn ӎCVn{TKbzq&aR]W|<'4-p avDmñ/EҺN Y Jqd_ 5ed{]%U܎Ĩk츏;}cUw#HI+cIG~b xL͇a׻OS#|L:By}N{hU_ZKt3Rj+%]>p/le%YP hSWEۤA(a< icá VSbM9JiRW);+5+cg Ƕ8pgrK &y>uGLs:[ AKƠL5#Xbk#sh+kВ[LC wDX0†XW+KeL9vWA\<'rtdEMMA~lm"_ɚ}e!pHAG(g.$Z]e%u]hzI b)u:3i'Y@[0; u~C,ktziR0,[_2*8 r'P|^va$?EX:kLenExl7EʑOZ-#Ld.aEszbT`3n 5lgY%P^ }E)<*"vY7c8uPy@}Mv\8fIaԫt@0P{wA4h֠P)ptyűElmvث xi6ŒcQg|30i=k)0YZJ{=U 7C|4E*{\ڏ Yс|Mκ3q! Th_Dk)Y&[ۆJd,߹Ҕ#}]DhtMQ>?8PO[hz.˟ ̑7N`#XwRJ.vCIx608d;Ǎk.t0â;ZW]P.#(Cٚl] پ4(ig$#}X}񢤁 ԧ5[-BӆFP]W!6.Zh )eS@w8Dd\7w67 D"qWHkVeL92$ei]\|AtST84 4wܷ &2ok.-q¸#-|> endobj 49 0 obj << /Font << /F29 11 0 R /F30 18 0 R /F8 10 0 R /F14 23 0 R /F28 9 0 R /F27 8 0 R >> /ProcSet [ /PDF /Text ] >> endobj 54 0 obj << /Length 2331 /Filter /FlateDecode >> stream xڍXK8WQ"D$^` كlӶeCJ9ozɖ 0X|_}MLg7M*ӛ,͕6rs`W}ݵ~B(āw O-7~ =:Ta8Ee{F}-*i{ny"1v_Ǻ궋,q݄qTk~ԿGa.c[vT]UaMlc\&u(@ewY25= k0d N?kxcFQଧ&)eb]yOfLwu DGLxrC3,;14GIi(4) (!oO/)Ke|Qϣ4NÀ1mU75ȉqH7pǺjY'RGE_Ux#-3ĉ2I9LRs AS!XoFLǪ<3 jn?VkJ@жzV@9 cY;<5tlA6 J74_\E9GdQ@Ko3o^#*4i_E:,al{-n^,-<ߕa3ṆK-NtavSNS$tAك稕^_Z(^_[yXFkau{ Îege=k0Cp @D D5 k׽hc=M?mono'˩"cMyA8U/+;k /-eBN)] _5v:w\e:+&o!Y^׳hut5 .TWV~jNFJj<@Oe8eLIr$3- 3Cն?ri ';bol'pQp߮a#!HQ @B)3UD:peOROcuA0ƋY0U!dHX 8ڲj3$Ȕ̹<.R2s'=,!&TkyϦ @5"؎U"nR[u\&v $k98۞=DbQ#'A;/+] 9<"ȷP&S(x&{{~x {oJ PTSĈ[D6AaȔP"7; !;4㆖tCV[yY^\ 莣 ?]nlEJ &> A6AZR-Kw_YԷ凰Gx;FLGݼf86Uw’-ٍˑޞQ[ bDDUa& p=sbvonG M,IkHL/ku|E?yK=TY^'ܩn*&4l=nDVu{gZӔpf.Kk/vޤ/"(?=7>> endobj 52 0 obj << /Font << /F8 10 0 R /F30 18 0 R /F29 11 0 R /F27 8 0 R /F28 9 0 R /F32 55 0 R >> /ProcSet [ /PDF /Text ] >> endobj 59 0 obj << /Length 331 /Filter /FlateDecode >> stream xmOO0)z,TZovcbE=k%~z[Z{)oX]ը! g<'/+kVc;ld+{-7D(UюZ$%/$pJ]3@qT( PJ)iʘF'ځqF0%10CvOEn8fZi(U ?p2?>)T011H7Y( c( SFH; 'έa Qw-V} SI](-sF,hխXoO3 endstream endobj 58 0 obj << /Type /Page /Contents 59 0 R /Resources 57 0 R /MediaBox [0 0 612 792] /Parent 56 0 R >> endobj 57 0 obj << /Font << /F8 10 0 R >> /ProcSet [ /PDF /Text ] >> endobj 62 0 obj << /Length 2180 /Filter /FlateDecode >> stream xڽYKoHWHaIX Ml'2-R6ԒT<[|I-KsRYWU߿Z TF, .%M0:fB}=ːs\-O"e?,7YW˶XR ŦXuHbBb 7 o~GfUNպBi%Kw}GOJR&~>e<26,N5|bIp3,JҞ/w^>=ٟtXNL `<6=!,% YZT~ ,2R|:7xt;X:5Gأ3%f0Sdy S<6;N1ь߈JCZ 6#ґ4˾^{:EbE걋 p֑;a@c-\[0HY]XlT7kNGAUNm /[tY[ѶeE'i(_Vɺ=h VY <,C:6½/c WʹT=?, >~z`̰$+o|#F>V)A/_?\A >& d-LD~Om䩳:jDՄ9B,F~ _H&>y^H͙(<(Ҙ55\#a)^,0 Dʢ 3xX,05<1~=GbZ (|zFL̉uB^ f"yQ,VWfnG TM7آ:u=n}ҖĆ;@mHR3%s =l0 6eUx6zlD:*M -U]nߩC`kP TR]LW^Jp(=@Ƶ_JNRFCh?j ZLfpvɽgZ؝9]Bu8 [$<./"xAzO$ψ%eDB;mk*A"XSV=-FKHwP:QxX|^_ZY' eV/D(ɄJNE'_;D-CIP;!'ʼnbn\>j{-@YWyY=g|A E`4FS]YEǧ}l/P АD-8`;l}BaΔ jʫP Hݖ%54 OO%CaTg(y~eڸRiY5NBi$U>+d=ғ)Bx,MAyQbo%0#y휡s}hApHp } QP9vdS7c{zʒP?#r:6 < Ze.0$X'zm߿<Æ;=]r H8INq -8+0qWX@2p~silصeT걨&soDZ\`S}w [bN h@ԁmtj_uPdmi} k=r:+[o_EcɨֵcOhZfODre{g9ݐBu_ CñzgɵĒ7>KhaCvIC`fW=͍i7ݩL(z7 JE %jހӽDZX.Ny ~ KEӽt`.^X$$`i5zwuQ-a^ endstream endobj 61 0 obj << /Type /Page /Contents 62 0 R /Resources 60 0 R /MediaBox [0 0 612 792] /Parent 56 0 R >> endobj 60 0 obj << /Font << /F27 8 0 R /F8 10 0 R /F30 18 0 R /F28 9 0 R /F11 19 0 R /F29 11 0 R /F14 23 0 R >> /ProcSet [ /PDF /Text ] >> endobj 65 0 obj << /Length 1832 /Filter /FlateDecode >> stream xXKo6QbFW""=E7KYmʢG-;ádag[,zE7gd4 f`q,0f77'ݩJvY-kɽ~hh ]떤fZw}VF}^my-WQz3ڗ+YZKXRۢSJ]  K)U֩fVnVT\&,Ir\Q`EKٕV5Zwu>k>ۙ)zK6Z%1Kt9~!UqѻOT!ohz^? +~Iij-޷] _J\]7EiEl[R55dYtr 9~G;th?̣,# vu}.D Pa3 <`gBUݴ,if:TR4e9M.UL~U CCrC EسH7h7FERؘ1K/⻣4:LdeOOse-5(&`vʹ);CCljRIL]^5w iLaf_+jT0򬪬wWbgޓHۯUh-jtFc&GFKҢ X8O*\8d[uBݪJLq߰5}RP(9?)λҼ%\%0D/XcḱfoP/n\tq,pcb! :z| F 2{OڂqED@, M~Cj"ofvp@1նI|u挡&W @ƾ},x0x'ݶ;9a`L0 bb; .6R-f{y4t0,Tx,E6SܷؓJgաm$ TQ/?׆Q7.nHϝ8=@N1bYzhaP9_:ǂٕIx&Os)4ʿ{$~X!x$9צ<±7߼p endstream endobj 64 0 obj << /Type /Page /Contents 65 0 R /Resources 63 0 R /MediaBox [0 0 612 792] /Parent 56 0 R >> endobj 63 0 obj << /Font << /F8 10 0 R /F28 9 0 R /F30 18 0 R /F14 23 0 R /F29 11 0 R /F27 8 0 R >> /ProcSet [ /PDF /Text ] >> endobj 68 0 obj << /Length 514 /Filter /FlateDecode >> stream xڍSMO0>v>ӂJ*+P!l&^9qƕJpN޼{~=Wgxd".%+2ʳ Eu$99lh,w7W ˨bU.r?DǎS~L wRUi)V)i%z{]?|RҌ'ӊE c 54%QS!h/$gqI!l:ԫSvl04c®G Fq0fUfoLɉri>zAuz< n}%Kbׇ^YːJNp 2/ sZZC$K.ъHKZBUV?#R#$a$!5$(aNl3 RLs^4V}g 9{uu=9f)C.H Hz&]}Εt{zI!-SX;B_*y"UJx{Mv endstream endobj 67 0 obj << /Type /Page /Contents 68 0 R /Resources 66 0 R /MediaBox [0 0 612 792] /Parent 56 0 R >> endobj 66 0 obj << /Font << /F27 8 0 R /F28 9 0 R /F8 10 0 R >> /ProcSet [ /PDF /Text ] >> endobj 71 0 obj << /Length 1779 /Filter /FlateDecode >> stream xڽX[o6~ȣ Tx{vˀ%E>ks,OqRlؓC;wt;. \$f}A9'*Tqyq_|ZeD)׿]~;}aIXG⋈Qui[|1q"[FNj}t_FL-Q.%]~m#@`fiG,bwޢnjTkw.uS8#ŧz(s/j0tkw.-[9񛏫8f喪W`u N98#202ꏫ˕;+Ъ4pohmsEbP-cA8!qZk~J̺ Q}ʂD ,B10ym.# 029H%\ DBԅO(˙4%)ÝBHH͔' _OD45k^C-ުI8tY& PyN q}6͉Hל ko ؇HDoDDLx}մ>XT< бק1M^ELSsHHٜtG߮||sy}\ Y%bp7W Fw1ݥ"mS.t+(m~[MHߡ?cIYm59f\ 0mT5f%8 l]t!ݶ0JX0L*',%~ٚ67hqn 7h. !_,Z&^()'!r߄u[04{G$`ϦߗUwP ~V4MZ?)O~@T,Z!LJO8;whR#l_[Bn<GXā3%L-@Œ%>:ۍmD.OؼWXr ijC:gH _Oc=ۅUٯZ08.ҺLݥ~l׫ ~Sf:8&3M|<:6_+n- I`Tٴ}uwI\]LRK]y=8>2+FIMՐӮ̾+ظCUANYG#({OcDK9"~ \HA$'6A3<7^*i[d >t>U~׻b"k#U$yl7HltP41چ32`Y0Ͱo1:37pFGfqڷؤָPHhT&ِ)JLC:"*ehxcwÉi_ !EcO+Fl73ց0x2$l y Bku2ErTT^a"]ʄ @pWNrtыM>/D[[FN5bC1&fPˎ{uxL QP6Dָ͋r endstream endobj 70 0 obj << /Type /Page /Contents 71 0 R /Resources 69 0 R /MediaBox [0 0 612 792] /Parent 56 0 R >> endobj 69 0 obj << /Font << /F27 8 0 R /F8 10 0 R /F30 18 0 R /F28 9 0 R /F29 11 0 R /F14 23 0 R /F33 72 0 R >> /ProcSet [ /PDF /Text ] >> endobj 75 0 obj << /Length 1718 /Filter /FlateDecode >> stream xڕXK6#--6`@Qe%RvP IѬ{ӡtTs:)q;JD0飙ENW2e,)f˫ȴ-(391,mgޑvm(zLpp>uFFAsn DEh f~/y=0 KnpC-naSs 苿A(XݸTJBLBnPJ[I'dSy>0m4W:B!I$y]R(_({I`Sݵisq^D1V #60%H,0rIX_j>;8"<fn r4Z=Mz$c^Ky)j٘l =H f e V(Q)qI,m hmeA[NUV "𷎨-HcЏhu;N};k ϸ 2DhV4-Sd`Խ՗q/`/8g-eݰB+YC)$e'V"gE Ait 01ئ4n n"n!wrH ĭ^qdFؚ tp]X"C-ˡ{Uɏ< bʷpAi6-OJ`2Ά@{4@*oUٶ_!Gmz`[p?Ժ] q~+Fa=b4 ܐdnxȀ խ޾1@#J ^ihy.y|6ἈI'uq[ EC t~-yx/_@RCc:N,"=ʉ T1AQڎ:VBZg,s#s54V}m`i *oEa#)"Dܛe~"s\^j_w7:J^?\p^蕨dum}@=/rb۩*3U Dڵ`*tn8iܽκJIHm0'Nld{ &t{Nɘu6lAf405{P1P3,ĺVa)꯽}IU4UgR\N4Ւdi풘V- y|0Onv.TVX,}RK$rIK;/@Qx 3b+&^{KԆ·?y-yFXɛ?v 4F1E8NLh㻏w\PW endstream endobj 74 0 obj << /Type /Page /Contents 75 0 R /Resources 73 0 R /MediaBox [0 0 612 792] /Parent 76 0 R >> endobj 73 0 obj << /Font << /F30 18 0 R /F33 72 0 R /F8 10 0 R /F29 11 0 R /F28 9 0 R /F14 23 0 R /F27 8 0 R >> /ProcSet [ /PDF /Text ] >> endobj 79 0 obj << /Length 832 /Filter /FlateDecode >> stream xmTߏ8~߿"D8=nulK =6,C3.GE_䛙o{2Lfo8 ;iD׈2;X/CGnOA:2nTe{F0 BJKDK/W3 )=RJs)тrۦ1_m\ .iSX#M在dN^SDC*[d5nN$hUi ' ջU Drہ5jgGO2ڛib{ƃ)9mwn˜d;IW_ֺfP;cE LE/.uԱ ҋWgop&ّ!c~Çm_Fw`x$@;Sn4n+'cڟ`1 :!#J sQщMk:i^06{+끂sYjIgϒ$x|V~4/zg R)mU3cѲ7WkQNiaPkf0tZEZlb^Gu?4 VҪQi9nޭ )2[h3Lh!(%pP-ocҗ:=֦F<;G5NZMEkO3yTǕUT$?/^?˿T endstream endobj 78 0 obj << /Type /Page /Contents 79 0 R /Resources 77 0 R /MediaBox [0 0 612 792] /Parent 76 0 R >> endobj 77 0 obj << /Font << /F27 8 0 R /F28 9 0 R /F8 10 0 R /F29 11 0 R >> /ProcSet [ /PDF /Text ] >> endobj 82 0 obj << /Length 1380 /Filter /FlateDecode >> stream xڵWK6W=bXr&MnMP$9""Ek8;#^[n=ų/ xA$lY'" nlrSp/Z/K+m҂(]Bd+h@{qǯn'HӡmQQXxT!Ìf6jƾ2Wh%]0X 4 //z\ı=RG~j5Ӄ7VVs>D!ʝ+[o5|MI0J?)lKw͸phM#4-''oY/Ǧl{ Ǧ`&Df!h=mˮz@GwB#j}?%㲬Zt z44u.=]<W endstream endobj 81 0 obj << /Type /Page /Contents 82 0 R /Resources 80 0 R /MediaBox [0 0 612 792] /Parent 76 0 R >> endobj 80 0 obj << /Font << /F27 8 0 R /F8 10 0 R /F29 11 0 R /F34 83 0 R >> /ProcSet [ /PDF /Text ] >> endobj 86 0 obj << /Length 1273 /Filter /FlateDecode >> stream xWK6p-bm)[dM!uID[Ҥ@R5 ER&m/=kff8#zuWLJTq>Y&Qy^Ll$,ǀ,I@-UTp3K!n@Wwqy4,QRЪ#Ox22mD1y,ti~Z$3ѱڢ199* PV,/_bneatx0(.[`A1Mz(FQQ [zn8NQ%̧0Jq65S NƢT٥l0_v4 e4I2^l, *Mj;n$gI:Q9O iQ|U!\W +qQk%KM+F=6+^ҊhFZ7{3Ӣv~P\Lч}u [ Qx$Í`ֺ9Sg1MAlgoMW 7/Kք&2f>3QLD`]pwrg.(`>v[{^hbGx6)vJ7Kf̎c9hS/B+yJl860735\vCjL!]Β@>ڒ>o]0'-Ɇx7׌ֵbg VD*mD!C/v-''KfS37~}{y-Ji3?doX!U#0Mi6j+|EfrenIAtNU u!N>!wi$M+tP-QF^^y̮aȑ{&2#!T3#XFqCn31:_wTގkWTMU$l%E+%AIav*MM/^(M!ƑQ/3\m+JW>3] yI%Sv6ăwT+bqKmnS徸q`w*?&/#IGÕ]+r> endobj 84 0 obj << /Font << /F8 10 0 R /F29 11 0 R /F34 83 0 R >> /ProcSet [ /PDF /Text ] >> endobj 89 0 obj << /Length 1188 /Filter /FlateDecode >> stream xڵX]6}_T  fD*ͮfiypI1|AV&sν/ n>LQgd<ˎ8 ;뛶vإH׈,=õݮ!x0OT8؈8Z ,9?v5a:oRI3rTISj,gPD-s%/J9Hmzm=Cv&GQ7GHJt)Ʉ @+ףxE!9(cYTtA3G3[ baDecZv*~E? R\nf\iaAqBK F|E0 IKXj=j-bdG YaF"\ޟS#M* ĺ,;!rds v`Tym4 Gg-h+1LLӄ1W57g]CRFk+^*j~t@~Aՠ\/1JZS/̙БYD5FNAEDp GT!}T得_o]G'縪f,!L9hW}F%75HQul10E0n695̿x<7`=m9WvwM5?93 CTcDqTePŐN+|_ KRz*~OFr=}x\t gr;h~.zIij΋%b:t1Uđy[=Ѡ[8dԹTWήk"uelٓJWQZyZԅ\vb"d (2~)Dy5Vl/Z@ǯkFvuVRH2(+B*gB*,]mdU׏9xKsIoH=dG!Zϼ^U&@ ?ra^s J[d `C(m[IObnt\["]l$K!jzeQ aj\eu펜4Ze> mlZ^%_3-bZG̓9&5VvKR*"YJQNJl8ay9ݎ*,ۑ/L)̀ endstream endobj 88 0 obj << /Type /Page /Contents 89 0 R /Resources 87 0 R /MediaBox [0 0 612 792] /Parent 76 0 R >> endobj 87 0 obj << /Font << /F29 11 0 R /F8 10 0 R /F34 83 0 R >> /ProcSet [ /PDF /Text ] >> endobj 93 0 obj << /Length 873 /Filter /FlateDecode >> stream xڥVK0H/U6Y @o[Խ kM%fY?yP0mI#ҍx}'zE.YTzhC-֑.4}KM.oJ2i `WU@@%71MPL4d.OUe*.y$[N> endobj 91 0 obj << /Font << /F34 83 0 R /F8 10 0 R /F29 11 0 R >> /ProcSet [ /PDF /Text ] >> endobj 96 0 obj << /Length 320 /Filter /FlateDecode >> stream xڕQn {$R!`תܪ`%Nʏ> endobj 90 0 obj << /Type /XObject /Subtype /Form /FormType 1 /PTEX.FileName (./example-diff.pdf) /PTEX.PageNumber 1 /PTEX.InfoDict 98 0 R /BBox [0 0 595.276 841.89] /Resources << /Font << /F17 101 0 R /F16 104 0 R /F18 107 0 R /F22 110 0 R /F23 113 0 R >> /ProcSet [ /PDF /Text ] >> /Length 2711 /Filter /FlateDecode >> stream xڵZMoHWpo"l;6b0;Dʒ+tjŖ(vcuuի*Ż ' əWi]X0\Å/ۻu}YB@ /ˋE!=THY X^/V3|z[hͼ.~g # V 4վ)V0rZQT$}<,Q x0G_5bz>VZ7²Imͭ/6nNnK;]}!4S'0B[汫 e[.mi Jg\6ZVsf[5:a_7\LvD8&&Ʊ`B0b:7s%ffb_#+Lea{iTswyW^V̥GzezmI^1twIŜQ}zI 8dJx3 6p*7 x7ՎuOAT$]J50>Rzu5_g=7}x?x] XQ``XuT5?vW\޼y L^S5f_w|6bf[h?kwC!xySBCUM[߭ZslzbZq`KXdpޖ>rPz;A%daQJQTsVn]'лݖXNu`+c=AvqC$;7/9/CeA%XS2 Iu6RJ{~>z6y}`nJ§ʣi Ѡ˦]եƅrf*߹X?ρIc-:- OQ&GHQى3BB&|W6uS$L)9М %@j9)=0#Bj rkUYHj8d N·X)M !:T Nqs˶!J ο&/PlA.׫[_4wʺH5'JFd$]ն('MYwԫ]RUawW.+W jH@BdĮR,GhWufp _K` ?ubIh#$ EG,Se O.2! 7?ٗ@1Q됙˘vzKe5s&5&Cp>|K4"|b'ib:3S >rvAA_ 5Pr(lCw TrS *s7af8Aqj.G>co%}abQٟcIs6H?3nogjui@mַE> j-sPAeR)N$8y5@dVbhY#i;pz!! NޖYJN.FCr!~݄/ܪQʞQLf\N,T2S9@ D!-#lΫ)w^gI8䶅s 29ifIȠ [8G_a IJ(NC  s2v1\ME/C۞IM| BS%1M4aRTN29wȱ l326y&[܈)gT$pqJ18*fK-*'Sz4k9MM58SZU^h7z5dۼN-¹ZSd!8H)IapnT֡Ί("h0W3!ee~^;VSXuc7[eƵ$g@6_mSoH ,{>u{hPAJ~੾=NӡfmCxzma:oXzhܓ7-E(sX> endobj 101 0 obj << /Type /Font /Subtype /Type1 /FirstChar 11 /LastChar 120 /Widths 114 0 R /FontDescriptor 99 0 R /BaseFont 115 0 R /Encoding 100 0 R >> endobj 104 0 obj << /Type /Font /Subtype /Type1 /FirstChar 58 /LastChar 58 /Widths 116 0 R /FontDescriptor 102 0 R /BaseFont 117 0 R /Encoding 103 0 R >> endobj 107 0 obj << /Type /Font /Subtype /Type1 /FirstChar 11 /LastChar 121 /Widths 118 0 R /FontDescriptor 105 0 R /BaseFont 119 0 R /Encoding 106 0 R >> endobj 110 0 obj << /Type /Font /Subtype /Type1 /FirstChar 65 /LastChar 117 /Widths 120 0 R /FontDescriptor 108 0 R /BaseFont 121 0 R /Encoding 109 0 R >> endobj 113 0 obj << /Type /Font /Subtype /Type1 /FirstChar 45 /LastChar 120 /Widths 122 0 R /FontDescriptor 111 0 R /BaseFont 123 0 R /Encoding 112 0 R >> endobj 114 0 obj [ 525.4 499.3 499.3 748.9 748.9 249.6 275.8 458.6 458.6 458.6 458.6 458.6 693.3 406.4 458.6 667.6 719.8 458.6 837.2 941.7 719.8 249.6 249.6 458.6 772.1 458.6 772.1 719.8 249.6 354.1 354.1 458.6 719.8 249.6 301.9 249.6 458.6 458.6 458.6 458.6 458.6 458.6 458.6 458.6 458.6 458.6 458.6 249.6 249.6 249.6 719.8 432.5 432.5 719.8 693.3 654.3 667.6 706.6 628.2 602.1 726.3 693.3 327.6 471.5 719.4 576 850 693.3 719.8 628.2 719.8 680.5 510.9 667.6 693.3 693.3 954.5 693.3 693.3 563.1 249.6 458.6 249.6 458.6 249.6 249.6 458.6 510.9 406.4 510.9 406.4 275.8 458.6 510.9 249.6 275.8 484.7 249.6 772.1 510.9 458.6 510.9 484.7 354.1 359.4 354.1 510.9 484.7 667.6 484.7] endobj 116 0 obj [ 833.3] endobj 118 0 obj [ 571.2 544 544 816 816 272 299.2 489.6 489.6 489.6 489.6 489.6 734 435.2 489.6 707.2 761.6 489.6 883.8 992.6 761.6 272 272 489.6 816 489.6 816 761.6 272 380.8 380.8 489.6 761.6 272 326.4 272 489.6 489.6 489.6 489.6 489.6 489.6 489.6 489.6 489.6 489.6 489.6 272 272 272 761.6 462.4 462.4 761.6 734 693.4 707.2 747.8 666.2 639 768.3 734 353.2 503 761.2 611.8 897.2 734 761.6 666.2 761.6 720.6 544 707.2 734 734 1006 734 734 598.4 272 489.6 272 489.6 272 272 489.6 544 435.2 544 435.2 299.2 489.6 544 272 299.2 516.8 272 816 544 489.6 544 516.8 380.8 386.2 380.8 544 516.8 707.2 516.8 516.8] endobj 120 0 obj [ 849.5 799.8 812.5 862.3 738.4 707.2 884.3 879.6 419 581 880.8 675.9 1067.1 879.6 844.9 768.5 844.9 839.1 625 782.4 864.6 849.5 1162 849.5 849.5 687.5 312.5 581 312.5 562.5 312.5 312.5 546.9 625 500 625 513.3 343.7 562.5 625 312.5 343.7 593.8 312.5 937.5 625 562.5 625 593.8 459.5 443.8 437.5 625] endobj 122 0 obj [ 514.6 514.6 514.6 514.6 514.6 514.6 514.6 514.6 514.6 514.6 514.6 514.6 514.6 514.6 514.6 514.6 514.6 514.6 514.6 514.6 514.6 514.6 514.6 514.6 514.6 514.6 514.6 514.6 514.6 514.6 514.6 514.6 514.6 514.6 514.6 514.6 514.6 514.6 514.6 514.6 514.6 514.6 514.6 514.6 514.6 514.6 514.6 514.6 514.6 514.6 514.6 514.6 514.6 514.6 514.6 514.6 514.6 514.6 514.6 514.6 514.6 514.6 514.6 514.6 514.6 514.6 514.6 514.6 514.6 514.6 514.6 514.6 514.6 514.6 514.6 514.6] endobj 112 0 obj << /Type /Encoding /Differences [45/hyphen/period 62/greater 68/D/E 73/I 76/L 78/N 82/R 85/U 97/a 100/d/e/f/g 105/i 108/l/m 111/o/p 114/r/s/t 118/v 120/x] >> endobj 109 0 obj << /Type /Encoding /Differences [65/A 73/I 89/Y 97/a 99/c/d/e 104/h/i 108/l 110/n/o 114/r/s/t/u] >> endobj 106 0 obj << /Type /Encoding /Differences [11/ff/fi 33/exclam 44/comma 46/period 48/zero/one/two 54/six 58/colon 65/A 68/D/E/F/G/H/I 77/M/N 83/S/T 87/W 89/Y 97/a/b/c/d/e/f/g/h/i 107/k/l/m/n/o/p 114/r/s/t/u/v/w/x/y] >> endobj 103 0 obj << /Type /Encoding /Differences [58/a58] >> endobj 100 0 obj << /Type /Encoding /Differences [11/ff 45/hyphen 68/D/E 82/R 97/a 100/d/e/f 105/i 108/l/m/n/o/p 114/r/s/t 118/v 120/x] >> endobj 94 0 obj << /Font << /F8 10 0 R /F29 11 0 R >> /XObject << /Im1 90 0 R >> /ProcSet [ /PDF /Text ] >> endobj 126 0 obj << /Length 1023 /Filter /FlateDecode >> stream xVK8 ϯ5e]l^ˢ݃&Vbe$A(9qY^(m>> dƳf`yV,4g\M]OHQ# @26-[$^vtyd4%/"J]L?g-ZTK[q\Ĺ^GبA]^,fBdpũh=tƠ/ݓV["-d>tͅ.Y}0[@zt0 ~EsWXA]M#gY6 jYKvӌeƠv"HYs}G;(Qc.9axk; OGiBqGz])Lv\8We9[{U2w˅ %4SWHsΤSrK'O!F":S=T^i%&-7YdH$[{[2x.y3 CQ}w}w:;SV*:Uj"(i,ѬCJvk$g ?zî]s*@$\aBL N`yL?ER?GkN$s#ћ*7}gȗ!85:%| .~Nq {1EVO no?V),?Wp@Lv8+i~hy3JSϥ`z\5~ynH }+qqqw`> ؛ ӪqnO5d33, \>".e.O"O~@D >m7 endstream endobj 125 0 obj << /Type /Page /Contents 126 0 R /Resources 124 0 R /MediaBox [0 0 612 792] /Parent 97 0 R >> endobj 124 0 obj << /Font << /F8 10 0 R /F29 11 0 R /F34 83 0 R >> /ProcSet [ /PDF /Text ] >> endobj 127 0 obj [531.3 531.3 531.3 531.3 531.3 531.3 531.3 531.3 531.3 531.3 531.3 531.3 531.3 531.3 531.3 531.3 531.3 531.3 531.3 531.3 531.3 531.3 531.3 531.3 531.3 531.3 531.3 531.3 531.3 531.3 531.3 531.3 531.3 531.3 531.3 531.3 531.3 531.3 531.3 531.3 531.3 531.3 531.3 531.3 531.3 531.3 531.3 531.3 531.3 531.3 531.3 531.3 531.3 531.3 531.3 531.3 531.3 531.3 531.3 531.3 531.3 531.3 531.3 531.3 531.3 531.3 531.3 531.3 531.3 531.3 531.3 531.3 531.3 531.3 531.3 531.3 531.3 531.3 531.3 531.3 531.3 531.3 531.3 531.3 531.3 531.3 531.3 531.3 531.3 531.3 531.3 531.3 531.3] endobj 128 0 obj [674.4 703.9 1044.7 1059.4 355.6 385 591.1 591.1 591.1 591.1 591.1 948.9 532.2 665 826.7 826.7 591.1 1022.8 1140.5 885.5 296.7 386.1 620.6 944.4 868.5 944.4 885.5 355.6 473.3 473.3 591.1 885.5 355.6 414.4 355.6 591.1 591.1 591.1 591.1 591.1 591.1 591.1 591.1 591.1 591.1 591.1 355.6 355.6 386.1 885.5 591.1 591.1 885.5 865.5 816.7 826.7 875.5 756.7 727.2 895.3 896.1 471.7 610.6 895 697.8 1072.8 896.1 855 787.2 855 859.4 650 796.1 880.8 865.5 1160 865.5 865.5 708.9 356.1 620.6 356.1 591.1 355.6 355.6 591.1 532.2 532.2 591.1 532.2 400 532.2 591.1 355.6 355.6 532.2 296.7 944.4 650 591.1 591.1 532.2 501.7 486.9 385 620.6 532.2 767.8 560.6] endobj 129 0 obj [525] endobj 130 0 obj [500 500 388.9 388.9 277.8 500 500 611.1 500] endobj 131 0 obj [777.8 500 777.8] endobj 132 0 obj [670.8 638.9 638.9 958.3 958.3 319.4 351.4 575 575 575 575 575 869.4 511.1 597.2 830.6 894.4 575 1041.7 1169.4 894.4 319.4 350 602.8 958.3 575 958.3 894.4 319.4 447.2 447.2 575 894.4 319.4 383.3 319.4 575 575 575 575 575 575 575 575 575 575 575 319.4 319.4 350 894.4 543.1 543.1 894.4 869.4 818.1 830.6 881.9 755.6 723.6 904.2 900 436.1 594.4 901.4 691.7 1091.7 900 863.9 786.1 863.9 862.5 638.9 800 884.7 869.4 1188.9 869.4 869.4 702.8 319.4 602.8 319.4 575 319.4 319.4 559 638.9 511.1 638.9 527.1 351.4 575 638.9 319.4 351.4 606.9 319.4 958.3 638.9 575 638.9 606.9 473.6 453.6 447.2 638.9 606.9 830.6 606.9 606.9] endobj 133 0 obj [295.1 354.2 295.1 531.3 531.3 531.3 531.3 531.3 531.3 531.3 531.3 531.3 531.3 531.3 295.1 295.1 295.1 826.4 501.7 501.7 826.4 795.8 752.1 767.4 811.1 722.6 693.1 833.5 795.8 382.6 545.5 825.4 663.6 972.9 795.8 826.4 722.6 826.4 781.6 590.3 767.4 795.8 795.8 1091 795.8 795.8 649.3 295.1 531.3 295.1 531.3 295.1 295.1 531.3 590.3 472.2 590.3 472.2 324.7 531.3 590.3 295.1 324.7 560.8 295.1 885.4 590.3 531.3 590.3 560.8 414.1 419.1 413.2 590.3 560.8 767.4 560.8 560.8 472.2] endobj 134 0 obj [638.9] endobj 135 0 obj [525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525] endobj 136 0 obj [583.3 555.6 555.6 833.3 833.3 277.8 305.6 500 500 500 500 500 750 444.4 500 722.2 777.8 500 902.8 1013.9 777.8 277.8 277.8 500 833.3 500 833.3 777.8 277.8 388.9 388.9 500 777.8 277.8 333.3 277.8 500 500 500 500 500 500 500 500 500 500 500 277.8 277.8 277.8 777.8 472.2 472.2 777.8 750 708.3 722.2 763.9 680.6 652.8 784.7 750 361.1 513.9 777.8 625 916.7 750 777.8 680.6 777.8 736.1 555.6 722.2 750 750 1027.8 750 750 611.1 277.8 500 277.8 500 277.8 277.8 500 555.6 444.4 555.6 444.4 305.6 500 555.6 277.8 305.6 527.8 277.8 833.3 555.6 500 555.6 527.8 391.7 394.4 388.9 555.6 527.8 722.2 527.8 527.8 444.4] endobj 137 0 obj [613.3 562.2 587.8 881.7 894.4 306.7 332.2 511.1 511.1 511.1 511.1 511.1 831.3 460 536.7 715.6 715.6 511.1 882.8 985 766.7 255.6 306.7 514.4 817.8 769.1 817.8 766.7 306.7 408.9 408.9 511.1 766.7 306.7 357.8 306.7 511.1 511.1 511.1 511.1 511.1 511.1 511.1 511.1 511.1 511.1 511.1 306.7 306.7 306.7 766.7 511.1 511.1 766.7 743.3 703.9 715.6 755 678.3 652.8 773.6 743.3 385.6 525 768.9 627.2 896.7 743.3 766.7 678.3 766.7 729.4 562.2 715.6 743.3 743.3 998.9 743.3 743.3 613.3 306.7 514.4 306.7 511.1 306.7 306.7 511.1 460 460 511.1 460 306.7 460 511.1 306.7 306.7 460 255.6 817.8 562.2 511.1 511.1 460 421.7 408.9 332.2 536.7 460 664.4 463.9 485.6 408.9] endobj 138 0 obj [625 625 937.5 937.5 312.5 343.7 562.5 562.5 562.5 562.5 562.5 849.5 500 574.1 812.5 875 562.5 1018.5 1143.5 875 312.5 342.6 581 937.5 562.5 937.5 875 312.5 437.5 437.5 562.5 875 312.5 375 312.5 562.5 562.5 562.5 562.5 562.5 562.5 562.5 562.5 562.5 562.5 562.5 312.5 312.5 342.6 875 531.2 531.2 875 849.5 799.8 812.5 862.3 738.4 707.2 884.3 879.6 419 581 880.8 675.9 1067.1 879.6 844.9 768.5 844.9 839.1 625 782.4 864.6 849.5 1162 849.5 849.5 687.5 312.5 581 312.5 562.5 312.5 312.5 546.9 625 500 625 513.3 343.7 562.5 625 312.5 343.7 593.7 312.5 937.5 625 562.5 625 593.7 459.5 443.8 437.5 625 593.7 812.5 593.7 593.7] endobj 139 0 obj [531.3] endobj 140 0 obj [272 326.4 272 489.6 489.6 489.6 489.6 489.6 489.6 489.6 489.6 489.6 489.6 489.6 272 272 272 761.6 462.4 462.4 761.6 734 693.4 707.2 747.8 666.2 639 768.3 734 353.2 503 761.2 611.8 897.2 734 761.6 666.2 761.6 720.6 544 707.2 734 734 1006 734 734 598.4 272 489.6 272 489.6 272 272 489.6 544 435.2 544 435.2 299.2 489.6 544 272 299.2 516.8 272 816 544 489.6 544 516.8 380.8] endobj 141 0 obj [600 550 575 862.5 875 300 325 500 500 500 500 500 814.8 450 525 700 700 500 863.4 963.4 750 250 300 500 800 755.2 800 750 300 400 400 500 750 300 350 300 500 500 500 500 500 500 500 500 500 500 500 300 300 300 750 500 500 750 726.9 688.4 700 738.4 663.4 638.4 756.7 726.9 376.9 513.4 751.9 613.4 876.9 726.9 750 663.4 750 713.4 550 700 726.9 726.9 976.9 726.9 726.9 600 300 500 300 500 300 300 500 450 450 500 450 300 450 500 300 300 450 250 800 550 500 500 450 412.5 400 325 525 450 650 450] endobj 142 0 obj [525.4 499.3 499.3 748.9 748.9 249.6 275.8 458.6 458.6 458.6 458.6 458.6 693.3 406.4 458.6 667.6 719.8 458.6 837.2 941.7 719.8 249.6 249.6 458.6 772.1 458.6 772.1 719.8 249.6 354.1 354.1 458.6 719.8 249.6 301.9 249.6 458.6 458.6 458.6 458.6 458.6 458.6 458.6 458.6 458.6 458.6 458.6 249.6 249.6 249.6 719.8 432.5 432.5 719.8 693.3 654.3 667.6 706.6 628.2 602.1 726.3 693.3 327.6 471.5 719.4 576 850 693.3 719.8 628.2 719.8 680.5 510.9 667.6 693.3 693.3 954.5 693.3 693.3 563.1 249.6 458.6 249.6 458.6 249.6 249.6 458.6 510.9 406.4 510.9 406.4 275.8 458.6 510.9 249.6 275.8 484.7 249.6 772.1 510.9 458.6 510.9 484.7 354.1 359.4 354.1 510.9 484.7 667.6 484.7] endobj 143 0 obj << /Length1 1416 /Length2 8835 /Length3 0 /Length 9656 /Filter /FlateDecode >> stream xڭeT֮q/nKqbIwwZ݊S r}ݞ=#\kk{̌J5M K9P pr%8h44R.@3-$m 88@s+-΋F;yZ@R @[ 3@ bt0sh-l/V@ +hɊֶ́ 4<)/[9O 5MԤ%Z^n*fWW*Nn @l tTos`uBd{Uhf X9YheMAQ^UM鿂jf sahw\l=r@<a2 - 0sq1B=PplA@O꘍@-X]P^?K&> Z)!~ljEqش4A6?!y!nhN 5;Ԃ_`rvx6?Xm B/ _/' /ttBBhg3ha)aP-+ u' tub\Pn`ߓG \Bh?bI0DZ_W=Bh^=e`O.pBp?J 7 0[BGZ-[٥6O!2JZ7ũwu.:sfܨӻ/Gܧx$uhU=nBw&qVuvc4I`Q5JC ^>= :Z.J 40u@Pf p}>JN{; HWER>ސݬٍ_'٪H e<=Zv[wGIǺDt:LjYjvS/-Q:BL蠌CT>aDby-ftlÄ0>!ސ؆XˠCT#{_inBd4s iwwNg KX#?J\Lkgf5f'8_KqāPOY !8Gno6ca@P/(=Dl<6a7l󻽋^w`a AWo<`Y}#L@e\F7rNmV- v~co#wv^wf+)Q!4#p'U@%=TAb1+u(lbq-raqQB?S 6q%Ǐg/Jg>!c^q a%̙kZP]q9a'bĎw8_>LSʊs.iKNS.8~(|4+U+*x3aS>,ANV;V!}Ёt@舼,JS[usU`SDI@dZ?4ғ8]ݖ-3@joVhg-ًuo\ǸMų檸[arjpdGNP [%ry?ිQGԁin|o";]ֺRA5sg?˨ԶHpfN<]a=̇O9sґWIݩDmcna4jQ$\ջ 2z9\6iR73]4Z6cϓVnKܖ:˘HDZ{K}?KA]ZJdIӾ>u-gq"7( ƩCO/RV-̏6 |HwMO/~ dr :&nOK PIїӸX G;֞}pObYK'yn2MY|T/MA &nt2tWFgRzQ ƞz->S{ӥ$5izev~,Ҥ͹j̡ޒvd܏&X$įFP)%J.qs٘;ʗ 7V@?FT 4#bR>fUw}hvtg6d9H4\_;(XZK-;Do_T}jq_RG)>Jm?A~||hMd}\OJޥ4mXxwVń3XFb58Gކt-;QF/gx^P蕼'ߩnsP9_ߺ|Xفw/džgMYBqIH+ct`EmJ}d:$1 [ζNZ95/wHE:7GbsH"/LhU0UfT-'eUR&\a`N.C^p+`Cۧs`;LvU=7[?LZIaYUf;|NqZ;UyhQw?)(o 5tu@EJdLￔI?豸M('C w[ۼBMP\vG4@')tnńAʪ96ۜ/4x^ZuxҶ$([PIJC %4%s5%zP}z ;zd^ ,,cᓱLC ?+:>#B[@)By!6B!\&\Y\.Zd մ}f&|U u8xy|uwl;["U}be:/8{K "c/'9׾!2aA]9\"UlPATv|gxμ+ק_2yt뮱,:?sQqWQ_2PL#2}q13XD`̾/T{h0b&6K@ZLZ.{۶\5<ԡZjc L{m0US8Zh% DMܷZ z4+L* F> w}.k4 ";vZK4indDʰsg)!ЗeDl+~mFr?3v,ŨeSү\1$7# }쏎elpg>HZ.LFS+M<NAD$?l=L]B(ڊ1o_l\KPBX}ΐaNm#Z Z)j J F}=Hl:G"}$d("(I; !6do܎P(C6ՏN]w:HA °:KaL.+]`, /Y+0yZu,MG@1c|elEfiY%Sf/ DJ64 Wd4Yr9ΒvqTSH&+nEaS@2~PcxSXuLVa0dΈ$u2)s`OeXMtaΧ_;"5qV'$| sMǨ JVˬ&rq`M+,@Z`l+ %C2s5ƯpOrVABq7 hugIg'@_znO|V#U}"1ZPUz|J/w&>I$??X U۫< Y#̿v %/^R2,Rڎ}X4ż}g SR84Rj9 {gMo#brmy`V%;fUfCb6T ]_j0&1cHrFHî=g<,];Vϳ D9~X/ֺn'O8h&t .;+k\bi+D ٍAv+ -R8K㫾I%Sm}euݷm֌$1Svan%E_Ȭ5ޏ_6 2~| 3272׉r!dTa =vX]_ZA'F1 ^Vu?oqMpoyy@#@d-BA4$ތ1e orkVRzg s W/(DUi% $#Q֏\jyaf3#g+N޿xԧLB1Z?d"R]5\L%^ۏcX3%oY"n⩄L{!ӥIVat|}fh񌕸+s'#Y*|XbM:JvDw˻$m Fߧ_PT{W_tWP t(O?9i(PfS /It6P6BP/SVNq&#u\"(4kNtƭɊ H4,p)t Z UQӯJ7un`ǎZjaz L.MP}OHx펫͍|F*pIYG:P?3#1ܯذ#̦8F]s |j43yi%PnɎ)aD!^ "–,2/r|Ӥ;!#͖'fsHSgp81ζZ&9&w9u|͋U'2{m7,jCS9̢CA 3S$Z|IY591Ur Ģ83C\/ͷ~fO˶9^u13vۙ_䫑_ ♩Htzr9]5u= 6:+cGWF)e~ )R,=)xRY[rY&:%xnEpVCJ C(p ըlxQݣmN^Sm%bg7$%z4 uԙq. O8>'+$VJW$\|d+g<L僞E\sS↝ %0+{pbH {ib7~dփ"RZ-+~L%&XTh뼡S6+vm7F,6&+Wn-芬+6@>0?CJN9G]MqgKZy:*;!kwl&iIw%kS F<՘ko ^h{f٦(>6h0U#`4%~V2B;()M영CM!^7ض7h  r>ۇ@x2'+bA 42y&󤻰aYg 0g;<4<[ *:p-*/|v-Ii#myf"+>weW(\ J%"9x=^Y#ITȢen)H%Fd jM\8%<<^Z3wTjfץTs)KӬjVZ[nPş0->h ;f#!.U5d`C&r橥Vf99pP3F73U vxW(RԤkIHmBp.x6{ ѝAcMNvǥ26tj 5pq JIrCWso@X}[N&N8DhJܾ?>9z57TΌk!w5:4}Oc5= K[4з#VWc*1, O;yՄw;| Xm*o&lX?5X!]S|kݎ5A~ZO8c_skk/BIqŀhݨw`o9_Ew /4\XOٍyKϷ># ޹CJWݴҫzO=hbiZ*0l4R=']bSC0RwWܰGfsueUb˧CFߏ+GરpXf K m84|<0 2‰ZIy}i+ԚMOng@Ѫ<_|iFsqAICplxcSQWNQ`C!;.5_י-+O J?z WMOkO0\$$Eʴjplh@Li72H we0qi j endstream endobj 144 0 obj << /Type /FontDescriptor /FontName /IJHOPD+CMBX10 /Flags 4 /FontBBox [-301 -250 1164 946] /Ascent 694 /CapHeight 686 /Descent -194 /ItalicAngle 0 /StemV 114 /XHeight 444 /CharSet (/A/C/I/L/N/O/P/S/T/V/X/a/b/c/comma/d/e/equal/f/ff/fi/fl/g/h/hyphen/i/k/l/m/n/o/one/p/period/q/quotedblright/r/s/t/two/u/v/w/x/y) /FontFile 143 0 R >> endobj 145 0 obj << /Length1 1486 /Length2 8689 /Length3 0 /Length 9532 /Filter /FlateDecode >> stream xڭeX˲N[pwww݃'=@p Np{ ܳ{̟yk)IEML1QmV6+ 2%hj n D,l,V.^v^NdJ@#FW7@63q(Z!5Ljf@W/&@.U 4gBfe[L9qppk!w b @1I X4wt-!Z@SY\NO&v^h ́ L˜ȸY8X,Zv+[Y,L\dl`VPSWwPU韲eͬ2'@I89[;@'2B q|X@O☙0/0&noz`M<f,XR ,2 ' z zJ{o(&o0&H :2&48!13G;] + Ğw>D_ ;;I!MZ.@kB;LGҋ?N Y!\~? .s{9qB]@?&qa? Q Ro +*=#D@ o!-! 4C^^p4 ^/Q0UG-jْ=ۉmW<*LQXOD2.y䜘>nF}DvryZifc,Ep b2)T{cOV(dFDX=;*fsY$GĺfVK׏_^k˝y>&~]hPI!C'To$U*6kU?iz.PA GT,7ut{g!T]b Udz~"+9)pS7V,z|W@:*9+1z M-X].l9a!L⹪1 %F&ҢLb~/Qfid,uY4dK0Y\I+ڶ\"S JDZ k"|"Ѡj)'HE(P_ÀB[+:ꀑբ``QzRA+B*e kb<d[UA*w*큰KDe8 =RPFkb&a4y,(/ +o)f[ (͏0*$Y ,[*.|}wg[X8pJ99pKwrr2> >҉g(19aLs vfe‰BE[(9Ɔe 8h" @Lv@DcȂ3/k5ާgeQ x9J #>;M'4S?IDoKGnKvw{)rY=Uf=0O'ESʁ:Zsu`1u;Uض ߺ-ǼWv$f#flhQ ꫴsOjS)~bOʿ ouw CTu|'!=U0 ôգ^"u8t ͮ[ ZMPSzMwI殺P*)[&*Hl y7LR]8x%jpi?"}Ddqs #\t:&dVh׸Ͼ#Ү6w&^'8"d7c(P쩎d}Ǥ&|8)}`@yĤ@x+43d4>Ǚ^MS9FrAxhem'ǡ^STM8uMOJBL;.^@m褜b3|2h=)& z"(*) ziRԹH0 ;O@C85f;*RzRKDBW.A{'ʬsWe"CV&ysuFk筌H7e9;kv-/d|ⶄ)\݀h}.шWc\ɪHYM7L Ҵ>M#Mj? PL=tl c_ )x6I٧`=">tvefr\8;v/ QQ{= )+o h:`|uK3~8{`Z os+BPfSkLӟ@󥓼)/*ξJN[K{yLCVځ@o{K7bѳ o{u\^-[tU}/ 5Y%eo y W=]7`I$[4VYzpt^/^92f !$3CR澓;gSYwj gI7̗7ck縅)x?x23 6V(7|gzJ mUTOߥV}+qb3FdN4N=r]PEJh '=_@jeosRܤ_n#0TR (w(LxS+,zҥmxU;6ɕǪxfЂ-ב b;!V&dp^5/[+/nK;>qxH ) ,(-)+?]JiAϚBJc K&鷜oZ4$sM+ۆ{~ȗΑ}wE%Zѫ.IwՋ#p˽s<|NU?ݟ@Sb&?|b?Ff7C~9_%$Dܬ`j\ յoh0):nTP~mك6-gMA*ń^qYӒaNs/3,_tN;'~Q=κ% m^uWaӁP3 6U/!q\ĕ]}&F w@{eixVA`sqL/IvaV?"ڮװL"g :@}{x~.j3B#h-V:{ݬg~)XQWgc 11"6STkV܇<5ޮ:Z/OYKeEb!jo-ԿQ>*ȿ?:w`>-jWN3-Z{ѐEawzS'{6b#Znàh X;(aP Z{BF  ~{\ًW$5 ?w V<ϓ?}/ Q΂TOuqnPG;@UZ?=^zMd+fׇ:EiBlB\1lWVSAGG=WO|@!I5xqaJuL|E%UM?7ٴ*2AϹ/Hkb1OyO0S`0A!i6(ed#kBu=a έɛf"Y9%uw;S_j)0u⾷ROy#,]|ysv 8Ip!.-hd"J^X2س1VGn6_fXjL[HiF:M_b%0`N]!ǴE;)]fl(Cx\7M/c2d [%XQA`ǰA$u%2{.lXPX0٥ )@/dS~59Z «'eؖI Yg~*םƏܽp}0}U풓 賿TQu{~~fs9 KTFfd",Y3B᧛ 1~&{17pRXߨ+[DuI>cNt iI@-pjuX +os[PV7!Yw"yӏ%M鱹ϦĤ/pTZ*S52Z OIxF% _Jv}HՔx̩*҉8m;mň8ξnepUIZ(vs&aTj~>o{»SĎՠrXz+zʼnb=)M@!F' 4 Uۂ6@eAp?0~W5&my`4[gGHj#@p vv(($|Vr"D_TZMZuN3U\}=h;#eW,XψJᛵPWEdul*!9=|9{JFXA[4y-qy"Y^ei[vbGFg;'rAfUelKW*D=[R($˙ƫ.R4VZ~9t%ffSN4%||_A>]Wjf:,0V}BJr{Tzs,]4[K!6͝GS@Еh~RR|7 $[TOUY#v ϖ8ZXjhQޒC,m)yF6ZT,WЖL`JR!X^E&v-L̊(sgi.'P}92mIn*_.o&z^c@8G6?-/&wT.xm [3Vc8|y5cv(:"S'QV%B`:frp˪0g.zL}a2QfZ솯f{'V.0Xm'9& HnZ]JKnIBT#r_=d\ʵj/Tl,c)I ]PPӋ<դ 5<0DAm]4dZ_ȎX<}t=HڙcKr ]% A lt.$%4vq;=E6 Zz슟a_B8?CZLPIdB=F:+w9aw~&Cp!+vDZ:avJE*bc6i{a2tTb|rZ'|cT;Yp sEr2hyP{Daa?ߩXlhe^?VkGc͚SUJ3e0)ql]>lL+:09x>Eu==|rXL[(iƛ]%tfC~#[(GY :GyTHqd8l޻廭' x!?h^Yگ ٺ/!0\r=yVҨ J*!r.sw^ !}6b9'K` V̦i!0mg瘸#S>aClH[Pg=TL$׮*ȺsOtwaU C[Q%B'` > #{R)ɍqe~"Δll^=ktc$cYP_jDU z9֯K7vL$z|*Z vwD+\p/m6mLd}_=jmcr$&&CZVږZ ]}2#iĝ+fm T,TU%_G&49t%¿K[1c^Qͧ+@Qfres6Rc>;lے| =-C3E 49 3_eWa,]|x&>ֻI;S_ m[q[JǵjDj *4T !:uD@r}ۋPEDt2]4 mg06 hbHBjH=I2ySJp \֩[_d`z=[w8Y5yk/?8zmXpU􂋅$f@rPHKӘ5CWű꽔1& 3- H tcmZм(::EVPv`wyR2WT>=Ͽ6.9 C4QOX Թ#o}̈́q9WThŇYT-c}> S߸2ΡoyI[kN{> O"/J}DU&kя$è1/>8f.! /2a5ڒ7W$=>UP p ՞Z&z3[d ǕN3m#R;_]C(_vĶ5,#c@hҙniU+V~ysBQB(M hIwE w/=@7awPmo4W@_9q[;%̰|.іɾ3#ïHd']yEcMub>OyY74Uv⚨EqǾ뾀oZ R]-( e6N;4K endstream endobj 121 0 obj /MSBCTO+CMBX12 endobj 108 0 obj << /Type /FontDescriptor /FontName /MSBCTO+CMBX12 /Flags 4 /FontBBox [-53 -251 1139 750] /ItalicAngle 0 /StemV 109 /CharSet (/A/B/C/D/E/F/G/H/I/L/M/N/O/P/R/S/T/U/V/Y/a/b/c/colon/d/e/eight/fi/five/four/g/h/i/j/l/m/n/nine/o/one/p/r/s/seven/six/t/three/two/u/x/y) /FontFile 145 0 R >> endobj 146 0 obj << /Length1 994 /Length2 4111 /Length3 0 /Length 4753 /Filter /FlateDecode >> stream xڭg\SiD*ECBG%@" ! zUWE*M4QқR/D D]}g3s56PC8Xh-a`),)E%(G#<18&rPYEi1NΞOc,Gx:݈5W Ġ=$5WWM@(I*0@a :?(/RhL[<]r(yr-L PӓrʆS[%p}kCzY3uN*.xƔlZU77X:q|xqkoEРY(XzRp* ڮ-GW" 䬹#Zn+Nt] ',Ϥp$Dew29М8>(} jc7Lf,&[lJhr)|JT))Y#,ն~IfWT8yFb'ա7aRmCJIqi :W Uwƞ a˪VVߓ@+-*?VnC~IVn$@A6~aUB-$A3*2D&*{&3%ꏱ3RtS B}R9.z>}2_ZZRlz*|\h%` u yxR}WVᖁ6-SXdSwxN,y3:㳯՜n`RIeTum"pުQWɼ֩.A^ Ъ! iWB޳)B󷘒2I:X;VFb%P[i%Zg]zFqףD*_(vǓm~Jqeo Y!v6uB Ya5.;z:ULrw6~nO}QR-f&fЗީdxڒisPRo#.H1;<Q;%/o8E ~!IrI^w אMﵽv -HUwC0lc1B5xPozb+͟n9$&^OR*r;gk&)~iJ.y}oB&6@yhmw{ntQk; 3jH)c]x?}CzbrG4d"³QkfU8y6`PvlV43#5o5q~ m#q[Gz}u68S$Gͬvv:nzb6m jRuF?guL!9^5D:Zsm͵G_?T d^M+.G&P%kܙh 8˚6VA7Db!8$jXCj|4׼v%)EqPU4+(N8 M,˃;Y;2EwHg/aEo66<笵wvF$vYH+YʜkBT֠ټglZ**J.З(c5&i*3V+f0+_/] &$GW-(Jdvz]$f;{~0t>v9en-pg`1ZI e |]^XrPv7hUv8pe0 a.ZcW>~rK8~QO=6g1K犩f?:L6V)ceB?Оp55XX}:$8>KeiT-fu:ؖ]3D'Xdfϳ[x $tpw@(5JU fnX9컊@c]0MˎtmfxRamMv5flu~&a2[X0k7 |A"kZe#R%}7ӆbSOI_rb1n(YiW|"[q$sNa߮“ci] |Y5CJ+woQ@۪ܐ`E7W$d#Ƀ8f]΋U|xѣ#8rxM.<\cqX<g=]rexMl*Y/Ϣ˘ q6׶Eçӥ>][;P=f!R0Al Z2 hm;o 5AQ=ld"x2/E1[.C//еܓZpCYŎY-x9J9!YI{$=4j _p[]. +,蒷#yX/xD?hN&S˔X)5l.UO>HfPjmv>Ϟ?;a-reQgBgJA=EE;2gF٤sWx]T5:rQke[-;ꟈdkܾHk=}oY^bE6K |Ku4J_^\Ӳhp]x 81mh,񙤮헮5<RX^oTQ>z6Ls^Gϓ9J˓j.HtGj2Y)׷Q/ӛ;('2ބ)̬m6B,~3ELm3Z7 &/猗iZrUߐ`_k.9, ( dqvl3I˖)sCH{2}}"EvlxX;›ښR/M\= ]Xu PqvĻ"U$mhN&a6y4=e~t~d4A>k{}_`J_T(u9^ UaG,W]3K;x-1Q{kwؖHFlǴf^料F3}g{19 a<{LvZI3g 0JcU4یV. =.ɋK endstream endobj 147 0 obj << /Type /FontDescriptor /FontName /GCNMRK+CMBXTI10 /Flags 4 /FontBBox [-29 -250 1274 754] /Ascent 694 /CapHeight 686 /Descent -194 /ItalicAngle -14 /StemV 107 /XHeight 444 /CharSet (/a/d/e/fi/h/l/n/o/one/p/period/r/t/two/v/w/x) /FontFile 146 0 R >> endobj 148 0 obj << /Length1 754 /Length2 1043 /Length3 0 /Length 1568 /Filter /FlateDecode >> stream xڭ{K)?g^>rw>{3Nn7J1ZN|=;7q_u=!Rgt]&X{Db5徴Oڷ޷ls">dzvގ5+V5ƭwr_˂ZUraNOOlaba =ܘ ڣ37]f x=u\a q JhE3I[j].›xGeEȦXB'! W5xXuU{tكNtwKp~$A%2 յ3ju[ƉdRcq#cewt\D^i6׮ uλpn} g"kEЦ5ڇ<_n ^%q]Ӳ|Qo& ʪ祻2v󵻵oW:_XyeJ^ux+3j$u;Sg Op;xp͵FxJպҍ5-=ǏL)E{Pu^zAFi&mmx:5)\){밅;ߥ un~[QsH҆yŦ ’}VSɍ-/q\\sMmyv;TuQ* Uv> endobj 150 0 obj << /Length1 771 /Length2 1151 /Length3 0 /Length 1689 /Filter /FlateDecode >> stream xڭRkTRIzX%r  h <$f&dJ2C $ J,bKTXUX[iEVEK5η>߷g%g l,Par T&r؀<-aJ@V뵀B !OP,݈#'E| 8R@$4RjS!0adV O τ!&"&8A)IORT;ҧ2a<4|liP@Z`VVl?xT`t=@A0N`릳RBET"4U g%dH E!JJm<(4 ߔ<^i(%tRO՜j2$16B{J6L0AS84R%"+0qB1by5S&Տ XFE06`iጌ)L\QcPq%և }FLa([*`Wuwg,~aiKs7K4]?GND~ǂԼ>Q$gmq:{+g=R '&ϸRŃ鍾~~~/cݚ~%upf[m9} yPή+}p U_xnwg\&si |5M7;(imqr~7`q%.)R.`a4?$"V3xf60j׷nh 廥wr9hS_Xk泤/{_5S[L^v'g ׿z+5'DNmg7@fǭc_y۸q6~dݛ(6 /W>An$47\m+ k f&Y$%M^A 溈fR|ob| ߡWCXG-uں m7ar"kS?[f۟v&fD0gqAcCygex|9j¥(ee >ҊqS&gyo?\mڳѓ+H: /Krn ;l㖻?![BU\Wu-A͕Z1x%Dc>Dv+wgi?/bX/.qwC# 廡;QF+&uMܯvvvL-{ ߗ2_e4tj*]Rnel;k7g̍[kQ7ܯE(uű|s WS_ucu}v]ΊzGY*.ycj/K<5{/U;І;[WNq9.[z_"F<=g),x9=_^,)ݺVۥm.-+[p#W]h.#^I8{cJ'8eMmœ63D!]7wh:nmUpbXAmY>)▤=_eKbѓJbU7omӳ#U' endstream endobj 151 0 obj << /Type /FontDescriptor /FontName /SYFPBV+CMMI10 /Flags 4 /FontBBox [-32 -250 1048 750] /Ascent 694 /CapHeight 683 /Descent -194 /ItalicAngle -14 /StemV 72 /XHeight 431 /CharSet (/greater/less) /FontFile 150 0 R >> endobj 152 0 obj << /Length1 2072 /Length2 15289 /Length3 0 /Length 16404 /Filter /FlateDecode >> stream xڭst߲'c۶m\m۶ctNNǶ>gw5yzEJL+hbguec"Ubd `c`&%v:[ي:99F_>?\,\LФvf”$- m d 65 -tJp"P8]&tЌ&F3 [h$Iښ;lbKGOQII)ڃ` M/g Y?1Y6;{g# M`bbW% -mͬ Y8YL, L lMO%^A^IIAw5C [gT'_?qp'f3^v&fLlПI^&w`z:[;-9BslMlB^qЋ!Nz;b$CL^KO-S">O-!O- 賻>賻>k7CF#GCc+5O??.Y,m>[8ؘZ^Y?{Y>a'FOSL̟36t+SO iagi[?`h ???XIs[g_y(?G,s{s_1X}Om:ʧ]*~n?oAc5%?{:lkX'ߓ)h +_1 ;Z|gb>:9L 3˟3rldF:]/Nld'ű~q3,gu6t2?mY?=r6w5^:᳆_yۮ2&s_Y/4JBBv^L ?1q~Z_.eSϟ` kΘ;2%Wh XȬ5^|7Lru阴FsU& +SdEC|Ag;uǾ=C Bg)+xEfPI!!PkS_V0XjXH3bCE8Kغbr"teT] sT~һZq>!iyq"·:,3eG(1ɠ\кO,QK)pY . 7R6ݍ=}fj}b"'(cG.$?- o$5J-pBvKbt̬TOFlU,A_h"{/L]AR'h]gK!W_y#a\f<A%tGzXmX--h%$9Y^Ru$;0 B߀d)VSlI4\hPX/CPރZrx9QxtW׃&L.1/Or3Ή톮\i&U9ɪ P$Y@-k\u0ÁlBcluqb}#$܄4?c d2πJ^[.u? Oj͑S P%7] ފ]8Ө!2^1rVoS:ڽ{G&R%c'[>Gĥa^NO> []h@{ѓ7˿6jd>-~20|:&w`h)@2d9w#/,NZc0~,#u*"kS dĚclAumq:I]c޲oXC=2Ԥ,r/}9{*`'/j&M~.FХD'aIcrQO9#$ch=  3):a^ Vu E5We[t2V2"=W,a_+ b/z% w CFK',I{Àskz=z 粢(l0f&.۔W/_l|~|NYvƒo<{GRKޞ'Jn3.#}"!=&r(g!}3#@ NՂqֺctoV$lBE?<{%xOd==AAbCtm*IXL2WuRgЧףуD;1=&^PV,onjP;F6dr|lOQH#Y ^[u`FQKv ̈* 1x.?!m3sOݍIt|}wCY,m}EmhsGRK ҇_/b@ϐCVC\=)VU79{SNƼQ@!rBzK"ݐBqtZ܎mjiһ Ϝ_g (j ^\ nH Y;yCdS uNq+ceڂ攢 H_`YrqAWR<(`EDzJe'Bt YhI hYa_'p xosj+]-qB4[ đVvq|"?оZ$wshzG%IUH}3!GMaTBeY!&яSr2Xk)l-v0>ƳG2@;a{YNkSzlH)կ\;̆<㧛23!슊Rj疴 &R2QHaZ:CNȋ6М/GHDh=[ۧ6L&dz|S/10^郛Ҟ>XrDd+"-;}1wj‚ϜLx6L@3E[#Ȼs\o\Խ˪X^$$ׂr y.Y"!|tc|b.m s5So<{Q`H41etq BjK ui U+IZt`rqsjb`C1vB%604J-/ jGa4]C%eDZf~b/u h'tf.) R dOlI6 RUG|x|7We47x>ew_A$ݦeONƀO, Ҍ&]\Fa)XD4yu8̓c?tJ7K>-U̎jU#*݋^x%WB;!O3͔krvבx*;>r`M^E?v]IF4-[AL~?qbI?ZSTVs6 @F OOÒʉ96KY;ŭE?ɕ`5q#3ΚMG`̼#j\JRVE&#ᝊw:(lkh*̶,[*|,qPa/eō qI)^40Y<h f/űdmvb|OZLf]p2/6{L#20 gJH!F?|/E}d;ܦVbf.xdRg-@ƈ^aJ+0۶C.QO-hT0S+3oN@8V:]ś>Žtm2Jß; ta'&*LXIJ/RYy|$e5o)'OԬof# 즤NkjX~V EUJN&a67hlqij66T 8jos Ǐhq#qY6͞KȑJ]trG)`5s!?OK@L+3ZjmԖ- s^ E8a Pg!E@D9sͩZxe s"zlh^ $wG`2:a,vL˸0.e+9^ةmNRXMv=_5gĥ ,Ԅ̶fd=9 Cօaڸ@P h~B,IF ৼ(ӌ]2̤^L4 uH# {yX\OSzppL(gGJe&AK#2+9R,<(<~Cv}F(.\ i=,/\6^ S0.spņmX ?~/7I~ިd$-:fGBzd@8۝w\9 >RƀE!oX<306PgNr8pf|KSjf\y.-/ǟޞgMR;鯒6p|ဓUH3j[^gf52M6ߦ,)>2ؘgU5 ]zFrŏ8ڦ!ӆ,3ｨB,g0i| Vﾭv #B`I) :N9wtvG+;gd el%L@s&<cKtQYVԩ<&y`W/IOFLW=BjСP bm՗E&as~V[~2؟n,V8(ȨIԬ>DuP, jvW.f3yDL51#kR6R++V;?Itp u(X>jKЬqF@˝kriPuRL?B [Yo` !HSOXV}qD~ dyryF"LOgQhc ogsL;Av׳R#9%: 1Wup8 Ko4鴿(/7||u_#;, nW6{ӞaKDL3΅78i_.xܾZ9ua"c!1.B`k 98`QRpRIS^$A|jK-:_6>m/=h:IsIw +EttFApA ""Ε#hh)E! Iuqƭgho`eqZoї4'(;4p1 e;%:6Xq̰VkBi-*j@&K~;yhŎH:;ѽ~3 qY48PW8BC:7],W9CcB.TX*$І s[=O{`X;ő_p#xzN!EG~AQPc{VWxN(#`)n4n-Z_u/ \Rgo½lAzU+1-U.nsu*srzǺQ M99pnY[&(deWyf__@AgU1[#h9@ OX A v>\n.#v8 <_h߄n{214-iڟNik|qQNDE+&ߍAaÍ&r@OYtFXJNq":mSrXq0 {4Nã%}EP.[׉⌄4"{QhXf9FcDW?+rֈPٶ=onpŞHbZ3ȯ7I#T(gA.,7OE" k+&M^%RQ}l>!Y#`Fm6o<#~ ;ATZfTM\1:1rKbX+;7%L(0"NP3zqؕz c^_'EC$(C%Ք9ўqbJo@l22:,zTA^AB=5sUp๵m7ɑ7o&/EF˜j:*>˻TNv*P 4^b_㓝AA qIPIݠhdOwp)>F_0)O+4htR%?uK]q8Θ}O _Er% al0H^ y>,SaC.(_]BayE֎wPD`E$s=$+SI"y '쭙 Lj5RLV7#i] +!ӭ==Bof[KM >0pj,ٷC ={駖i=LXN-L (Y5g3(X\_dy8 S*~:5'l. )T;AHR$[`8o)=Q@n'%}v^j[ЮbnRNGO3:|1dRq厍1%,VUG׼GN&ikLqSX7!XA)s;\!&TP.;iSVjMn9`Ed0|-?{ kJ iC=[JžJ *njAi5b-I(piI]AU ݊:O{wwb!u7K6 <=ceR1iUcNNW2/Sk#(!_ ]p0׻ԡSrxRx_UA ,©||"Lrx鿨!.?jOmuMxLkoI2Fru|Y;<[?.u@Fw*O~)NZҔm{B1pn iH:zUwX &bO6zf%Se ̳a7 '{ 4.-ZmּFF~t>5}J07Jhd5ٜZ%U~QU> mY" Fuk)[JIF6hH[#3z%~$7P+ɼ` |o T$nQg"ՙSCMqs>)'C a׫j*Mc:!eFk·PJ%2D{TV 8CqZ5_q/Pe~:gtݗEpq[qJwkuiOub~pwA~rNFrOb$5us9PJL͆_{Ίx`gD# -atɾBfѤ$ov^Kw)>[}"(>p閼%D{DEj2z/<<+Hyl{IqGa[$) e*/zƉr<7$3q'FI1tz]/k*֧NQi\&~a.?`΢45 I%$B| )Ds5(JzLHHv{к*5W=hK* cRI%Sz;&r7.ݡ !i6نSn Wr9j7L^|z)P>xewOtub\o>tܮ)ŢGGX,,VY("&bMx`I$4+((ȊYwTpl yE78J^mf+|]EFv+ѯ鷪[[YI" rLt/(i7}1~ ^Ӽ1̡yjYn0)sDhůC~ .M<-%fRuYЄ' Z?n|ʖW{6' ޡyiV}-2x c $ f-jϫ/x6gߏuzτ~y3g[NeMNasA;ZT t*g:B@1 *p,>}|q!Trxd]*+4c Dd|R8똒-lPދ$Wyϥͤ^C;$ K )|x5팻iRx@ )?(㏊Armz<@s?;ՓuNPkJL}a\E7J.m"ԙ_as>7'BՕ`<୔zLQ&n€44Bz|=V*Bh5ёߔNȷlXk#T|%]\nkB)#Lwa^MiuэJmTX+NKeъ){cXㅂ%VWfД2+2h-jz\MkA(* ?Bֈ$ ?Kb|hX5NdCŋZo8vxܫ bY E@ZeZ^kf# t뚡j*F^} pxONp<?pB/hq R*H*uKe- .o/x9-$7$ o8IuH%vccd`r'laMCu\NZ"&OoEAC1ղkvuٸa˵Ѣݕ~+|q?+φ* .0 Õx8$Uqp+Z#s0OZ@_lxX'RڡNDz d")60akMG)"NǍ#*:&-N+u,ю6#I:OJ3>>j^| ;,qܷJ/ّc0/Ǻ3;:.SmvJwr+q4>*̘EZD.]L7fܶ&F4SE% 1${ Ba0*E!޻UD·%˼|+ *c Y%^ي&o>ޞNuTp`w |D_D:ߘy6t<1!<DQJ0X'Nd>AV{H8<o$"~"" {4V+R冉 Ci.o' ~oA✙6a,$M"CG3uO[(t9rK΄i{zNV 0Lƀ)aJRǗ-ur y@^" % nGOR0Nv[ (H3hwn=LE|tn6oDZӥ[[BzzwSݝ>RIx}kT":.筇: bMxWhad%:MW5մr^aݶB^ X#_LX2ñC9j ȰN>5lE FjZ} 13h)ߩ H09Vppm0y=]'HGз&{'>@'DbǤwP;4?j YR> ȇiG )w[H3Ht(OvޟBdޕƅ _(Ч({8d%n~N˭D[)rgdM@=Ͳ';M =ťAY)Ÿsd1 {4:}?;anQi4qʸ)yn]⥝MJE#z|f{&>rȫz<*h|*aw^R;ġ22?Pęg)D~KE.֏%C`)3n I hje 4)J｜,MI&8d, cJ|<3"}VA ^Fr" t%t#s ǿCFzBҚ뚋tQ/,yOxs# Xa|*"=Rbw+~ Udb?f@qZK*䧚&ԩϸRSp &#sO 9%M]H~Р䛺S xߞjnTwmFs~ԩ8BVAEcZ R͕s 9SW}͒ 8J%0kw ?H+m`;QhlP`Xpj?!_McoC2QQ$Euw`@γ[ׯlZ$\ Dp`@mUV1)o #8»Ixvy ?tDTP!1ؙpS}cyt/7VŹhCx0)=C{'v`ʵNavy׻iHOavȔóeR֔;`y28? Djl^")i4TwܕT$an-04)n3&g8|Kdibhs_e zq9cRdy*ס$1.Nل oO-"wK'@=?>BEw АkK]N)RW⪸qyókNTM?5͇oEL5LxLtn%yGRb`'̘}yŎ&1 Jt@&T8SLOD8i0Lʧl!.zd!:aZȶy32 oc ];Qit l:.'?&sY EVz.2fB?J2#iFrlZK;ŗn\'.! 4 wFrlojboo\ wo3QMnF"-|yPwGۻsVkTrE@I'(ܓ;kMS^p^"w3S$l,3݇MntBj F -+ºeBZ']W yY_o [YEnOJP0kzР*ٷjFUCifCA0r1MF0F+<*,67^rըMZnc:B+퉕BY̢;4-n俶(S$4~L *Y#^?E2pFͦ)B]Ɏ8a@[xל&ٹ,G^ y G":{tB/α)-1&Taϓ/.WnDM>T%%v])̬GN R"a$dcVj`TtCeD?~bW\Ômń^zE{t 4r~-}ϰV Ķap`^1Z\"&z3Gq ( #~t@=H.)=[VLt[V,G/s&Jq: fco<5 m:14"K^[܋!Wx})Ȍ/*,th#DX{y"a~T[({ѲJ4BIWhxVݸ_0s >ҝQ| %+<7#j(xq62f]%"Ȓoa&v25ϥŇvQռr+S6jBsP->%Cn>J$ vIy&F}Oʜ0֍UBD3C-h Зt'{ch}F2vMbٙ"l;czwjs8t˶k) HꐼWĠ-Y-d8{:h QW؞ p.\"{7V@.'5a ؓ*TڥQb6 endstream endobj 153 0 obj << /Type /FontDescriptor /FontName /PORRPD+CMR10 /Flags 4 /FontBBox [-251 -250 1009 969] /Ascent 694 /CapHeight 683 /Descent -194 /ItalicAngle 0 /StemV 69 /XHeight 431 /CharSet (/A/B/C/D/E/F/G/H/I/J/K/L/M/N/O/P/R/S/T/U/V/W/X/Y/a/b/bracketleft/bracketright/c/circumflex/colon/comma/d/dollar/e/eight/equal/f/ff/fi/five/fl/four/g/h/hyphen/i/j/k/l/m/n/nine/numbersign/o/one/p/parenleft/parenright/percent/period/q/quotedblleft/quotedblright/quoteleft/quoteright/r/s/semicolon/seven/six/slash/t/three/two/u/v/w/x/y/z/zero) /FontFile 152 0 R >> endobj 154 0 obj << /Length1 1428 /Length2 8565 /Length3 0 /Length 9390 /Filter /FlateDecode >> stream xڭe\ CfH a`nKSKJJn)I3z||W]uU5X,B` 6?@BIK8C\0I3W?Y8 n~N^~v0:=@je ``' fqJf{x s3;9P@!l j x ЁY:xmps;. Kpy, @eY?rCo+`qwڔ P7ʹA`VvMPi'Bjn 4sY%+'O srOŠ? 3`Β;X@as̜ͼ'0, '\0 OgtpF:?/(@;(@e'(@?*!y!^xi!x+ h5!x ;,\\XZN!ANF8wo?N_V!|~; BxouB?}c`p]p?M9pi.& wW^/7މ_WwG*<݉;xrrX9 2x~O3O[BO񄘣/: ؤUKMT0#[}LPn깾kƩj_Dܜo |uys⼬eӌDWnUH-ҟ#7geyv*LЫU0M<[.ng,}Diݷ6;gU}6#  QEWt5Tdpge jas7tmX6ܥbf(-m66)ă:,`~3nh-f(ty`q`5(ya.KHbҡP:@n NoN)ͣBڠu&=W&ٖGjg >3{FO@)F ϟMvG +@2uǪH*aUwio!07koxv=0 Lji=tY{2pY$.'uŤoy_jw @SX7@@A=.; gEgg/;yZ2 w/I `@ (d U⤮l<.P;ҝ;,Y> 8_+y.j_5hHp*.};Gī;47rW7 S"{u2c1ѳ d{.8#WowZg3!1s]e=ҙ{骼) g n_}Ѫ̯il̆q>~4yVŮvsYc?ۮDz"z:ИO9lCW^fh4gLZf1nzLB*W߰YOD#ϩPy 3uS?VvY?`2_2fx\>24PhB*o$;wYR]{lm9WfB_s_#=Ć:ݒ}ت=X5{p+6Wbc|m]ld,[ s9IhF'*BM\rԕL ,B+bU԰>ƁJ$1wlc䘥wߩ}zU׳'vN9'9`?Ftޙ';hm6..~A״i?nӏ3_$5lf1l>Xk\]%Fs鶃.%B*^c@6Q6LÐr$>r1RvJC`%-cr:.„gfT&sgFodƺIfQVK?37tN:U<[Clf찯wɠzvʴAWZm*2^tMr?^5H$"+=4|>'ĞKN*`B˪pEVl!;8MOP*biRua^~Kz{NgX \%r%4_BR;+֟MX튞mLSeA-C@8ǒ% BDiy:ha}(l9ҋ1mLYm"ȇq9Ŧմұ.nVC_`] VŬo8HV}X<[?6(fL!it=a !UQPT\w([+ NVL)lwV$}̿9pc#:Iϻh9jvYR}1DΛ : CC3;]6+X>$>Պ G";Ml0nd/ו%hcp m`U*T cj7* ]}iIfʎV;gev0t]TM/[3tsd.}N$O"zI^f`2״%Y͌m8 974`y+g4120C s ʩ!`p60^s:ȓv r!u{9W!V}.C|Oևو#r>"Ub I%W`a eikWt:ƙ*/." Uk5إ3DQeCV _2,S2Y2"טDAFq>aڒ}കz)L>}[iwL5Vl,e\MqY N̅L %J gkeA楥Vo UX;~M8v$:fa{}1ÎvjNnnud6 ڛ]lnߡ%Pa-v-$%g*q-'q!njaƪf/ZJ-Wh7X] ] x*fs_?ߴC]1D藋tD fExFvk?*b PA+D`x|@@/3UO+;YjCBrzR+;xTBw@t70!Yw(e|-ؾ, VoK)sU[zoP5*~#!kξ}꾬CG4&\koHR[X4)1)83wIbj9ܻGĜ=Ek%t9*n^pl؞}1'x晄QPɣ%xlm #Rnaש85gzSqj(Zd '? ?o^h޾nWyY(;])jmSP7W[ն{ Bo~伃&eduܙ{:ѢW__Sfk \<7K.D`I6y}DrP$ֳ-Wyyǀ^4pAKMK eWT{rP vj⊵~ЄR奥P2ԛ{f᱊/)dz:uU%`OV`w_Î+Z V? ;x S2H<=Lt:ӣOQ3(p:cj\avLU47pXk1= kgGrLkv˨\Q! !Cs5QQjN%˥ gޡ*H~@k>V kDD&tm= x.UV2_ Kd`a#~^Z zl?upa~ uArq"cyup,qF 8-ŷƾVt~[-׶-p '5a \:)m+yjظ1LzY4;I) kX|q{9WҵUsTIwf@F"Kx5L%IQS9N#~(a~Ucǯ샎Rȭe? M«MQ7rcҩ%7 1'9%7\ pʒ,YFm~b@B=Gyɠ Q#9)FK%01mf ux|,Mx=]ic\ëʹ |%Bh?KV}f嬆 VB;ȔN{ Ak@Ê{<6)q^kKe"yy kDZ҅:nB QiUma I7ƧGnEc(e8ǜ]wŰB0s1^%Ñ@5;j07+ {p7LMfX fh@XA2Z $I,/k\T߁}'G^,u3_\~<[ jzA4P-E|pPy?S_1}tzkD-s^HqHf~ax#=T&4bNeT.'J'RAr.Q O/[gz+˿?CFxm3]ʘY:q z$Y%å 8LqrmIzg<}Q,e꜆sܼ֭ƈ1>[~cu4$vMYP4Ty7:1i-\!*Rqm/ꂈC~ĦJ580 l 5+Uҁ1/vik=w8s>?*{&j;?J+n50mypI6z΢ KEĜBq[|LeAяSGAO$_+!Y~p\oΕ h T$0 V>5:C0eU%anќ_J3 9Lyo&\H7^G"@vs4_OhXl^ba'ha +,IMA)P7_6] E=4܉gObPo 57^Ntd+_nOwy. 'ݜԕtn^0]&Jcgm&쨺ՖJ"z}#*6CL*s{!mJ{a=?i#׊9bXx>yABHl%{%%?/tDAr6a)yA{)bGhƪ'8ٱ̹]wi+֗W+ZjanaE,nM5\#nv S7Ӛyvn@}-u'EtfYa͂C9rru%z-9qj-,}{eCfRD| ֡o)8zeŖs"^D+Tbȑad)([6=zEp(d˚pŽTw\Ty7kð ܐgku" 1*8-IΣëE˂K_nk2*!-Mh p\Do`$)MdrPm̞CV9HnӴ-zჩR MG ڎ۔CU wLΛC^>uSA8;*/CM'3rJ],qd=n=˕>zs5;zу,!c/w8J-GCatd9f\B)%*GpH[,gVm0a %w U#8BVր :ثum@ostsL`k|Mv׌.3ۂPEvjNjZC j$W 1 |Ҝ=}:oEur ԏPDALWI4a5QF1ıK 4RXWƛ> 6K6a=fkyl<_,"lF8)Z%\C_toFwK_}( A91 T rxj;VnX ɷow,"J틑_hB>&Q5)t8'x_/NP[0z ;;Wو.u-_Q/QG Y7"rtA/m͇`r=R9xi1O9)grU~^J{rN54TѪ?rf`O ;9G?F3vte}1᱇*D"G7AAZd+7"38U&,^MPu͆>Wll5xR (F-{0C׷'̋ޘ1ID.)ʇ&(@!s16ҫ uʂ&&gzJ{3#ӺUz8/G:_՚hl~bҴ>Ȥ4*)osy\o`d6$@OJ[-a<-DOKh-^bD?)??˰PE9r}|ĸ%7`vQflO>7e#ӣ|葙@ʋ>H4J傩jЫd#7j jT7[TABy¤K3_:2\yH endstream endobj 119 0 obj /XEYDQT+CMR12 endobj 105 0 obj << /Type /FontDescriptor /FontName /XEYDQT+CMR12 /Flags 4 /FontBBox [-34 -251 988 750] /ItalicAngle 0 /StemV 65 /CharSet (/A/D/E/F/G/H/I/J/M/N/S/T/W/Y/a/b/c/colon/comma/d/e/exclam/f/ff/fi/g/h/i/k/l/m/n/o/one/p/period/r/s/six/t/two/u/v/w/x/y/zero) /FontFile 154 0 R >> endobj 155 0 obj << /Length1 1153 /Length2 5760 /Length3 0 /Length 6462 /Filter /FlateDecode >> stream xڭeXkװi;!:Qr`TNi[ )o{û߿1su<ֵbUu#JA~|vv%w(s+P) iI KH \\0{SO8 uقm0a v $?s{A!?Bp;aR^Pw%@)B\NHjqAE_HO?C_i3 \]=Pw w o7m(흠C0Uu؁<špȿ%PsKgfjb{{ H)˨|fB?_KnQ !*@( @}P0@fsqb$ C?$!CK.6%THP@AAzQm)ߩ@GY?(m;vꏚDADq@DixADixJ/KOX'$*DM@\DzCሿMP{ @m]lBUrNJctj:ξCw*ƽ\mzYJN}M7[LͶvFz-WӯCEOz3d?T6]dF4L 7UMu2 f'Iv+  ]&ZpIvwckOYy=G/TOMb1+CȮ8|'yZZIlas\EBp#<1qS/<#yY⚹% r8p_]B'|+3>6UIJXSuDckx›NU*45|JeT\x͎u.u5ݍT5YCƲ fN$'޳F$@f6qևQr2S4_N]N0q Z I=ք^*`fw jwn.~`:4_G3 `b^B_je2˭)v$/D%U'[HȚ,)i劦C-CۯnE/6;$_%(J ZZ#o؜y$Fv8޴#*;_['4=:~L-Vd}!E!!4pet~C>g]quVCM(`+b+Tl7؇?z\)%P_4ȡ [7s~?/+A]XY1K|b7xA=+4큘V99!g-يڤQ㮵47yMTC|5ď;KM,v21Ӯ. b@J_đ~u8ZHVF!S2YqM'_]ɜ+.sěhir4ke^̄}1r`b&u*ou9-`h5PSa"QLߓژO1̋*~Sg.,qyz!ғւaXp3crRonNsp+`Wn4Te2R.R}VcẄ.O=+b V#cgꟘF3i흰)#A%JoKj追OuC784Dw3Fz7n._"ƴM3OTO>9Rz%zGJ\~Ԋ< g\qGp? Fy6яˣ(9H硃6ΊL7^ `LӲ=鯚]>.TYnkZ/Hg&ҨeAWߌ2ӵb`[eBBՖ[EbP&NRk4r[9}ۼU8wL8`1哟וoI6bX]1fM=ҳ/:M5"Gٰit>?] 9J}iY+bBD["mrTo€6/B% :zRFd juNJrHn3]{KBr)<9F3-lZHl:2kt4)<;]d,'8#V`1fCLn[1D՜v\y'򀎹\icH%R^Y 9w":^|ȀިdU'M{M3G}JT&e3͟\]58rX~6){S>c\QԵ.p 11 K'U>:`@$6]SB 2_X~f7zGn)r:HZʳH*- `]Cn{vD_cIU3urqkLTK+Iqp{}G;I-8bHZ\֊* e}tbMSuX04R`9jwS]v'OlF擄@^yс"}Aaʞ$>gWW7 :}^FƦ 7M .[Ul^ SM` :.w17ݱM}RJ ;J;O) )4=ჄL# Oۖ ^w6_>6BDZ[|p/BY(mRf;yf AVSSqo)χmœ@ d*5SDziү֨va"FXļ|s8Xlh`=Ս&?`q:N}tǩ!ij)yc.FDz($ %6\|hx+ F˪ )R<ڦƀz^.ʴt{ݨ!C}o_h;zfU#ऩ;Eά;%+d”As,"cqiZX+8װJSѡwvpKW]Jˎj;4ae7LTL06kٗW7*aQKU"61$'b:L F,ryF:+T(Ec c;* -J)&6H'=Y}?h~ 8SeFF'Ky|[#!4i $v2?f!VZm-M&oO ܒj`DTo=wBsc ebo peםW)_l M<6IKa_޵x '_ lOa,n 0F)O$J+SFWQ`{$ZG|4Di)Aڼ4_~ =TK A!!ZÜIM4sEߪ"Vf>ҧE\?6,B?ARl|``h.Nّ okL-O.L1UZl|={&WH<^1o분_g,0#5H+Eeڷz°x~{[/돑١'tu7* VixcS֗ 1~mh"oǓR ȯb!6!܂2i꫸4323mn}GF2V^IQ<ޭ߆6'__5CؖY?IeDnBLDN]G >f%B&>y=fZwHKa{MH1ͷ](36X)=kLvo"jP\O_ׯ6c=unaPi }#-=hs,}D߮/i窛*D^X̻ m}#tfD1 tU%/0Y_d%c,e?J0Gӄ2RfrRS{>l}sn>Zpgク3ۨh uiiv.bhyO/G6R rⵎ=w-ʝ^!}M\hB&Lѭvkp% ,O1XSlF~U`鲛6(׺nQָ#a!cn=W)X =qTnWj.h]I &dfv/rl/D3.];Z vdY%G4ċXsfsj/rVԪϐ l:'[+PW}LWfqby%V>ZCe]x;ן4Z#4kۍfo7\ϓDPw'n"N$zׂFz5b%)S\$mj8h}3'*F)ּ_u @.:酘{kΉhv&\ UoM'6+\8;?w6UT%xra6-޸JFI%wG6W\U2UWFIGx=[0 u*= 2 Αb6gcy0~1u}ÚSΩ|{:VX#fnk}q JC G^ q&qnXP=[E8O~M-8)3D)k $ZHBsdp4ȵn$pТ|]9#Þ flOc_B8UT1+XYD{:Y{i_."=j!ҌhDk? .Й ҃ׯ)n7519J>Y~d/AbQ[5Ws=&K*k鴁?y ^x*?eLJdxKSN1hE@ K1鵨e!S!6Bm)!K/*G(HC>z.duVDG\|9hutEǍ9'S*e!W[>zCfe~uDkD3\H5obu1S:̧ *Z͘u#̂(lkVTYjGT=R- {S`o9NVJ 3f LAMb$ kVꢣeEV,>)#?cmyNъn/":E}#C$s``HuV5~#pGm$tPt!SV teДγS1X#ݸ,qZoj&fb$ݲ-W8ɉ\A րy}G뺜d:\SSѧfT!I endstream endobj 115 0 obj /QWGXWV+CMR17 endobj 99 0 obj << /Type /FontDescriptor /FontName /QWGXWV+CMR17 /Flags 4 /FontBBox [-33 -250 945 749] /ItalicAngle 0 /StemV 53 /CharSet (/D/E/M/R/a/b/c/d/e/f/ff/fi/g/h/hyphen/i/k/l/m/n/o/p/r/s/t/u/v/w/x) /FontFile 155 0 R >> endobj 156 0 obj << /Length1 1043 /Length2 4028 /Length3 0 /Length 4693 /Filter /FlateDecode >> stream xڭuXT{RZԍ=CC "100) %%% t7R 8 ]%H 4wygZ{govV-]~DA )@QCG +h8dJ IIqsBHLJXRJ("]PpR$@(5аFàN.E{ ''@ W@ EC@ nlp/=j{$ o;paErXvH`'|ւbwr7'οc{_^kg.nh( @AQB9۫vBNP@/U ӂma+l~KQ҅o5rO_c{{BBB l _H;8b5 eE ,> zPO^A=`[#Qd/o?()DN[? !!@? €?DA #kN$ 8]\AO11,aXqP =mr޿箠I B~' "п_)pAP[OH[u9CE< qG[ȃ':g8*-뮑;*_.f}rvY?R4]P~H#.1&`-p'~oM@W|+@:BU7q7ne~$5n2Q$W446x= IfJy&;*?aM_wmuHJ9}1n'n9Ld50ZRnI!3U29݊Vb&0&aM/aq&`dyȔOʲ}Aǣ֠.peĨg,uГ?DLWݵ7(M6t oUfTj3eסKmJ;P1Jưd2J0rRww;贓_w %ZޝR mɤ*员mkW.8w -<׃`>GKW {)qw)ij6 j!Z¿}3؛0%KH12_uP4[qlS]{dqz!6Q}ٞ#1W&Z͔h $Cp]YtA ȎbF $ U"焢7-iP>Ƨ?md.M&+}0ģ %N.W}b P :%դCyNøY$V 1G<h"|b9-z6-zQzr 1CykMjBk4dd{Tg NeGk~|LC0'&J.FBLéP_9R4R|~-'qΖ6myGɪq٠"vD;?݁ 9WfXeif6+A } +Iؔ DYm6%7f%=f8[No%ltݒ>} /yc[lHmjz Vl/0gSUkWSs/:Sڎ_C[Ze޳`{^;!ZxTS6կm&qp]|C _+mJbSͅT9}ѪRK[-K<\ʝ%\*eR6Y2PZ⇚T[$*ƴU]$HHWML}o~g ?7W3nq`g]-x\xApqI%'ow}ŲqA. Z6IX-֓f # #hgH+6yMůSM)1+q S?7yΣȼ+ˌsZBwCG?@vf:/3E"q[0&"SK?S pFH@O"-i3ELj5ic)99 e܇rFZWJUTZ?Ltg-`L7彏>yCjv覷XhԏJL{;M𝘈 JS)?w*U2ZrUX&]"U(6](WD\L1[ 9&b?")Fj _wn,A20E,2OɄ}w&')gSdg+!g.L dr[d͙PRw)PslZO#p7ɬ3 aWZYvFw e>r8Kfgk92s.:k-bسT41wb/Pq`%U~ŐLJ{x=EQM3jz&EvgWbR\lZ|D]b6f0p: 0^+fhqF!_}C2)9k^u{hsGG7]CmpCR/Ս@JFX\qUY^uv72Lj.t#Ճ^l&E&gE41T+j rBd}LÏ/$ wB1EW4 /{>8U[NVD-"Apj|JlX]^ҸjzZ{ lH\YtH!hlnv4vݹ?"-wD^W "@ '# b-Ѓ4W vйcu?mDٿ^M^71 ܔFbxӎdޤc]cR$W &Ԏ艉Xp4kWmNҪv!n#:7oeJdH^-;l{R:`_wAOSN.&Lzc'7 > ZiRJ0U#1ɁsDECҴ݇u^Stߢ0iBB3@Q9Hi3( }?(GϦiC/KBWs{Ѥ߸ W;4?`dM){c@+$dɔo`FɸSj ;{h'W `KhEo2^<:VI+$Zqy7Rf\5VQESTl,>%6^WbN]sjD˵ktc%7!y~yI$xY1&4燇eu__HS.OkVZb*2(XZV_aJpAUWbCr~L1vխk8Bu@t Eu[`~9w(_m3ԓ y`]-."Ӫ`c㱎YRqzp07piqg7iJ_LsLO.?XXŢ#i%LX#)KȔ(2x,b1~r=ߍ\+" endstream endobj 157 0 obj << /Type /FontDescriptor /FontName /RFRPSA+CMR8 /Flags 4 /FontBBox [-36 -250 1070 750] /Ascent 694 /CapHeight 683 /Descent -194 /ItalicAngle 0 /StemV 76 /XHeight 431 /CharSet (/a/at/b/comma/d/e/f/g/hyphen/i/l/m/n/o/p/period/r/s/t/u/z) /FontFile 156 0 R >> endobj 158 0 obj << /Length1 818 /Length2 1052 /Length3 0 /Length 1611 /Filter /FlateDecode >> stream xڭ}TSeǍBddL DE`ۅ (cn\ww2)A\xQP4LR11 (DP`xD>s~kv/#e0$h?P4cyyRqX0 B!  ȟ@(SxB" z X)\@҉PJ %8T 5J 4`qG  c2UR!a|0I( 7d 5yV@U#GUJRkiH1A]õn8*qy0y & A, @*5pT6(wmp "{5PN53% ׁXC w BNb8(Tb^S&ub. i`F(H5VPyFjG18"SBP ?G#$m?a  @ oWP(HУZ3kPv )_Tpf{a棶\v6T)H2;>{qOk-3W}H}b7L9mR~[Nayפ]d{>m๵"7佃7,DZ*hҮgʬ?+-_. bkr(8XqԖIwδس;̱>l,?.H6]ImǾ}Xps=R\QM_Y.zԵ'")w#礮'#Y{\K ɅݗmL9Rx`-۸1U8Xf K[CsG4NkO?ʯL}ۍ敇 ,3hD[7>UBޭ+ym=>jBŶw',<6fZm~eaeߖjek-5{<%,Ms%=yͶA ʲ+eDP]j0 k]lx[nNV]; ՞W kʻ,g (-AV٫JKיJ}Նkkm+NIIU~[?\>P5nzAk/fL\0m?}TmE35S<Q_S#=~Ik}P;"Y^}Ą'ן7dn-MS_ѶOF.K=%cm<|CeL\aM{n81Zmt^'E(Nmlr_YV[c$p7Trz&7rX1 ~p_ v?g]^eNû;Ovˤm=?;\`uՄno/nY{D$S7yyj. Py9=uw϶s>$Vy$cLlp}SyMݽ@1eH ?dt 4,pͥI+z!${9CyD*vN^ϔbaOWǏfS_y endstream endobj 159 0 obj << /Type /FontDescriptor /FontName /UABGXL+CMSY10 /Flags 4 /FontBBox [-29 -960 1116 775] /Ascent 750 /CapHeight 683 /Descent -194 /ItalicAngle -14 /StemV 85 /XHeight 431 /CharSet (/backslash/bar/braceleft/braceright) /FontFile 158 0 R >> endobj 160 0 obj << /Length1 751 /Length2 733 /Length3 0 /Length 1257 /Filter /FlateDecode >> stream xSU uLOJu+53Rp 4S03RUu.JM,sI,IR04Tp,MW04U002226RUp/,L(Qp)2WpM-LNSM,HZRQZZTeh\ǥrg^Z9D8&UZT tБ @'T*qJB7ܭ4'/1d<(0s3s* s JKR|SRЕB曚Y.Y옗khg`l ,vˬHM ,IPHK)N楠;z`軇xkCb,WRY`P "0*ʬP6300*B+.׼̼t#S3ĢJ.QF Ն y) @(CV!-  ,IH 3NNպ& & F f(KRJ"0~Z&0SS+Rn^Onɚme X9X&u3SjM*,y־% mHx֮"&4׻,^5+Åa3>_xV/'x楼pZkBZAo`(&^y?ҊoO^~ש&x,o:e} ;yVђ T~x̝4lWg%?.qp>$oW>hJ;Ǻ' DG2O^k$[Ĭe C6WP,~ٸ~ゟ;ͳgdxMPđ:o)]؊^Ujn:u{2wGٹޡiNʓn艜Z\=kGNs| d |ິ _l{ݷ^xBYZ잋gqxTD5o\k;YCs(TTyN AU+Ke ڵ=\q_Pܕz2Z[N58?Hy.;֬7sU/.̙{'l>W`OO<3 ʥwlKUQ_Y~X*A@NL-Rw\>e%=;l5=_ҰiNK,LnG r^P'iXh--XͲ +z3Z endstream endobj 161 0 obj << /Type /FontDescriptor /FontName /GUOWTK+CMSY6 /Flags 4 /FontBBox [-4 -948 1329 786] /Ascent 750 /CapHeight 683 /Descent -194 /ItalicAngle -14 /StemV 93 /XHeight 431 /CharSet (/asteriskmath) /FontFile 160 0 R >> endobj 162 0 obj << /Length1 752 /Length2 713 /Length3 0 /Length 1233 /Filter /FlateDecode >> stream xڭ}PGƋ2$VQXieҢ.!DPFA-~wp܅ˁI-TZD[-Zu P5V` q:Ͻ(\z ul&"dZ FR2yF_\F iAPȭW_Fݵit@*`µ`= HfDL,wpd-C f"MiLR"͟ E2\_ B?#0b ɫZKr1Bh8nNsh)w>m>rå>:$K:o{v]ʝ9msں,0G^''nלM_;-=:woϜ~Ka  t'ώ5{KTε!OknibS7xڑubG}lE@ɏ+ Gֻ9}^v+IWGwEeC0O%@]<=`n.oҸ9EYa9-"c|}u Z\4tf&]]oOPο& ʣˆ`/#Z/oYމbYfgaH^2 ^[3ϫg)ejkץ_ڍyNӃ|- |3V( .: ҽEm>~~~NB]l\P0^f{͡2ȣ1嶇.D=Vh7ibM&OTWȶ'7:9v_sҕϯ8\Itr6Mˣmiz}:iܧ97RCl!ᙂy/q7R1ҝdD.^ji=l^0*Vg_hyKHSshB rkw&X657S1ZVyC=Xw!A Xb> endobj 164 0 obj << /Length1 1442 /Length2 10801 /Length3 0 /Length 11639 /Filter /FlateDecode >> stream xڭUX\Ͷhwwhܥqww`@wCpww{p,C˿9;ޯafLEIH֙ +jY@fVV1**qG3V@޾|\|@.*#@+NO7@61(;[lj[L gf5@N5dʌL&΀O s-?Nfvo&&M` 2C`Q{[ C뿋KX[+S_6`kɰwq9LA "bQYgck5`f8I 2U;X̌@ٚ["AFR^*`[g {Oߚv豾u'ZLlk`;:{ 7x`[S;flk6o#?"п"x,"fH!v(警筊z8,mb-OmOm-fbgvw`, b߂f?A߳F7Q [-<-@˼·NZo۶ 6c/շ}Uu?keVֵv5&:fdmdW[?/_&Wc7yMxbbvL@.vۢo\^.^+d_l~ ;aq΄?21G2G4QjqXgT~_M K`tKp9Z҉|%:~נ:KOAd,4u3#}C6_IΖ(n\;y'K柯||SL)v AZk pn0_N[ Fd+K|gs7G[.dʼ|C%cvWI]\ЋFl9m Cv%u>\͍`$l5˷ea7BϣҌA5+Aq0Ԭg=5;*,2Jjh\a A6F#QUk1bipCљ5'<3 nj.V_d"E7`PN+s?$39K9~F̐Y"" ,h_ҏ*+>kN?>:c2-t,2+oq)6W\%RZ9 r_eLY 4OTb`NoA'0W(T4˩ie155PGL,v~zgj0/_ExՀڈTx}a]r49f~-ZFz)PMz$扷WEm}g=qe.y{oV(CcB@#6= uЀ剤[zA܍x_?ꍎÆ&^gw@s4ՁTG\"Alt< ;jj~L~!"㈫>$ZT\K*훚ѥ8q߅lCϬBN#/Dk{/N˞ &jga),fqѽ?7%F晴HJ$|< MU5yg2~}ΚSFcaHRhY$8eia&9S6ĥ9h ܒ^8's)仡(S]l ZvQ]\n۵u9df?<X36R\ *!#hy3;xq1_!+:ت!l-k> ,pa[ʸЛL*0 ~RfwVm YCxR}̝`p [{r(\Y6}^zXe wi+#wy)7 y61SԳ\KH+/ HaOKEUFk]w@>c%8ޞYXvzq Ewp ޱҭϴwo8tf;dM0˿Ci}!*5~]Oޞ]cSz>My!笃y͔QX1ZS܃c XϨ7cC܄{\ PmK{WAe҈ty&Irx 2;B ہw,]Cd UHrG!:Sn-X |+%Zx3ԑ_ьqC`3P?~û'-9gbJ213Sqg,(bsR#_tm+__6\f}}6>pN6u^O D}5]VMY{h*dw9vglMוy7"t0knfO BxU鯺>N }jf>zoL06Z\10&#wͻ6 }ˆL i$#Oof3 z {cGIW4a^}Z4N1g5q,-آ{5]vFcmC$8.oz l_uҫ?eWؕ~h2'winkJZg634EƉ!z!.c= קx&ULeMZ=IK,E;W~Oǥdb^d$;4/An1:n&z;[tU͖9NHc{~5(>Nk[PWB f:kT^@M fq KTD_G69@ň,%-ϙ$_ZLߠz-'G4^w_fk7U]9ќUь3 ^\!@1#R Ҫg b ) }(n>vmK_NcxrN(3>-~UzgLsd8+ٺd^ B7dEv~Z->k/Dd\-I|RDiy_fY^o +1^rmLA!8d xpsK1D[Ż$nfd1BH` j)=yyN#Sitq)tzZiGBYh!MvwWXN^vq";}X8 dÏ\cS߂.j DУ7:F-84 ݜ*eMFovѠX3 k,*tF^BEw2Z(@dB7zhݾ'Cz2٘X<&44CF+MV{Ӗs6rM)ĥr%}!\j4*0 E(ՕZ^~?f7GaA0)QYΪ#JzJd56b,fdu$2"S~QPU(\!AlXZ.qz6kcGNA ņkE=y~ܱaQҀv`ŮGs 䱳Xk"{O+; atm̬ lG*(Mxѝ?%Oa!Kq⁚3״5)**HKz(׎4+`9jhX)и=FS^ 1`gx-'Dl/o0if:? H顪V^ae(MxQ Jrү49ڡw#yʷo:g4)sNHsf/Z1AF8LJOQ)ٻ|;/2YL KUOg.\bZ)DU4.Ns<+5"/1]A5_^sn۲g9xy?z}lE ͞rh ^J1 y }j]ӵ' ۭ~pBJߖ &S^tB1xu$ P$"dakx(=+6$OxJO #nwJl;(&R:*Ĵ7IApE?`OtnZx$Y<ӒSa`X&Q7,#37k*9).5A2Gۋ: ?<i yp^>zw(1֘ C(q^?w+w 4'"=lN uqJ\7:A,dCBߛfF!$1 P}Hli;7JPk;彼iD;T)~FEJ8> r'~Yr-gY} {e {'OiFڃ4Q!]Xt}n]*}cTf VeF+[0!\wJ|&\`5 },UyZZ|k!b OaGq>swHW6cI9GkW$=}zƠE0Kvʊ%KwP3En/>GҵXs0Y lyJ熫Z2`Ӛ791W؊ L,aA}i.Đ(Ӓߙ_C8@Lq.n!ح, 6em̹^$vR#K3=V4֮V@ttZumE j*#楫 w64F!8K >]IsK{_H:͂W%;yDa!1wp01K  7$u5ZƲrz.sZ) ֭e9` }ybٸqe5:N5M~&=qjy>P<е,N>U5 G425l]9{ 10gc\aAhe[14j\[k|u.=?3Ϧ;at@ai);vǔ1TwS.ٱ"{--x*#%1 z趐nGLkth4!è>_[IpG>Zv%'T-m@6k/+F0b E`O$p,m:e uS %y6QE# QvMg0سL!Mbg+`` H0|jaнE>.MNxz*Wje?lm1 *6ȘN0^)=YMMhwgbb0Q/ɶ؁A _9"ڪ~g o".jz_BWt-UT@).0}+j)ٸeDo1 ,)1,ZXϙ]Eg뎾JRkpP.]/7kq~$$&.:T\i+ͷLd9hv0l!]k.b@VH,Y[ iYRHi[OĹmk4xY,6_o['@...~#>qr6mx[ވAebl5`0H'ҪW[H@6N,9C}[n(۝Qr>EPN}XWlKJ3K}J? a!~m63.x4|^s<ҫ"\+%h+/.":)Y*wɛ4rGDl)a50"k~ GBr\1LaZiE*._Pc.">O> FAC^ڜ0J|n]݀qVIρ 9&^"Yi)cV8RBX=ʁGûc%yfd\`哹gz|K7.=f}I3u]IV>C$fF* =yer-t1T#(s$0Qoκ*m Qӡ+}2IMI?!5jox,IkrKAwmg#݀z{r\73N\JI,5gp"h&)2'k,-vebwY K~.sym_?:ݞpd&ċw{1'V8kY">j9Kuяs\cҎ̀6UQ;h`Niu jqio#NsMxPU0QA;H I滑+2v8G0 p{s^zR(bU]yrǫԾH]ocK}N >Lg򲀱t1M A8û &\xT@k_]V>]\0g`*pA$`&0"v ^zp ZriTX6.Qʢ9$=B`& 6,=r~sE@N3X1W#*+:2W΁INKN 7Vu3i`zwyU%E8sc1hݗ-\=y-XOx(SmPd7mZtɯ\Acؖ٘O˰|Xz{K&e oaKз00랳l!=2d.bqrOT6̣!ț0sI)L#}'DB vA 5п4T {¾Dv:h"ac͌T#?%k\& V'Άou1TԫBGj %!drM*8/J=5ΎF.Gv*:Wmxu{&iRX_m}ˮ29]SQ.Ao*/<>4'TYlq, ;K=ȋ/m˂Ò Uc~ 9ܺ>98@)Cnנ0{y!L`4Q`vߋE ,}a9ni/ZKS2kۯq=WMgb8]"9]>pkU{N^?G}J:/|_5|^ ȴ3-;ؖANLǞjrصE݌F⊔ F.ziߏp?lӠ0?:ÿڏw 1tOhU  S~aA@spuPet`Q\i\nH\M1`)y 7{|܍sly-3ɹUYftivm\~TiCu;dp畸1~gUĢ} Q'=OʀoGy5dVÖpodzv7߉@1oorw=#L|&2T endstream endobj 165 0 obj << /Type /FontDescriptor /FontName /GPYHEJ+CMTI10 /Flags 4 /FontBBox [-163 -250 1146 969] /Ascent 694 /CapHeight 683 /Descent -194 /ItalicAngle -14 /StemV 68 /XHeight 431 /CharSet (/A/C/D/E/F/I/L/M/N/P/S/T/Y/a/at/b/c/colon/d/e/f/ff/fi/five/g/h/hyphen/i/j/k/l/m/n/o/one/p/period/r/s/slash/t/two/v/w/x/y/z) /FontFile 164 0 R >> endobj 166 0 obj << /Length1 849 /Length2 2489 /Length3 0 /Length 3067 /Filter /FlateDecode >> stream xڭRy8kNsF?EFCd5"˜Ad-!KIdYB!ʾe.u$!K9|罟~畖j(>L"aH5@ a.HUU$ES"R RH:o'tdT-H%`1d CI ,PƀZD"`m}AAHGwO C=(ʟeHNpL8 pnNr?L,O'1oSWC"1($o: fH%Lu4gt]#HjD"O'| Β@z/q?;QF~oZbd-?1D%0!r7#c)8( a@)E @2@c8LqFN2LB|*g5p̷wD 8 <%y^RF̀Ĥ7[ౕQZ9Jb}[A;nM%C\Mo۾3R[;m40̟e[9N}bmɽ<4UlVÃ|8_(S!5vG#J'+=U"}|˳"(t(WX$dt14!UFY!Cu.]@jAL.إ\״B w3}C!9#O߉YX}jiH!S6Jg熱q}&BlH앃lYƁK⥈_k,N:&P7$t P pLvT]6Vis34,$u"_7ooGQ8,+E.RI@+d5dō=.w)?*9SVCK1Hx.0,0E7V.|;jƅ@YOGLrzl(ҷY%; S}LLC;*R֍A_plּ3Nwf)15NgAdL;T)MѢՉGG7*V, LMZ]uU)~Mc F޹p.SL\ü %RT#m@ewkU[1>yv_Sjůüg_mb_HBJ.46Uk4le?#v ASĻO;!Ǭ?7waiP;}wbg4OtK'eqDzCU Z ?`&ɮ^:>Grߎ eIFW7Ѯmx'ĤT2oQKr[5OU#9"$_1•YVMk\ff FW-&ݏwmZlK7Tg](|1pgts0ߕ_Zw%+GZ~CJ43ޕqY ω^NNYPbJ)fUʗΆ~bZӛ[x!zQG>Xk;[E:7G^ރAO%L [oŻtmr%{+IĽ 阉8&oV&Ȍ^7_#z"X vw[ C~X9+pX5= }a\}iJ7׹~f) fIIGYpRgȪWk S@ΚOrM)5"P\j06(V{ΠyoٽZ8_pkXּhK#6NjgO/9L'j;J9̔? |㬢*=5߿&F7zw> endobj 168 0 obj << /Length1 2004 /Length2 12769 /Length3 0 /Length 13862 /Filter /FlateDecode >> stream xڭwUXZ-A[[pw4и\CpIf5jWZU"SPf21X;22DdUTXYL,,HTT"@G#qXY8HT[7{#_N!+= kh02(nL!KK_%h̄ 09 k$4IYe6vϒ3, oHckK71Yk!;YZXNu+ۿ=llYc%Nh rU)GK%/A 4V9흀ܹ0Hhhi{/*Ulߘ7 fYMl\{{7$#N+dm t]m!pO&6HM,_ ,qE~#o `q#Vo`Rof첿]7x O7)Ff̮~#0?u A`9Xn8^ah`d`i` ,h 4qoN?IXe:?/? w Vddc >we,V_vN3 ;X xYX\b;x[|Nfnf@?<6,\o\-^QeM e v0_'o6D 5Z(9XmA%퍀rm1.Vpg~r:~NhlxmoZVVSak XrVI9%:VV8Ou㰀]n@pgr6F6Y 9ك{M@Gt!-/4xMA 6uu ,AZ~[x(KB݃#uy"toTgy/ݽP"]mז6qR~v}$Q3q;Q}U2m/\閪!AdJv%!k.0kS!+6Ny /Fpl™KMSBytDM"u u]T_*{*#[nwMo*A?m!MɼuP _&F O\"@2H 7@z WO$ Aӝ & kb =r'ZwD/UW]GqS)oeOls{v.SpR=t{zC*l%tdfDT]z9ȓ5CGvJs,I`AtA4E|Q:+Ͳl]@lȏ><'^vMk;>-]>' 1,-4ƀNi# q7 V&gV/s:Hְc^zA O[}w YF0}"_{ı..7J1ߡ7/6]i>u!~(0O QIm3<^YCs5RH*.'?.IkK_`G2ne_5}ETscnIUޞ;;C?x!hHEWy:( ylk!-%){2K&RW!;2ȉҹWw9 u;/bREȄ_}P3fYNe:o(ljrY#G1˶6!.⏼JEKCobJUV`|Ѵ]esؙAeӾ]ͅuw=<)r6鎍0v>fFP s@H3v`}5pԏZxӅ$7~RZ[FJ,\tK0}E}!—vc*'-ykϠ<nEh^j}rlj~]g5lvy tY'>a#ֵlJq Ǽf_y<Ҋ`?`Y9tTI^; }kT)^֤#4)̗b|qh{nP(PBߊ$LCuJFxkbӒ"4g=DXO97pFD. ̑_f 8NfÏ`qSaRbaK=q=ރab902 Ǵ|Ԍ=KBrB@xa9nZc v@yBoj-NE`^jpmг'a>vIJFG͛uԄ-yP?nIYl r4J/f7J -3cdpBS5s^KaWq8Sh/g}Bو$nB[wgvn?%x)(zLFrTo",;i#ٟ?MH7bfK]A-u9$!ш英(p|ɹmpx`l┣e:xfYJy UoIH@Ѣ۫4uDT;8|(Zu<@xnȰn"}bN>/H v,s̯Y+, '"Ui*sMc#,M=qpk:+ ӮzX϶ExG%+,.Iw#a@O=e`Jan)0׼DykCv^^mU;= 疆^fi*F섧NKcQ[X{K>FD|mHfY>{;Ȃ2ox\,Q+Qp \LpKh`%)&od%ANc-ǜK/?;Zvs @':P=/NMChAPCWJGF =1pH48-A n }C>\:ʞ\F|% *.|ѣ!IYyES^vҴjoy =UVPM(~f5G:Ņm< 1~ ut X:r)&o3ݙGpC#cԣttr"!& Gd$@Dc_SPQZ*`2Ob (THKhx7Y6M5f%+yH+3m4KtuOxnJ*7d)j]]";s|Q*FD'+0' 3)0'RIXE=M:|M0K arZN뭯7ʓ %3p$McĔ0Rg k>5fUQjIt'.˻(d.CgETiG I/3,]dž@Ԩ{•! [hVazGjoWTY_ ީ(JRh=|7~e'IBhg60*dgBXg%M0(޿LL}^mqt7]!)OFȅ6=aGb%EKH[ucGbu<>Sk/7YVmBʽ/dMBqRg^Pt BΤŽD!W#ip^d/sT.^yd빻GsEQ;ϐ@TfKGU%'$Û ?YU} ]ALƇH.k; 0%: 3x=mw, b.} !'Nb \@о>\[BXCQʾJucmŸQ1y`%'j_O([x;7gKĿ?xWR)u>`w?4W~!IZp ܓj-z=g; @^=vw~@ʭ&NlfKr/2Ym BhiSo)ƆwX!=:$3_ BF$^qY#?`}Tm6bRYqVhِicy碁vӃ"v?X3^.*r)LmGzoGV07;i0Ë+oRP0q.O`4>^OԆH"}2!)6sVno ?*zCc(цJC&;MA ]6֚R ̤ ,d"'2T' %6}f*3[&0?dپ])r.1:BKi٧4ȋpo(Ka8GY <-4)b '†^PZnP jB@{$Zv찢mgy -) img㻘M_kAqv}#ZzMe.FO3#ԟد.HUD4eͺ];ľ |D3I.x=h*L 1 CMrӥVRp2YvF[\{\kʮ,vΑǮb?R#}` ͖ =xդ=}/sX\&)oC.B7Pr5H\Ut(ivɀێdLnTƵ)mz_HPn]0~xC]%/\Yfŧ`Uy3H)}HIYo8ENHTW~9 3r8Q|F%eTx3+-lSm&:{aNCP)| OS.P׵_ln5kx(w?[a1vqv?MzXuS(G'3Ha_js$o=:_*"uQl40paYzNT2j>dBZ<_羛Q2ܳpc/pptON*%tcPҒ '~ZwwY$J`?kUm1y}_dɪ.Q; :9I1)Jtwjkk|^_N?CF7WSc2rgY/2^2kl8zIly2):ޖzV-@ubZCDR۩"m1$vςLyOԉ5tOYy$xy'HMR9sC Zg뀡<ѐF܊$T̟L ?/ 򹇄/l"DeSTO7ʫƀ*{qĨ9I #-*+LQ~nʽHW˸ eWræB[+/bizGI1Y*B8d :G%qpqDA)lޙ~ll]EJ{)k51Jɱ%a|_V?yh&@yel̺F|>Eݥ (QG<51JG]1*d, x*d-KՠUإN/'L%61L듑&Emb|,x #,JRVVg.Ӑ%d'mGʻ%$ec/ sz2ް[4 mbs/-)Д~>ݵ-1Lϓ-9Ьj_"[u3NbMXd<8z2%OBbHXa)Mݼ3%5[V;o#l&#sS,a*AS:,ozTt|pT4@v%TqAqcϜf䣜d]?0ETԵNNDy O﹎_y7}MG&$#li{Smp}4B.ZҦZ馅|!ʇ!P.RWq'SvaWu~!-*>{z 8j)^Oʘ޺[XAwU 뚘;?c,e#M)`Ocj3[/4t6cBWlԌWY?Y!X5ff"`'fA:tVN)w 0c4xu'!Xj{Z NB<)Dݴ2 q#6h ŢH-3edEW҂Ƕѥ 54uW]~?Û+pl87񗿼a!b^2ݜ{bu3)4 c=$^V[77:u̅?IizۤK^m#MgȬ-Avp([h$Qߊ ɿCz \DaR.PzRo̪3y} k31|Of 1i{[Rw22*%Uc9!葘Gi2M4#ya7Uq#jyK&xDDl ul3HWMz!]EMY UiEPĀnUPy-4lwfXx=6qSC}5 emе&Vƶy@`3aՋWވ+)Hbޱ{|^SUF- Rʢ;mna@zbaq<|qΆ-!!p:rk+'z/2*!xok]bWWL >9˾➜@ǑNb/>_rOO̮/G;frR Q2g_qFPp[p1$49{vIaTZC xJ: [င Lr@L#Lj;1R!rWh 2.[evt ˓A"G3ςHPSk0?JMZ2>޴zTU.ykǚv˯mvd{ΕnDSsr'{jŋW2d\43;š.݅lh(ݥU7rOKgǰcmESr E\gSdO'F PrV5(n3Ө6S ͱ؊u4Pιu¨Ɯn T𡴑?R1J}5p%Q?j܌򞐧q쎩:7?]~8qį.Y3u. f(O'[Kyᴞfty:,$t1f8Ne]ϻG//퇻=EPw!dMl^giʕCjOeehg-ebbR]~FxydӮS/Tܵg@Ttn"\%uV$|ʼn k N7oU 0<1P}%Yι Ի}$+*t\]ȉ;a6 ԃ)[W!7`Zq}p%w*@8(ҷ%kN:4qȚnWE@[lpΆ&ﺉބpS>POm.jgmQS{[9B{QΑaے;IQAѐ.Yk3ScY@,3S~bf[k+Y(PF( >P%hTX{ ج@v HX_,~E`+;>䳷ZG>TuCݯ/jw6 9g*j Fl{HJ'Sv&{Y ]( F6 ֵ<3n<ܻEveM:&63f)p!LI8PUܾD IrȱaDuU"r7 |nBjKh^8}CYk-5aԐXዄ"Kb.,>vH܄~^$2Tvi$);,Hay!SH/ꄸz|J y5|E  #7 z014mTXVʱݾ h1eeYhe2ҙfN6S+YhV:3aaW nߙV16r[ص& ňElW1l";ha ܢ59QΛ@lau^7\hs"j,Zg j6~"~7ԭGWO/jFcly].îqJNt.Ux}{W!h91U.E< O]Mxty*aֽjI}3uٽRڔf@L6b|0ɍ_)yNAgD>!^c *eB)=[Uocvyԡ9c!*p9/m"ee eѸkgXvǎIg, 4, >iśMD3CRX圹]{cXPR@I sVÅ,3e/W+on3#EF<;ҏ;JFd ч XjZ^ۓ8kqsExvW>U|L ѹZxhRi?HV7ZE 4x*RT,fZ¼h9]fů6PIqjA| IURD <';8?jUbW*]od{r$_Dp(G`HTa\a17#dls(pk9\14s>9lL߀\7+kdi] ˠztlM/񱾻8gnb4 VSK>HͽF(infݘ+:]_nws6lLV%`J{Eܼ=xTNu|ɞ޿}3Wp+Gr0ogfPUb)"щ?\47 .Ӽ,YGJ?ՂL>fڱ5%F(yfeqR(%D_]nvDu&v(ؖa`ǣ0n%_*K:hVrpcs^訤e{skPn˦WYx喼]wp(ljfjVG:r贲GҊ"2Æɋ7&qykMhV$ӁrqO$|}nVct#cpZh26YɁK漯0t ,7׶dtca8lXK?g87Ir7 t5[v3Mbm t#*=db^~F4~yQcw\2(VVf:ֵ6-[Bnݢ;:dάXRDLjp~ zc'/5> x\>* H?S8 pӅ/$H)2JO $Tara=}C |,D+O^4롆^2N .RF7Z&$7~WROncN*V2KMt]AuֽlRbȌS"Qŋ U l rޕX{ Į w挰tħvC-1(W⼶dmdاȯ!i"󻫏爹XF]'.Oŗ9/:G¤MH9('w^ѵݜ5'W 0`f|,cz҃15ʉ,|Fa}[Yg83qq#8synDLg1,C/(9e= a爌A3qglج캬] Cmv}iu:?2[EW!W NzMCQ,*+)Q^aO1ƥם^o˛]Ͼ鱏-)#j|T]I:;9J`L|Pxu)[ZNCfB+BC@mJTQXtW 1xدjCOixߧvOJb(~AX%^OvPxC%j s*K؝@εNY'+(}a.ǚR#aD\yy?0c$p|Q=f\Ij^߹7ot\ 6|H/7Zٸa[= .g9эC54F'W3_S&w0-uZ v G3}Un0Pk7QIX=}.[rXfC=x=cFG W;zo,Hh>v45=\Oy6b;@ ؅n5$B)>at_ E?نBΔ)AnP;: L\Xee2ʹi 6peaާ4A=Ce;Z# cOum(F%E(צOΣ2)*hD0#RC43@e:";]!Y2rq'cK^;C@e@ /Q$kJ?C5aw4Dg@~c셛S=8\,^ǩ6}ߜZ,u_L ^ 0jw*hʟ]Q4nyA_#]bA% 򫀬uG7BBeƧT+4<_sHˌ{'G0Ox'rq eLEjDA;$^*mr,,'> endobj 170 0 obj << /Length1 1102 /Length2 4527 /Length3 0 /Length 5221 /Filter /FlateDecode >> stream xڭw<)^AV9clB6 ts889vdeFfDvHV#Y!dddF?5_uUh{ obTvӀ%%hw_#R$PuE``P7>Dj()TQ( ,E`pQ*0wG'7*OE:nh_f./K"$n(_@2@z!J?D OS? 'ۿC-G<]AQN0U7G {7rˌp[~)ih\@9Nn[Tp<'Hx~W3M7F)iRV@R0  |Anh!@8CsҲ?MH@:IM<HV2MR?D;  HP[:FM DE9? H: +C1Xf? ~#ւ|~n%$R⒄aH0'p+@ `ThBsjuxQf ҫj5oCQݺW+ 錴ǜƻƽ76=FN,qB}yCWwפ ?L%[>mX5ҸDګ%#LZr#eqB@bGQdĔD@k[FO|S^;gčO{i;/[;l$Ma7TʦvhCk,o\z,3i@LG,׻[Eg5gⅆ?'sWy%h;9R#哦ЅbizđfNl ,t[$ rq$l~)y6L+VwI切8Fp}c&O??]yEYr{=W){fgq+㯾MN8A7LH1F*;XFHk+W׶-tB!lq4$B0i~js6ߴ祵v5vglkR֬z?ٓ)T& =>O,Xyq=AfXPmtCWVknoR&g*y~ro_!Mi\un 3'Rhq+/kP2吋V4[SUȥ=o_v'q.ޜݦJeRg0H]$6 ?;> =\n"94I \v RdYT6xžMpN,MݳT\isk qep,`F͠e&N$h-mOd4ccW=獍mrF$^Ƨlh4$ם*XedirgClx(qS,X\(cL-. V95Ga|bi[e,*eH׊z5FHw¢id1M}^tl }-OWѼ 56m 3 -]~YRt㩭ŽoNRb/  tV'܋Fqq\l" <:dwd韯I#?p2?b.PZ+ squԄpydQXKuIL\Gw̉j`oWDKEX> KGfkiт$w&ON >뚈R J'1~ ']sCZ V0y /g!fy,FTFK6M3S @ «b| ҁ^y˿F=hTxEv|]:ˬZe;u?mYg v*FH=cZQ%O\OU]DoEIž/s ^յ*1J|AT9FA&1ueW?%`R?m:1%)`npmƬd+Nag_(s.npaMƾ¥V>ri%|Ԟtv눜5 GnT 'N&3olty.iu1*_wi]E@L(ERYŸso= G|4و7hbQxčP}#rPb*#gwBes%S-2вkд&0љJBTEawb1UJ;Zrƒyhrᆍ7Rd^<j\2m3w/o\˽.铷EH3f9g;7]ܛ<8dbrkTAA|4|bkM]}upا{JK@P^_b7,,5__(:rld'f3+v15gݑ`bno蒫weO~I)-r^Ls3} U?鬜+Aq'KWC߄N޴*ś5nyc tV[wm[ޟghQ&,NjV#09g#' Ƕ\y71VYTx&Xƻboxhvu/ 4^y}9)à\>p4?h줤X&]$7WBѧq˚y=!fkߴ6Qq{/B",q3yCEQ[)䪣}BL!d/UM,_fXmZeǵ_RQoڮjg8=$Xxa"Sw?`NΫ9v]U=/[:h'3P A~, L%cMV| #M:=W~]gk31~|PYSzuOEq> endobj 171 0 obj << /Length1 1900 /Length2 11680 /Length3 0 /Length 12731 /Filter /FlateDecode >> stream xڭeX\5 ݂[Ɲ!%wAwI|VڵVծ *jLf&@){3?@\Q]̊DM- 4Y9K6>>6ʅD wpth!DVEc%\`jy2Dmmp]n@3f$66)`Gbǐa3WM]`tE3{[OE;rU2?CvVCpstf@gjMhfjYY-L dj 9ڛE^R^B[=H?E! 8[yXYYD鿴$M̬ 0vv6D/qVf@업>`mrsXD qX ^`aHAl?"qXd `QzJXO?T  `QiA`u?յ xqY8Lc;G|{2vo͟`ڸX'O!gcS-WL*ۿ6@q'_q-:؂?󟈝ݟX7 %_ p4 s+?GI;3+bgy=?cOh /%[_y\j LS \Zv&y?,\k:u ܙ4Xhn8[g __<i!r.A.c_i+׿ xnAp0_z| *&`b`H|f __UW =HK! a%~yb1J]3N?Raܟ]"|>I:Ť̽z5kNUs 0{}<>RߟqW *9D[]wZ7TFx)N%91`&V.\_ !vnǕ8cXָ^&~t{\%<랊lS% B\LlU c]ݽj{_݈&v $!GiLQ!i6(qzЌI L!itIlB_.tra>.d&^z"X~Ӭ?`(ctb @Jdz͔l͂Iא j_xw\fn! B|F7ViJVq.j%_Ŧ'?Ԩ^U?[H ?Mu]z[΅rKkaM}Z+aQ:^ Rs e)b"f?~ɇve" Y˖2a5!@sȏ\t;mZߘ&e3֓.q3lJ[&Sn!S&߱2f7=zٷQLs.EeZ` #sly4a 9Ts@ͻaP!x:k ur$*.ĩlIiI1&sGȜQe1@NWM^k_s9i@O^)߱ݠUbF'/n^yuTYze?IDvʸ0~t7a[#򪜌(qO/;UugF6,;.cR/o*y[-HVKWX*fzJ}AVNjlv 5$/I҃t S^#lvKߧ-h7MW&ߕ|WUɨ;fp/m!S+IHf0ӵXA#1e($KX{>!\{ڱؚFF”o{`;tcCbW<ϙQlE BHeHZ$9Eq{*rgf4#&LV@ZCPތLDW)6EӮK)D!YǛ|ʯy=>w+jfu%~QuF3Aoc(krN;|ysS2$@ūOjhB5)tm] iM ݻ?ƧY)*\M>^hZig- ↥V 9!yԲ62E z໒4^s(-fX? 8zRvԈ]L`ݻA6mBC$ӇeAR48d~-[^>bP$c͑ZzEu\8B Kl05hD.#2$1m_.rIqZX $N\(͝Ρ_3^|0mFp8uJ/f~ulgAr5crA=4GѦC> Тq=-Qvu7NOFB6kB|( !b3$l,6>s9mwwTn{MP$LkIG5*4mͺ-ĝXŽq#KNb=skfzrI B0ULp4ԃ|e\ tyv)R-0~c"qi3/ sr9rdqt }dd^'DPlIReFi+zZ#8Koyee'UlQ|ޱ74I_RJcfBǬPRɸQyzEbҷ4.{O0*6SS6+ F&VT-Q/m9p2fmTHm36‡h)edV+=?E%yjc_(>dj!U3#Pn_aKn,⃤'F6`c}mC}<%n[VFR5sK!mcY+ʴ`^=r֛)Kqb=SW0#ª{{ Цx.^2{aTk۴ݢ MuzB|`8ˠKW%":7iL_Upj9Mu~ـIJ[|R7zdC;p}wDMP N%V~sX֨NdOWlRJAj bPxn Kǣ oXW3p@8FOCt_M<Bbډ{%BPӧ~4FV74SEsEub讵h qb;5<1mHǻ)o\Wd>wMWݸӳ='"~!CGWb290&N3Ixr] ԾkI@@CWf5|ImI½=+6M49KBkRݵ%tM =һ$]6"-*m~R ^[=ٳ`L`(k7Ս .<5kl_ ,#gk} 9(IyaDNa*rzټįߌ$Y̬\٣"U10RXJ]NW[L8+C Rފ!Ľ|ɡ~{8_~z *FpTFgf.v>>7.f$cfToυwl𛨙 !@2(=*AflwC%=*Yi՗L0bi/ fj"D3|n7W׳diM߯acF8 -tt沥=2Vv1WZ*u#ctH˭x @R=chdx2ىmAV8* A*"o{-!kXKj_ۄύ"Okș}~]f_EtV0i%땻4%L+LX mk4;9roNۺr/_qTע04tSNY=x v&qsM! 2./VXّl_{ʳ3V[a&fX:)X*Hu K$@t >F%9:B L(X$46Vr02E~';19¸Gz gN*9y(_vICx1U )R@HT6zR1] QtM!f:p8{O q\h!K;5aasߞUs,"F-:f"0BAK5(ts3קئYv<$QsɱWG;qg!.xh*AqmMIl:~|y9[UllH܆;1y AĜ%B޹%8UkE PVlWCN\֦shݚӍsD`RJq cTҠ"mӔouvD&lƫ}˔Oo T_[~=˰5Ъ>p3- qlT1ftt*I좕Q81<ɮr4Tla fBFp n^}d$?ڬEk;ZJPVG*7HysSƼYy7n{rLR_gƍUc-9Z\ALi^%*oC[gXuÙv#}A6TQACњ:ETtdoɃr ֓r[?I"dt gxaȬ[hj ri什Q ,_BJ7M Lޞ#/pZ&E #1OH(a7%x"72ʞpg5/f= H'bN^]͛vkWYm tHa)XA?>_I){+ Wм=YZoMf@y=[4ƍ{ *CWҗ@RTʰi%HDifxȖKN >:!QݩPf˖3;@ 9+>4ڲ1YFI}'˗5T-X 4Jadq! UB\ រKexphgdtK+yM㲆M{"DzJ0朓Cxz$O\ZI=Sچd Bl`f8‡zU5,I_9T+Y< #r:`G}d7`@#+ׇ ꨧrVg1i+/L*ؒڵnVFg ī8V>=(V S\n BKWY;vhS[^`60ߨhGvzZ!OR:MSRRA\1 [[xNUH>f4<~s2אeGqN |)Sx2THi7_"U=fa ޯ+ qPX%gN ,=u0IzI\966Ls襌yƇn5er\ ʯB)>)jK()P<{z39?t}Mj'J=l&Yt(`@c^$-boTLt[Ȳ.+S'B 57BX| /3Q3ᣴq $Gk]W.cti1:I),|F$R5x%]y觚8 MZ\$LɲлsUbO&ߜ{ ߅X3'<9/g/. Z0,`}Di@ܴRO`qs,oW@Yٯ9\+0kۉLzp,!u/3 4FloF0$tүul'?ȏJ[>SG4筘qsZ3BMLBpfy^Qk]!r"͕xprDGB'QEhU\@Z많pbzF =p{_^-a< lrַkg/Wg .Tϫ܌ȏq 6^pK bhLsvd.Qa%>lfra|9EZ-"'guB|{{K0! 84ѧۤ 8S ",j% Mm_[wY8-_ޛ-`v&{=R7wd MKK>?617)Qb LyT"Q&B\ \~7ށ;i h>]8E V9$prE#K,hht90IëU5cD+0j[nXW!]>gln A;IgoXOY>z==pW# gx?{~ nvP20a*Aƙ-r &Y97h!)dѫ*sutxW"w_=Abݣ>+`M6$kv/G?(fYY5|k6y_`UakĖ -+J(<ƈ FV#zm q!wb2βMp)v}˩e>LJj`Ij|8w07PDcb=4…AYxpmNR"RmRk ۚKd]Tt%VH\=uy3;$P'ԍQBN>f%(hR`҇4BUTYVߋ?ssX]&("ywkkܧ8#Ze85xPTP~0قRRՔ9=@CVHg|pK"z Q};|Eu ;3sd+T=I3YU^|@ְqe~09j^݋]7DvJ8Օ 3oCsvMRz6ȇ"5>Se炵͛݃)׾E3_Qnǜr)p8}}]OoFZl1HF\&ISFlzNr[avNތZEC*݁E_N6׬3IgZHc4KZCTgbs&&#w U  \~z䣅X-1Y.|G S q渹L tKvxw㘌UN{R?SxnY5;^6c0l\6er~. סr\ZԒ!yl =W~jD|ma`C;\BA|9sY/6͇;26/2{G_ns8_=ovga*1:4O&u2.Տ);yfN:Ҝ4KonV=pEjޑ]b*Vw]ZΩ7`O+WML/]I+e6ە&$lS@%2"ϫHmxz!􀓇\(-1*xM"+L9^=Z|sm◉VClܻjUQ5;QEZ3[,Z;inyEW-QPØʾVe&eR^'V3n#֮s3 ўrI oӐ%8Rh{ᔦ"c:5ߒX3smSЖ/ߦ`8?҇NaUv-_r}ؘ1'zWy`^FNdnQ{G8ȎCsy-ygHzQՅ(V:|ktb/@ESj!G^hƬNatڭx#HUv8i=qW(2*N-y ~S-ow}_b{^!St͗rVZq RW3HIq.JAc v%rrW?}kyjOv CV/^iy:&;b}SAػ$|#I(KCtEdŀ&7vJ Y7otлJHk9‘jYBSlB.[9ĀZ9v}pZb>yp kVtEi 4|ƈݡD'#εY{v0MšwSJ!K(-WDk\!F!N[EGƬ_]FBw.A*Ƀdo\A)@z!;ր}!YM^bw5̩M}o aR@dۖ7J?w'xc~b%\6RD:ph#b9 jqj!f g{װG%0$Г&DahJ¨T\X6:g)jaİ}_p7䉁+cip9D"Yj[i5e(JT-:wGsvAyzm~!_3YgM?tv$ҷ#.)-Zu^+xTwKP(*Gn0@wc kuGN m  z?s!keSj "NhӖҭCQJ,F-ag 8G@;՟]DV:C c6.`ݹ~緳0.UϢ\'Yt0֧`dNoRJsf6yHWP͆Q*zV%4vyI4{\K2.(Us"26 vjE5eu2*Q.v0&.b[g.=4 "Pssh|B41;ؚJ#tb"BOkXH.eN֓*^^&8ӨҖ HxϘA86/B"5]05Rz5~i_@t;EtmdAg{:#v\7Vs b-ƨ[0.=|S0)O> K K&̴;Jۈ4Sljn-3ng 35Τyp047?írep9t,YqMF,rr/ G:#˳~1XrfJ?զ1^͒ 7 5REk$j;!jl薪6*4q޴8fbě To-QSYw9yk}Ȁ]G=oO<0峼%ck:oø7Ti"CkPJ4z.5t;R9uigz7:"՝"Q7-qg.\<K+̢={'%ü_"d#S)O|!Gk2mwu^/VEmFr,fuT,\ {Ґ:%Ed)7~/ a*,X8((Um&:8g6oPաl5MJ?f{c/>)s)3-uDzw\ufCC֩3]$E7  }Txkeh8UI]JbAW-kԱ>d|Ue|H;ϗM0Ӗ.anGzvJ1'}NB0eOXOw۰|;!T.otۭx3LIRz0"I0%^5g\'b%#r{vf( endstream endobj 172 0 obj << /Type /FontDescriptor /FontName /KEKDXO+CMTT8 /Flags 4 /FontBBox [-5 -232 545 699] /Ascent 611 /CapHeight 611 /Descent -222 /ItalicAngle 0 /StemV 76 /XHeight 431 /CharSet (/A/B/D/E/F/G/H/I/L/M/N/O/P/R/S/T/U/V/W/X/Y/a/ampersand/asterisk/b/backslash/bar/braceleft/braceright/bracketleft/bracketright/c/colon/comma/d/e/exclam/f/five/four/g/greater/h/hyphen/i/k/l/less/m/n/nine/numbersign/o/one/p/parenleft/parenright/percent/period/q/r/s/seven/six/t/two/u/v/w/x/y/zero) /FontFile 171 0 R >> endobj 173 0 obj << /Length1 787 /Length2 1116 /Length3 0 /Length 1663 /Filter /FlateDecode >> stream xڭRyTKE+Y I r Z,e!&1L"P)BZ +" x,}z(R U),(ߞ9g|߽Ώ^@ _"Erp\!+Qh4 To  . `&qyI Dh$&9 p`   p9yO@ƁLȐRN c H.FB gA (ՈĕA@>b)S3}89pkKT7QX9r4@Q"9>s%*  lFȜ/?D棾b>.\n9MI$%2cl% CÃv;]Y,Fq"X@l Q($ $ϛyZ[p\RdsT IBĔx.0$C8>;캵좃{_^A?yK2L]`~l M$V\ߦweQ~޷3;]4A1T×<Ü^ c:/kձч$Â,/-[(ԾUeN۔4YؠwH<~ּ2GO -%h4+3dbT'˳;Z&X ZelQl3?˾EawjjͲpX@bkMWsa,"\_О=$ϳSe-˴ no`lqy cM?s,<詷ؾl nyQGʬ9_f5] DuKDXd/?z**kڊ޲zYE-:n藶rJ"cIE4Ȓ5nqgWT!KyQCaT /]̴<ϙs ;Xѝ%:l`rsW]3ZpT\>}qeWYW6Ԋ+3Oh["_eu{FU1)ε2~\ ؛>mPgy@텡;2/> Kۯ2ݡ%#;‡VdMwJKֻm*1ZK=>u%-bCI̜{UV7tVnei9M5 {6=-@5wavf#~rpg+cB֨ϦKM 'eUsc㥆mL*F|lkܦԛ毩vm-Ok?NW1]'V Z>I=I@?> endobj 18 0 obj << /Type /Font /Subtype /Type1 /BaseFont /IJHOPD+CMBX10 /FontDescriptor 144 0 R /FirstChar 11 /LastChar 121 /Widths 132 0 R >> endobj 8 0 obj << /Type /Font /Subtype /Type1 /BaseFont /MSBCTO+CMBX12 /FontDescriptor 108 0 R /FirstChar 12 /LastChar 121 /Widths 138 0 R >> endobj 72 0 obj << /Type /Font /Subtype /Type1 /BaseFont /GCNMRK+CMBXTI10 /FontDescriptor 147 0 R /FirstChar 12 /LastChar 120 /Widths 128 0 R >> endobj 55 0 obj << /Type /Font /Subtype /Type1 /BaseFont /XNKLJM+CMITT10 /FontDescriptor 149 0 R /FirstChar 126 /LastChar 126 /Widths 129 0 R >> endobj 19 0 obj << /Type /Font /Subtype /Type1 /BaseFont /SYFPBV+CMMI10 /FontDescriptor 151 0 R /FirstChar 60 /LastChar 62 /Widths 131 0 R >> endobj 10 0 obj << /Type /Font /Subtype /Type1 /BaseFont /PORRPD+CMR10 /FontDescriptor 153 0 R /FirstChar 11 /LastChar 122 /Widths 136 0 R >> endobj 6 0 obj << /Type /Font /Subtype /Type1 /BaseFont /XEYDQT+CMR12 /FontDescriptor 105 0 R /FirstChar 44 /LastChar 114 /Widths 140 0 R >> endobj 4 0 obj << /Type /Font /Subtype /Type1 /BaseFont /QWGXWV+CMR17 /FontDescriptor 99 0 R /FirstChar 11 /LastChar 120 /Widths 142 0 R >> endobj 13 0 obj << /Type /Font /Subtype /Type1 /BaseFont /RFRPSA+CMR8 /FontDescriptor 157 0 R /FirstChar 44 /LastChar 122 /Widths 133 0 R >> endobj 23 0 obj << /Type /Font /Subtype /Type1 /BaseFont /UABGXL+CMSY10 /FontDescriptor 159 0 R /FirstChar 102 /LastChar 110 /Widths 130 0 R >> endobj 12 0 obj << /Type /Font /Subtype /Type1 /BaseFont /GUOWTK+CMSY6 /FontDescriptor 161 0 R /FirstChar 3 /LastChar 3 /Widths 134 0 R >> endobj 7 0 obj << /Type /Font /Subtype /Type1 /BaseFont /FRNIHB+CMSY8 /FontDescriptor 163 0 R /FirstChar 3 /LastChar 3 /Widths 139 0 R >> endobj 9 0 obj << /Type /Font /Subtype /Type1 /BaseFont /GPYHEJ+CMTI10 /FontDescriptor 165 0 R /FirstChar 11 /LastChar 122 /Widths 137 0 R >> endobj 5 0 obj << /Type /Font /Subtype /Type1 /BaseFont /ZZYCTS+CMTI12 /FontDescriptor 167 0 R /FirstChar 11 /LastChar 120 /Widths 141 0 R >> endobj 11 0 obj << /Type /Font /Subtype /Type1 /BaseFont /WTGXZZ+CMTT10 /FontDescriptor 169 0 R /FirstChar 33 /LastChar 125 /Widths 135 0 R >> endobj 83 0 obj << /Type /Font /Subtype /Type1 /BaseFont /KEKDXO+CMTT8 /FontDescriptor 172 0 R /FirstChar 33 /LastChar 125 /Widths 127 0 R >> endobj 14 0 obj << /Type /Pages /Count 6 /Parent 174 0 R /Kids [2 0 R 16 0 R 21 0 R 25 0 R 28 0 R 31 0 R] >> endobj 36 0 obj << /Type /Pages /Count 6 /Parent 174 0 R /Kids [34 0 R 38 0 R 41 0 R 44 0 R 47 0 R 50 0 R] >> endobj 56 0 obj << /Type /Pages /Count 6 /Parent 174 0 R /Kids [53 0 R 58 0 R 61 0 R 64 0 R 67 0 R 70 0 R] >> endobj 76 0 obj << /Type /Pages /Count 6 /Parent 174 0 R /Kids [74 0 R 78 0 R 81 0 R 85 0 R 88 0 R 92 0 R] >> endobj 97 0 obj << /Type /Pages /Count 2 /Parent 174 0 R /Kids [95 0 R 125 0 R] >> endobj 174 0 obj << /Type /Pages /Count 26 /Kids [14 0 R 36 0 R 56 0 R 76 0 R 97 0 R] >> endobj 175 0 obj << /Type /Catalog /Pages 174 0 R >> endobj 176 0 obj << /Producer (pdfTeX-1.40.3) /Creator (TeX) /CreationDate (D:20121216235736+01'00') /ModDate (D:20121216235736+01'00') /Trapped /False /PTEX.Fullbanner (This is pdfTeX using libpoppler, Version 3.141592-1.40.3-2.2 (Web2C 7.5.6) kpathsea version 3.5.6) >> endobj xref 0 177 0000000000 65535 f 0000001833 00000 n 0000001728 00000 n 0000000015 00000 n 0000187826 00000 n 0000188670 00000 n 0000187685 00000 n 0000188390 00000 n 0000186969 00000 n 0000188528 00000 n 0000187543 00000 n 0000188812 00000 n 0000188251 00000 n 0000187966 00000 n 0000189097 00000 n 0000004583 00000 n 0000004475 00000 n 0000002003 00000 n 0000186826 00000 n 0000187401 00000 n 0000007555 00000 n 0000007447 00000 n 0000004710 00000 n 0000188107 00000 n 0000009961 00000 n 0000009853 00000 n 0000007671 00000 n 0000012347 00000 n 0000012239 00000 n 0000010089 00000 n 0000014592 00000 n 0000014484 00000 n 0000012463 00000 n 0000016496 00000 n 0000016388 00000 n 0000014697 00000 n 0000189206 00000 n 0000018565 00000 n 0000018457 00000 n 0000016600 00000 n 0000020638 00000 n 0000020530 00000 n 0000018681 00000 n 0000022477 00000 n 0000022369 00000 n 0000020754 00000 n 0000024679 00000 n 0000024571 00000 n 0000022581 00000 n 0000027423 00000 n 0000027315 00000 n 0000024794 00000 n 0000030069 00000 n 0000029961 00000 n 0000027550 00000 n 0000187256 00000 n 0000189316 00000 n 0000030715 00000 n 0000030607 00000 n 0000030196 00000 n 0000033152 00000 n 0000033044 00000 n 0000030784 00000 n 0000035311 00000 n 0000035203 00000 n 0000033291 00000 n 0000036140 00000 n 0000036032 00000 n 0000035438 00000 n 0000038198 00000 n 0000038090 00000 n 0000036231 00000 n 0000187111 00000 n 0000040243 00000 n 0000040135 00000 n 0000038337 00000 n 0000189426 00000 n 0000041402 00000 n 0000041294 00000 n 0000040382 00000 n 0000043073 00000 n 0000042965 00000 n 0000041505 00000 n 0000188955 00000 n 0000044638 00000 n 0000044530 00000 n 0000043177 00000 n 0000046107 00000 n 0000045999 00000 n 0000044731 00000 n 0000047862 00000 n 0000047261 00000 n 0000047153 00000 n 0000046200 00000 n 0000054775 00000 n 0000047754 00000 n 0000047354 00000 n 0000189536 00000 n 0000050911 00000 n 0000125343 00000 n 0000054636 00000 n 0000051184 00000 n 0000186657 00000 n 0000054575 00000 n 0000051338 00000 n 0000118445 00000 n 0000054350 00000 n 0000051492 00000 n 0000082427 00000 n 0000054233 00000 n 0000051647 00000 n 0000171256 00000 n 0000054058 00000 n 0000051802 00000 n 0000051957 00000 n 0000125312 00000 n 0000052633 00000 n 0000186626 00000 n 0000052659 00000 n 0000118414 00000 n 0000053266 00000 n 0000082395 00000 n 0000053582 00000 n 0000171224 00000 n 0000056098 00000 n 0000055987 00000 n 0000054883 00000 n 0000056192 00000 n 0000056769 00000 n 0000057428 00000 n 0000057451 00000 n 0000057514 00000 n 0000057549 00000 n 0000058182 00000 n 0000058674 00000 n 0000058699 00000 n 0000059090 00000 n 0000059713 00000 n 0000060382 00000 n 0000061019 00000 n 0000061044 00000 n 0000061434 00000 n 0000061945 00000 n 0000062620 00000 n 0000072396 00000 n 0000072743 00000 n 0000082726 00000 n 0000087598 00000 n 0000087865 00000 n 0000089552 00000 n 0000089782 00000 n 0000091590 00000 n 0000091823 00000 n 0000108348 00000 n 0000108904 00000 n 0000118730 00000 n 0000125569 00000 n 0000130382 00000 n 0000130655 00000 n 0000132385 00000 n 0000132640 00000 n 0000134015 00000 n 0000134246 00000 n 0000135597 00000 n 0000135829 00000 n 0000147589 00000 n 0000147932 00000 n 0000151118 00000 n 0000151355 00000 n 0000165338 00000 n 0000165883 00000 n 0000171484 00000 n 0000184336 00000 n 0000184844 00000 n 0000189619 00000 n 0000189708 00000 n 0000189761 00000 n trailer << /Size 177 /Root 175 0 R /Info 176 0 R /ID [ ] >> startxref 190033 %%EOF latexdiff-1.0.2/doc/example-diff.tex0000644000076400007640000000644512063450740017220 0ustar tilmanntilmann\documentclass[12pt,a4paper]{article} %DIF LATEXDIFF DIFFERENCE FILE %DIF DEL example-draft.tex Sat Nov 17 00:45:22 2012 %DIF ADD example-rev.tex Sat Nov 17 00:45:22 2012 \setlength{\topmargin}{-0.2in} \setlength{\textheight}{9.5in} \setlength{\oddsidemargin}{0.0in} %DIF 7c7 %DIF < \setlength{\textwidth}{6.5in} %DIF ------- \setlength{\textwidth}{6in} %DIF > %DIF ------- \title{latexdiff Example - \DIFdelbegin \DIFdel{Draft }\DIFdelend \DIFaddbegin \DIFadd{Revised }\DIFaddend version} \author{F Tilmann} % Note how in the preamble visual markup is never used (even %DIF > % if some preamble might eventually end up as visible text.) %DIF > %DIF PREAMBLE EXTENSION ADDED BY LATEXDIFF %DIF UNDERLINE PREAMBLE %DIF PREAMBLE \RequirePackage[normalem]{ulem} %DIF PREAMBLE \RequirePackage{color}\definecolor{RED}{rgb}{1,0,0}\definecolor{BLUE}{rgb}{0,0,1} %DIF PREAMBLE \providecommand{\DIFadd}[1]{{\protect\color{blue}\uwave{#1}}} %DIF PREAMBLE \providecommand{\DIFdel}[1]{{\protect\color{red}\sout{#1}}} %DIF PREAMBLE %DIF SAFE PREAMBLE %DIF PREAMBLE \providecommand{\DIFaddbegin}{} %DIF PREAMBLE \providecommand{\DIFaddend}{} %DIF PREAMBLE \providecommand{\DIFdelbegin}{} %DIF PREAMBLE \providecommand{\DIFdelend}{} %DIF PREAMBLE %DIF FLOATSAFE PREAMBLE %DIF PREAMBLE \providecommand{\DIFaddFL}[1]{\DIFadd{#1}} %DIF PREAMBLE \providecommand{\DIFdelFL}[1]{\DIFdel{#1}} %DIF PREAMBLE \providecommand{\DIFaddbeginFL}{} %DIF PREAMBLE \providecommand{\DIFaddendFL}{} %DIF PREAMBLE \providecommand{\DIFdelbeginFL}{} %DIF PREAMBLE \providecommand{\DIFdelendFL}{} %DIF PREAMBLE %DIF END PREAMBLE EXTENSION ADDED BY LATEXDIFF \begin{document} \maketitle \section*{Introduction} This is an extremely simple document that showcases some of \DIFaddbegin \DIFadd{the }\DIFaddend latexdiff features. Type \begin{verbatim} latexdiff -t UNDERLINE example-draft.tex example-rev.tex > example-diff.tex \end{verbatim} to create the difference file. You can inspect this file directly. Then run either \begin{verbatim} pdflatex example-diff.tex xpdf example-diff.pdf \end{verbatim} or \begin{verbatim} latex example-diff.tex dvips -o example-diff.ps example-diff.dvi gv example-diff.ps \end{verbatim} to display the markup. \section*{\DIFdelbegin \DIFdel{Another }\DIFdelend \DIFaddbegin \DIFadd{Yet another }\DIFaddend section title} \DIFdelbegin \DIFdel{A paragraph with a line only in the draft document. }\DIFdelend More things could be said were it not for the constraints of time and space. \DIFaddbegin \DIFadd{A paragraph with a line only in the revised document. }\DIFaddend More things could be said were it not for the constraints of time and space. And here is a \DIFdelbegin \DIFdel{tipo}\DIFdelend \DIFaddbegin \DIFadd{typo}\DIFaddend . Here is a table: \begin{tabular}{ll} Name & Description \\ \hline Gandalf & \DIFdelbegin \DIFdel{Grey }\DIFdelend \DIFaddbegin \DIFadd{White }\DIFaddend \\ Saruman & \DIFdelbegin \DIFdel{White }\DIFdelend \DIFaddbegin \DIFadd{Evil }\DIFaddend \end{tabular} And \DIFdelbegin \DIFdel{sometimes a whole paragraph gets completely rewritten. In this case latexdiff marks up the whole paragraph even if some words in it are identical}\DIFdelend \DIFaddbegin \DIFadd{now for something completely different, with not a paragraph in sight}\DIFaddend . No change, no markup! \end{document} latexdiff-1.0.2/latexdiff0000755000076400007640000037774412063450736015306 0ustar tilmanntilmann#!/usr/bin/env perl ##!/usr/bin/perl -w # latexdiff - differences two latex files on the word level # and produces a latex file with the differences marked up. # # Copyright (C) 2004-12 F J Tilmann (tilmann@gfz-potsdam.de, ftilmann@users.berlios.de) # # Project webpages: http://latexdiff.berlios.de/ # CTAN page: http://www.ctan.org/tex-archive/support/latexdiff # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation, either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # You should have received a copy of the GNU General Public License # along with this program. If not, see . # # Detailed usage information at the end of the file # # Version 1.0.1 - treat \big,\bigg etc. equivalently to \left and # \right - include starred version in MATHENV - apply # - flatten recursively and --flatten expansion is now # aware of comments (thanks to Tim Connors for patch) # - Change to post-processing for more reliability for # deleted math environments # - On linux systems, recognise and remove DOS style newlines # - Provide markup for some special preamble commands (\title, # \author,\date, # - configurable by setting context2cmd # - for styles using ulem package, remove \emph and \text.. from list of # safe commands in order to allow linebreaks within the # highlighted sections. # - for ulem style, now show citations by enclosing them in \mbox commands. # This unfortunately implies linebreaks within citations no longer function, # so this functionality can be turned off (Option --disable-citation-markup). # With --enable-citation-markup, the mbox markup is forced for other styles) # - new substyle COLOR. This is particularly useful for marking up citations # and some special post-processing is implemented to retain cite # commands in deleted blocks. # - four different levels of math-markup # - Option --driver for choosing driver for modes employing changebar package # - accept \\* as valid command (and other commands of form \.*). Also accept # \ (backslashed newline) # - some typo fixes, include commands defined in preamble as safe commands # (Sebastian Gouezel) # - include compared filenames as comments as line 2 and 3 of # the preamble (can be modified with option --label, and suppressed with # --no-label), option --visible-label to show files in generated pdf or dvi # at the beginning of main document # # Version 0.5 A number of minor improvements based on feedback # Deleted blocks are now shown before added blocks # Package specific processing # # Version 0.43 unreleased typo in list of styles at the end # Add protect to all \cbstart, \cbend commands # More robust substitution of deleted math commands # # Version 0.42 November 06 Bug fixes only # # Version 0.4 March 06 option for fast differencing using UNIX diff command, several minor bug fixes (\par bug, improved highlighting of textcmds) # # Version 0.3 August 05 improved parsing of displayed math, --allow-spaces # option, several minor bug fixes # # Version 0.25 October 04 Fix bug with deleted equations, add math mode commands to safecmd, add | to allowed interpunctuation signs # Version 0.2 September 04 extension to utf-8 and variable encodings # Version 0.1 August 04 First public release use Algorithm::Diff qw(traverse_sequences); use Getopt::Long ; use strict ; use warnings; use utf8 ; my ($algodiffversion)=split(/ /,$Algorithm::Diff::VERSION); my ($versionstring)=< 0, WHOLE => 1, COARSE => 2, FINE => 3 }; my (@configlist,@labels, @appendsafelist,@excludesafelist, @appendtextlist,@excludetextlist, @appendcontext1list,@appendcontext2list, @packagelist); my ($assign,@config); # Hash where keys corresponds to the names of all included packages (including the documentclass as another package # the optional arguments to the package are the values of the hash elements my ($pkg,%packages); # Defaults $type='UNDERLINE'; $subtype='SAFE'; $floattype='FLOATSAFE'; $mathmarkup=COARSE; $verbose=0; # output debug and intermediate files, set to 0 in final distribution $debug=0; # define character properties sub IsNonAsciiPunct { return <<'END' # Unicode punctuation but excluding ASCII punctuation +utf8::IsPunct -utf8::IsASCII END } sub IsNonAsciiS { return <<'END' # Unicode symbol but excluding ASCII +utf8::IsS -utf8::IsASCII END } my %verbhash; Getopt::Long::Configure('bundling'); GetOptions('type|t=s' => \$type, 'subtype|s=s' => \$subtype, 'floattype|f=s' => \$floattype, 'config|c=s' => \@configlist, 'preamble|p=s' => \$preamblefile, 'encoding|e=s' => \$encoding, 'label|L=s' => \@labels, 'no-label' => \$nolabel, 'visible-label' => \$visiblelabel, 'exclude-safecmd|A=s' => \@excludesafelist, 'replace-safecmd=s' => \$replacesafe, 'append-safecmd|a=s' => \@appendsafelist, 'exclude-textcmd|X=s' => \@excludetextlist, 'replace-textcmd=s' => \$replacetext, 'append-textcmd|x=s' => \@appendtextlist, 'replace-context1cmd=s' => \$replacecontext1, 'append-context1cmd=s' => \@appendcontext1list, 'replace-context2cmd=s' => \$replacecontext2, 'append-context2cmd=s' => \@appendcontext2list, 'show-preamble' => \$showpreamble, 'show-safecmd' => \$showsafe, 'show-textcmd' => \$showtext, 'show-config' => \$showconfig, 'show-all' => \$showall, 'packages=s' => \@packagelist, 'allow-spaces' => \$allowspaces, 'math-markup=s' => \$mathmarkup, 'enable-citation-markup' => \$enablecitmark, 'disable-citation-markup' => \$disablecitmark, 'verbose|V' => \$verbose, 'ignore-warnings' => \$ignorewarnings, 'driver=s'=> \$driver, 'flatten' => \$flatten, 'version' => \$version, 'help|h|H' => \$help); if ( $help ) { usage() ; } if ( $version ) { die $versionstring ; } print STDERR $versionstring if $verbose; if (defined($showall)){ $showpreamble=$showsafe=$showtext=$showconfig=1; } if (defined($mathmarkup)) { $mathmarkup=~tr/a-z/A-Z/; if ( $mathmarkup eq 'OFF' ){ $mathmarkup=OFF; } elsif ( $mathmarkup eq 'WHOLE' ){ $mathmarkup=WHOLE; } elsif ( $mathmarkup eq 'COARSE' ){ $mathmarkup=COARSE; } elsif ( $mathmarkup eq 'FINE' ){ $mathmarkup=FINE; } elsif ( $mathmarkup !~ m/^[0123]$/ ) { die "Illegal value: ($mathmarkup) for option--math-markup. Possible values: OFF,WHOLE,COARSE,FINE,0- "; } # else use numerical value } # setting extra preamble commands if (defined($preamblefile)) { $latexdiffpreamble=join "\n",(extrapream($preamblefile),""); } else { $latexdiffpreamble=join "\n",(extrapream($type,$subtype,$floattype),""); } if ( defined($driver) ) { # for changebar only $latexdiffpreamble=~s/\[dvips\]/[$driver]/sg; } # setting up @SAFECMDLIST and @SAFECMDEXCL if (defined($replacesafe)) { init_regex_arr_ext(\@SAFECMDLIST,$replacesafe); } else { init_regex_arr_data(\@SAFECMDLIST, "SAFE COMMANDS"); } foreach $appendsafe ( @appendsafelist ) { init_regex_arr_ext(\@SAFECMDLIST, $appendsafe); } foreach $excludesafe ( @excludesafelist ) { init_regex_arr_ext(\@SAFECMDEXCL, $excludesafe); } # Special: treat all cite commands as safe except in UNDERLINE and FONTSTRIKE mode # (there is a conflict between citation and ulem package, see # package documentation) # Use post-processing if ( uc($type) ne "UNDERLINE" && uc($type) ne "FONTSTRIKE" && uc($type) ne "CULINECHBAR" ) { push (@SAFECMDLIST, qr/^cite.*$/); } else { ### Experimental: disable text and emph commands push (@SAFECMDLIST, qr/^cite.*$/) unless $disablecitmark; push(@SAFECMDEXCL, qr/^emph$/, qr/^text..$/); # replace \cite{..} by \mbox{\cite{..}} in added or deleted blocks in post-processing if ( uc($subtype) eq "COLOR" or uc($subtype) eq "DVIPSCOL" ) { # remove \cite command again from list of safe commands pop @SAFECMDLIST; # deleted cite commands $CITE2CMD='(?:cite\w*|nocite)' unless $disablecitmark ; # \cite-type commands which should be reinstated in deleted blocks } else { $CITECMD='(?:cite\w*|nocite)' unless $disablecitmark ; # \cite commands which need to be protected within an mbox in UNDERLINE and other modes using ulem } } $CITECMD='(?:cite\w*|nocite)' if $enablecitmark ; # as above for explicit selection # setting up @TEXTCMDLIST and @TEXTCMDEXCL if (defined($replacetext)) { init_regex_arr_ext(\@TEXTCMDLIST,$replacetext); } else { init_regex_arr_data(\@TEXTCMDLIST, "TEXT COMMANDS"); } foreach $appendtext ( @appendtextlist ) { init_regex_arr_ext(\@TEXTCMDLIST, $appendtext); } foreach $excludetext ( @excludetextlist ) { init_regex_arr_ext(\@TEXTCMDEXCL, $excludetext); } # setting up @CONTEXT1CMDLIST ( @CONTEXT1CMDEXCL exist but is always empty ) if (defined($replacecontext1)) { init_regex_arr_ext(\@CONTEXT1CMDLIST,$replacecontext1); } else { init_regex_arr_data(\@CONTEXT1CMDLIST, "CONTEXT1 COMMANDS"); } foreach $appendcontext1 ( @appendcontext1list ) { init_regex_arr_ext(\@CONTEXT1CMDLIST, $appendcontext1); } # setting up @CONTEXT2CMDLIST ( @CONTEXT2CMDEXCL exist but is always empty ) if (defined($replacecontext2)) { init_regex_arr_ext(\@CONTEXT2CMDLIST,$replacecontext2); } else { init_regex_arr_data(\@CONTEXT2CMDLIST, "CONTEXT2 COMMANDS"); } foreach $appendcontext2 ( @appendcontext2list ) { init_regex_arr_ext(\@CONTEXT2CMDLIST, $appendcontext2); } # setting configuration variables @config=(); foreach $config ( @configlist ) { if (-f $config ) { open(FILE,$config) or die ("Couldn't open configuration file $config: $!"); while () { chomp; next if /^\s*#/ || /^\s*%/ || /^\s*$/ ; push (@config,$_); } close(FILE); } else { # foreach ( split(",",$config) ) { # push @config,$_; # } push @config,split(",",$config) } } foreach $assign ( @config ) { $assign=~ m/\s*(\w*)\s*=\s*(\S*)\s*$/ or die "Illegal assignment $assign in configuration list (must be variable=value)"; if ( $1 eq "MINWORDSBLOCK" ) { $MINWORDSBLOCK = $2; } elsif ( $1 eq "FLOATENV" ) { $FLOATENV = $2 ; } elsif ( $1 eq "PICTUREENV" ) { $PICTUREENV = $2 ; } elsif ( $1 eq "MATHENV" ) { $MATHENV = $2 ; } elsif ( $1 eq "MATHREPL" ) { $MATHREPL = $2 ; } elsif ( $1 eq "MATHARRENV" ) { $MATHARRENV = $2 ; } elsif ( $1 eq "MATHARRREPL" ) { $MATHARRREPL = $2 ; } elsif ( $1 eq "ARRENV" ) { $ARRENV = $2 ; } elsif ( $1 eq "COUNTERCMD" ) { $COUNTERCMD = $2 ; } else { die "Unknown variable $1 in assignment.";} } if ( $mathmarkup == COARSE || $mathmarkup == WHOLE ) { push(@MATHTEXTCMDLIST,qr/^MATHBLOCK(?:$MATHENV|$MATHARRENV|SQUAREBRACKET)$/); } foreach $pkg ( @packagelist ) { map { $packages{$_}="" } split(/,/,$pkg) ; } if ($showpreamble) { print "\nPreamble commands:\n"; print $latexdiffpreamble ; } if ($showsafe) { print "\nCommands safe within scope of $ADDOPEN $ADDCLOSE and $DELOPEN $DELCLOSE (unless excluded):\n"; print_regex_arr(@SAFECMDLIST); print "\nCommands not safe within scope of $ADDOPEN $ADDCLOSE and $DELOPEN $DELCLOSE :\n"; print_regex_arr(@SAFECMDEXCL); } if ($showtext) { print "\nCommands with last argument textual (unless excluded) and safe in every context:\n"; print_regex_arr(@TEXTCMDLIST); print "\nContext1 commands (last argument textual, command will be disabled in deleted passages, last argument will be shown as plain text):\n"; print_regex_arr(@CONTEXT1CMDLIST); print "\nContext2 commands (last argument textual, command and its argument will be disabled in deleted passages):\n"; print_regex_arr(@CONTEXT2CMDLIST); print "\nExclude list of Commands with last argument not textual (overrides patterns above):\n"; print_regex_arr(@TEXTCMDEXCL); } if ($showconfig) { print "Configuration variables:\n"; print "MINWORDSBLOCK=$MINWORDSBLOCK\n"; print "FLOATENV=$FLOATENV\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"; } if ($showconfig || $showtext || $showsafe || $showpreamble) { exit 0; } if ( @ARGV != 2 ) { print STDERR "2 and only 2 non-option arguments required. Write latexdiff -h to get help\n"; exit(2); } # Are extra spaces between command arguments permissible? my $extraspace; if ($allowspaces) { $extraspace='\s*'; } else { $extraspace=''; } # append context lists to text lists (as text property is implied) push @TEXTCMDLIST, @CONTEXT1CMDLIST; push @TEXTCMDLIST, @CONTEXT2CMDLIST; push @TEXTCMDLIST, @MATHTEXTCMDLIST if $mathmarkup==COARSE; # internal additions to SAFECMDLIST push(@SAFECMDLIST, qr/^QLEFTBRACE$/, qr/^QRIGHTBRACE$/); # Patterns. These are used by some of the subroutines, too # I can only define them down here because value of extraspace depends on an option my $pat0 = '(?:[^{}])*'; my $pat1 = '(?:[^{}]|\{'.$pat0.'\})*'; my $pat2 = '(?:[^{}]|\{'.$pat1.'\})*'; my $pat3 = '(?:[^{}]|\{'.$pat2.'\})*'; my $pat4 = '(?:[^{}]|\{'.$pat3.'\})*'; my $pat5 = '(?:[^{}]|\{'.$pat4.'\})*'; my $pat6 = '(?:[^{}]|\{'.$pat5.'\})*'; my $brat0 = '(?:[^\[\]]|\\\[|\\\])*'; my $quotemarks = '(?:\'\')|(?:\`\`)'; my $punct='[0.,\/\'\`:;\"\?\(\)\[\]!~\p{IsNonAsciiPunct}\p{IsNonAsciiS}]'; my $number='-?\d*\.\d*'; my $mathpunct='[+=<>\-\|]'; my $and = '&'; my $coords= '[\-.,\s\d]*'; # word: sequence of letters or accents followed by letter my $word='(?:[-\w\d*]|\\\\[\"\'\`~^][A-Za-z\*])+'; my $cmdleftright='\\\\(?:left|right|[Bb]igg?[lrm]?|middle)\s*(?:[()\[\]|]|\\\\(?:[|{}]|\w+))'; my $cmdoptseq='\\\\[\w\d\*]+'.$extraspace.'(?:(?:\['.$brat0.'\]|\{'. $pat6 . '\}|\(' . $coords .'\))'.$extraspace.')*'; my $backslashnl='\\\\\n'; my $oneletcmd='\\\\.\*?(?:\['.$brat0.'\]|\{'. $pat6 . '\})*'; my $math='\$(?:[^$]|\\\$)*?\$|\\\\[(].*?\\\\[)]'; ## the current maths command cannot cope with newline within the math expression my $comment='%.*?\n'; my $pat=qr/(?:\A\s*)?(?:${and}|${quotemarks}|${number}|${word}|$cmdleftright|${cmdoptseq}|${math}|${backslashnl}|${oneletcmd}|${comment}|${punct}|${mathpunct}|\{|\})\s*/ ; # now we are done setting up and can start working my ($oldfile, $newfile) = @ARGV; # check for existence of input files if ( ! -e $oldfile ) { die "Input file $oldfile does not exist."; } if ( ! -e $newfile ) { die "Input file $newfile does not exist."; } # set the labels to be included into the file my ($oldtime,$newtime,$oldlabel,$newlabel); if (defined($labels[0])) { $oldlabel=$labels[0] ; } else { $oldtime=localtime((stat($oldfile))[9]); $oldlabel="$oldfile " . " "x(length($newfile)-length($oldfile)) . $oldtime; } if (defined($labels[1])) { $newlabel=$labels[1] ; } else { $newtime=localtime((stat($newfile))[9]); $newlabel="$newfile " . " "x(length($oldfile)-length($newfile)) . $newtime; } $encoding=guess_encoding($newfile) unless defined($encoding); $encoding = "utf8" if $encoding =~ m/^utf8/i ; if (lc($encoding) eq "utf8" ) { binmode(STDOUT, ":utf8"); binmode(STDERR, ":utf8"); } $old=read_file_with_encoding($oldfile,$encoding); $new=read_file_with_encoding($newfile,$encoding); # reset time exetime(1); ($oldpreamble,$oldbody,$oldpost)=splitdoc($old,'\\\\begin\{document\}','\\\\end\{document\}'); ($newpreamble,$newbody,$newpost)=splitdoc($new,'\\\\begin\{document\}','\\\\end\{document\}'); if ($flatten) { $oldbody=flatten($oldbody,$oldpreamble,$oldfile,$encoding); $newbody=flatten($newbody,$newpreamble,$newfile,$encoding); } my @auxlines; if ( length $oldpreamble && length $newpreamble ) { # pre-process preamble by looking for commands used in \maketitle (title, author, date etc commands) # and marking up content with latexdiff markup @auxlines=preprocess_preamble($oldpreamble,$newpreamble); @oldpreamble = split /\n/, $oldpreamble; @newpreamble = split /\n/, $newpreamble; # If a command is defined in the preamble of the new file, and only uses safe commands, then it can be considered to be safe) (contribution S. Gouezel) # Base this assessment on the new preamble add_safe_commands($newpreamble); %packages=list_packages(@newpreamble) unless %packages; if (defined $packages{"hyperref"} ) { print STDERR "hyperref package detected.\n" if $verbose ; $latexdiffpreamble =~ s/\{\\DIFadd\}/{\\DIFaddtex}/g; $latexdiffpreamble =~ s/\{\\DIFdel\}/{\\DIFdeltex}/g; $latexdiffpreamble .= join "\n",(extrapream("HYPERREF"),""); } print STDERR "Differencing preamble.\n" if $verbose; # insert dummy first line such that line count begins with line 1 (rather than perl's line 0) - just so that line numbers inserted by linediff are correct unshift @newpreamble,''; unshift @oldpreamble,''; @diffpreamble = linediff(\@oldpreamble, \@newpreamble); # remove dummy line again shift @diffpreamble; # add filenames, modification time and latexdiff mark defined($nolabel) or splice @diffpreamble,1,0, "%DIF LATEXDIFF DIFFERENCE FILE", ,"%DIF DEL $oldlabel", "%DIF ADD $newlabel"; if ( @auxlines ) { push @diffpreamble,"%DIF DELETED TITLE COMMANDS FOR MARKUP"; push @diffpreamble,join("\n",@auxlines); } push @diffpreamble,$latexdiffpreamble; push @diffpreamble,'\begin{document}'; } elsif ( !length $oldpreamble && !length $newpreamble ) { @diffpreamble=(); } else { print STDERR "Either both texts must have preamble or neither text must have the preamble.\n"; exit(2); } if (defined $packages{"amsmath"} or defined $packages{"amsart"} or defined $packages{"amsbook"} ) { print STDERR "amsmath package detected.\n" if $verbose ; $MATHARRREPL='align*'; } print STDERR "Preprocessing body. " if $verbose; my ($oldleadin,$newleadin)=preprocess($oldbody,$newbody); # run difference algorithm @diffbody=bodydiff($oldbody, $newbody); $diffbo=join("",@diffbody); if ( $debug ) { open(RAWDIFF,">","latexdiff.debug.bodydiff"); print RAWDIFF $diffbo; close(RAWDIFF); } print STDERR "(",exetime()," s)\n","Postprocessing body. \n " if $verbose; postprocess($diffbo); $diffall =join("\n",@diffpreamble) ; # add visible labels if (defined($visiblelabel)) { # Give information right after \begin{document} (or at the beginning of the text for files without preamble ### if \date command is used, add information to \date argument, otherwise give right after \begin{document} ### $diffall=~s/(\\date$extraspace(?:\[$brat0\])?$extraspace)\{($pat6)\}/$1\{$2 \\ LATEXDIFF comparison \\ Old: $oldlabel \\ New: $newlabel \}/ or $diffbo = "\\begin{verbatim}LATEXDIFF comparison\nOld: $oldlabel\nNew: $newlabel\\end{verbatim}\n$diffbo" ; } $diffall .= "$newleadin$diffbo" ; $diffall .= "\\end{document}$newpost" if length $newpreamble ; if ( lc($encoding) ne "utf8" && lc($encoding) ne "ascii" ) { print STDERR "Encoding output file to $encoding\n" if $verbose; $diffall=Encode::encode($encoding,$diffall); binmode STDOUT; } print $diffall; print STDERR "(",exetime()," s)\n","Done.\n" if $verbose; ## guess_encoding(filename) ## reads the first 20 lines of filename and looks for call of inputenc package ## if found, return the option of this package (encoding), otherwise return ascii sub guess_encoding { my ($filename)=@_; my ($i,$enc); open (FH, $filename) or die("Couldn't open $filename: $!"); $i=0; while () { next if /^\s*%/; # skip comment lines if (m/\\usepackage\[(\w*?)\]\{inputenc\}/) { close(FH); return($1); } last if (++$i > 20 ); # scan at most 20 non-comment lines } close(FH); return("ascii"); } sub read_file_with_encoding { my ($output); my ($filename, $encoding) = @_; if (lc($encoding) eq "utf8" ) { open (FILE, "<:utf8",$filename) or die("Couldn't open $filename: $!"); local $/ ; # locally set record operator to undefined, ie. enable whole-file mode $output=; } elsif ( lc($encoding) eq "ascii") { open (FILE, $filename) or die("Couldn't open $filename: $!"); local $/ ; # locally set record operator to undefined, ie. enable whole-file mode $output=; } else { require Encode; open (FILE, "<",$filename) or die("Couldn't open $filename: $!"); local $/ ; # locally set record operator to undefined, ie. enable whole-file mode $output=; print STDERR "Converting $filename from $encoding to utf8\n" if $verbose; $output=Encode::decode($encoding,$output); } close FILE; if ($^O eq "linux" ) { $output =~ s/\r\n/\n/g ; } return $output; } # %packages=list_packages(@preamble) # scans the arguments for \documentclass and \usepackage statements and constructs a hash # whose keys are the included packages, and whose values are the associated optional arguments sub list_packages { my (@preamble)=@_; my %packages=(); foreach $line ( @preamble ) { # get rid of comments $line=~s/(?catfile($dirname,$fname), "\n" if $debug; # content of file becomes replacement value (use recursion), add \newpage if the command was include ###$replacement=read_file_with_encoding(File::Spec->catfile($dirname,$fname), $encoding) or die "Couldn't find file ",File::Spec->catfile($dirname,$fname),": $!"; $replacement=flatten(read_file_with_encoding(File::Spec->catfile($dirname,$fname), $encoding), $preamble,$filename,$encoding) or die "Couldn't find file ",File::Spec->catfile($dirname,$fname),": $!"; # \include always starts a new page; use explicit \newpage command to simulate this $begline=(defined($1)? $1 : "") ; $newpage=(defined($3)? " \\newpage " : "") ; "$begline$newpage$replacement$newpage"; }/exgm; return($text); } # print_regex_arr(@arr) # prints regex array without x-ism expansion put in by pearl to stdout sub print_regex_arr { my $dumstring; $dumstring = join(" ",@_); # PERL generates string (?-xism:^ref$) for quoted refex ^ref$ $dumstring =~ s/\(\?-xism:\^(.*?)\$\)/$1/g; # remove string and ^,$ marks before output print $dumstring,"\n"; } # @lines=extrapream($type) # reads line from appendix (end of file after __END__ token) sub extrapream { my $type; my @retval=("%DIF PREAMBLE EXTENSION ADDED BY LATEXDIFF") ; my ($copy); while (@_) { $copy=0; $type=shift ; if ( -f $type ) { open (FILE,$type) or die "Cannot open preamble file $type: $!"; print STDERR "Reading preamble file $type\n" if $verbose ; while () { chomp ; if ( $_ =~ m/%DIF PREAMBLE/ ) { push (@retval,"$_"); } else { push (@retval,"$_ %DIF PREAMBLE"); } } } else { # not (-f $type) $type=uc($type); # upcase argument print STDERR "Preamble Internal Type $type\n" if $verbose; while () { if ( m/^%DIF $type/ ) { $copy=1; } elsif ( m/^%DIF END $type/ ) { last; } chomp; push (@retval,"$_ %DIF PREAMBLE") if $copy; } if ( $copy == 0 ) { print STDERR "\nPreamble style $type not implemented.\n"; print STDERR "Write latexdiff -h to get help with available styles\n"; exit(2); } seek DATA,0,0; # rewind DATA handle to file begin } } push (@retval,"%DIF END PREAMBLE EXTENSION ADDED BY LATEXDIFF") ; return @retval; } # ($part1,$part2,$part3)=splitdoc($text,$word1,$word2) # splits $text into 3 parts at $word1 and $word2. # if neither $word1 nor $word2 exist, $part1 and $part3 are empty, $part2 is $text # If only $word1 or $word2 exist but not the other, output an error message. # NB this version avoids $` and $' for performance reason although it only makes a tiny difference # (in one test gain a tenth of a second for a 30s run) sub splitdoc { my ($text,$word1,$word2)=@_; my ($part1,$part2,$part3)=("","",""); my ($rest,$pos); if ( $text =~ m/(^[^%]*)($word1)/mg ) { $pos=pos $text; $part1=substr($text,0,$pos-length($2)); $rest=substr($text,$pos); if ( $rest =~ m/(^[^%]*)($word2)/mg ) { $pos=pos $rest; $part2=substr($rest,0,$pos-length($2)); $part3=substr($rest,$pos); } else { die "$word1 and $word2 not in the correct order or not present as a pair." ; } } else { $part2=$text; die "$word2 present but not $word1." if ( $text =~ m/(^[^%]*)$word2/ms ); } return ($part1,$part2,$part3); } # bodydiff($old,$new) sub bodydiff { my ($oldwords, $newwords) = @_; my @retwords; print STDERR "(",exetime()," s)\n","Splitting into latex tokens \n" if $verbose; print STDERR "Parsing $oldfile \n" if $verbose; my @oldwords = splitlatex($oldwords); print STDERR "Parsing $newfile \n" if $verbose; my @newwords = splitlatex($newwords); if ( $debug ) { open(TOKENOLD,">","latexdiff.debug.tokenold"); print TOKENOLD join("***\n",@oldwords); close(TOKENOLD); open(TOKENNEW,">","latexdiff.debug.tokennew"); print TOKENNEW join("***\n",@newwords); close(TOKENNEW); } print STDERR "(",exetime()," s)\n","Pass 1: Expanding text commands and merging isolated identities with changed blocks " if $verbose; pass1(\@oldwords, \@newwords); print STDERR "(",exetime()," s)\n","Pass 2: inserting DIF tokens and mark up. " if $verbose; if ( $debug ) { open(TOKENOLD,">","latexdiff.debug.tokenold2.tex"); print TOKENOLD join("***\n",@oldwords); close(TOKENOLD); open(TOKENNEW,">","latexdiff.debug.tokennew2.tex"); print TOKENNEW join("***\n",@newwords); close(TOKENNEW); } @retwords=pass2(\@oldwords, \@newwords); return(@retwords); } # @words=splitlatex($string) # split string according to latex rules # Each element of words is either # a word (including trailing spaces and punctuation) # a latex command sub splitlatex { my ($string) = @_ ; # if input is empty, return empty list length($string)>0 or return (); my @retval=($string =~ m/$pat/osg); if (length($string) != length(join("",@retval))) { print STDERR "\nWARNING: Inconsistency in length of input string and parsed string:\n This often indicates faulty or non-standard latex code.\n In many cases you can ignore this and the following warning messages.\n Note that character numbers in the following are counted beginning after \\begin{document} and are only approximate." unless $ignorewarnings; print STDERR "DEBUG Original length ",length($string)," Parsed length ",length(join("",@retval)),"\n" if $debug; print STDERR "DEBUG Input string: |$string|\n" if (length($string)<500) && $debug; print STDERR "DEBUG Token parsing: |",join("+",@retval),"|\n" if (length($string)<500) && $debug ; @retval=(); # slow way only do this if other m//sg method fails my $last = 0; while ( $string =~ m/$pat/osg ) { my $match=$&; if ($last + length $& != pos $string ) { my $pos=pos($string); my $offset=30<$last ? 30 : $last; my $dum=substr($string,$last-$offset,$pos-$last+2*$offset); my $dum1=$dum; my $cnt=$#retval; my $i; $dum1 =~ s/\n/ /g; unless ($ignorewarnings) { print STDERR "\n$dum1\n"; print STDERR " " x 30,"^" x ($pos-$last)," " x 30,"\n"; print STDERR "Missing characters near word " . (scalar @retval) . " character index: " . $last . "-" . pos($string) . " Length: " . length($match) . " Match: |$match| (expected match marked above).\n"; } # put in missing characters `by hand' push (@retval, substr($dum,$offset,$pos-$last-length($match))); # Note: there seems to be a bug in substr with utf8 that made the following line output substr which were too long, # using dum instead appears to work # push (@retval, substr($string,$last, pos($string)-$last-length($match))); } push (@retval, $match); $last=pos $string; } } return @retval; } # pass1( \@seq1,\@seq2) # Look for differences between seq1 and seq2. # Where an common-subsequence block is flanked by deleted or appended blocks, # and is shorter than $MINWORDSBLOCK words it is appended # to the last deleted or appended word. If the block contains tokens other than words # or punctuation it is not merged. # Deleted or appended block consisting of words and safe commands only are # also merged, to prevent break-up in pass2 (after previous isolated words have been removed) # If there are commands with textual arguments (e.g. \caption) both in corresponding # appended and deleted blocks split them such that the command and opening bracket # are one token, then the rest is split up following standard rules, and the closing # bracket is a separate token, ie. turn # "\caption{This is a textual argument}" into # ("\caption{","This ","is ","a ","textual ","argument","}") # No return value. Destructively changes sequences sub pass1 { my $seq1 = shift ; my $seq2 = shift ; my $len1 = scalar @$seq1; my $len2 = scalar @$seq2; my $wpat=qr/^(?:[a-zA-Z.,'`:;?()!]*)[\s~]*$/; #' my ($last1,$last2)=(-1,-1) ; my $cnt=0; my $block=[]; my $addblock=[]; my $delblock=[]; my $todo=[]; my $instruction=[]; my $i; my (@delmid,@addmid,@dummy); my ($addcmds,$delcmds,$matchindex); my ($addtextblocks,$deltextblocks); my ($addtokcnt,$deltokcnt,$mattokcnt)=(0,0,0); my ($addblkcnt,$delblkcnt,$matblkcnt)=(0,0,0); my $adddiscard = sub { if ($cnt > 0 ) { $matblkcnt++; # just after an unchanged block # print STDERR "Unchanged block $cnt, $last1,$last2 \n"; if ($cnt < $MINWORDSBLOCK && $cnt==scalar ( grep { /^$wpat/ || ( /^\\([\w\d\*]+)((?:\[$brat0\]|\{$pat6\})*)/o && iscmd($1,\@SAFECMDLIST,\@SAFECMDEXCL) && scalar(@dummy=split(" ",$2))<3 ) } @$block) ) { # merge identical blocks shorter than $MINWORDSBLOCK # and only containing ordinary words # with preceding different word # We cannot carry out this merging immediately as this # would change the index numbers of seq1 and seq2 and confuse # the algorithm, instead we store in @$todo where we have to merge push(@$todo, [ $last1,$last2,$cnt,@$block ]); } $block = []; $cnt=0; $last1=-1; $last2=-1; } }; my $discard=sub { $deltokcnt++; &$adddiscard; #($_[0],$_[1]); push(@$delblock,[ $seq1->[$_[0]],$_[0] ]); $last1=$_[0] }; my $add = sub { $addtokcnt++; &$adddiscard; #($_[0],$_[1]); push(@$addblock,[ $seq2->[$_[1]],$_[1] ]); $last2=$_[1] }; my $match = sub { $mattokcnt++; if ($cnt==0) { # first word of matching sequence after changed sequence or at beginning of word sequence $deltextblocks = extracttextblocks($delblock); $delblkcnt++ if scalar @$delblock; $addtextblocks = extracttextblocks($addblock); $addblkcnt++ if scalar @$addblock; $delcmds = extractcommands($delblock); $addcmds = extractcommands($addblock); # keygen(third argument of _longestCommonSubsequence) implies to sort on command (0th elements of $addcmd elements) # the calling format for longestCommonSubsequence has changed between versions of # Algorithm::Diff so we need to check which one we are using if ( $algodiffversion > 1.15 ) { ### Algorithm::Diff 1.19 $matchindex=Algorithm::Diff::_longestCommonSubsequence($delcmds,$addcmds, 0, sub { $_[0]->[0] } ); } else { ### Algorithm::Diff 1.15 $matchindex=Algorithm::Diff::_longestCommonSubsequence($delcmds,$addcmds, sub { $_[0]->[0] } ); } for ($i=0 ; $i<=$#$matchindex ; $i++) { if (defined($matchindex->[$i])){ $j=$matchindex->[$i]; @delmid=splitlatex($delcmds->[$i][3]); @addmid=splitlatex($addcmds->[$j][3]); while (scalar(@$deltextblocks) && $deltextblocks->[0][0]<$delcmds->[$i][1]) { my ($index,$block,$cnt)=@{ shift(@$deltextblocks) }; push(@$todo, [$index,-1,$cnt,@$block]); } push(@$todo, [ $delcmds->[$i][1],-1,-1,$delcmds->[$i][2],@delmid,$delcmds->[$i][4]]); while (scalar(@$addtextblocks) && $addtextblocks->[0][0]<$addcmds->[$j][1]) { my ($index,$block,$cnt)=@{ shift(@$addtextblocks) }; push(@$todo, [-1,$index,$cnt,@$block]); } push(@$todo, [ -1,$addcmds->[$j][1],-1,$addcmds->[$j][2],@addmid,$addcmds->[$j][4]]); } } # mop up remaining textblocks while (scalar(@$deltextblocks)) { my ($index,$block,$cnt)=@{ shift(@$deltextblocks) } ; push(@$todo, [$index,-1,$cnt,@$block]); } while (scalar(@$addtextblocks)) { my ($index,$block,$cnt)=@{ shift(@$addtextblocks) }; push(@$todo, [-1,$index,$cnt,@$block]); } $addblock=[]; $delblock=[]; } push(@$block,$seq2->[$_[1]]); $cnt++ }; my $keyfunc = sub { join(" ",split(" ",shift())) }; traverse_sequences($seq1,$seq2, { MATCH=>$match, DISCARD_A=>$discard, DISCARD_B=>$add }, $keyfunc ); # now carry out the merging/splitting. Refer to elements relative from # the end (with negative indices) as these offsets don't change before the instruction is executed # cnt>0: merged small unchanged groups with previous changed blocks # cnt==-1: split textual commands into components foreach $instruction ( @$todo) { ($last1,$last2,$cnt,@$block)=@$instruction ; if ($cnt>=0) { splice(@$seq1,$last1-$len1,1+$cnt,join("",$seq1->[$last1-$len1],@$block)) if $last1>=0; splice(@$seq2,$last2-$len2,1+$cnt,join("",$seq2->[$last2-$len2],@$block)) if $last2>=0; } else { splice(@$seq1,$last1-$len1,1,@$block) if $last1>=0; splice(@$seq2,$last2-$len2,1,@$block) if $last2>=0; } } if ($verbose) { print STDERR "\n"; print STDERR " $mattokcnt matching tokens in $matblkcnt blocks.\n"; print STDERR " $deltokcnt discarded tokens in $delblkcnt blocks.\n"; print STDERR " $addtokcnt appended tokens in $addblkcnt blocks.\n"; } } # extracttextblocks(\@blockindex) # $blockindex has the following format # [ [ token1, index1 ], [token2, index2],.. ] # where index refers to the index in the original old or new word sequence # Returns: reference to an array of the form # [[ $index, $textblock, $cnt ], .. # where $index index of block to be merged # $textblock contains all the words to be merged with the word at $index (but does not contain this word) # $cnt is length of block # # requires: iscmd # sub extracttextblocks { my $block=shift; my ($i,$token,$index); my $textblock=[]; my $last=-1; my $wpat=qr/^(?:[a-zA-Z.,'`:;?()!]*)[\s~]*$/; #' my $retval=[]; for ($i=0;$i< scalar @$block;$i++) { ($token,$index)=@{ $block->[$i] }; # store pure text blocks if ($token =~ /$wpat/ || ( $token =~/^\\([\w\d\*]+)((?:${extraspace}\[$brat0\]${extraspace}|${extraspace}\{$pat6\})*)/o && iscmd($1,\@SAFECMDLIST,\@SAFECMDEXCL) && !iscmd($1,\@TEXTCMDLIST,\@TEXTCMDEXCL))) { # we have text or a command which can be treated as text if ($last<0) { # new pure-text block $last=$index; } else { # add to pure-text block push(@$textblock, $token); } } else { # it is not text if (scalar(@$textblock)) { push(@$retval,[ $last, $textblock, scalar(@$textblock) ]); } $textblock=[]; $last=-1; } } # finish processing a possibly unfinished block before returning if (scalar(@$textblock)) { push(@$retval,[ $last, $textblock, scalar(@$textblock) ]); } return($retval) } # extractcommands( \@blockindex ) # $blockindex has the following format # [ [ token1, index1 ], [token2, index2],.. ] # where index refers to the index in the original old or new word sequence # Returns: reference to an array of the form # [ [ "\cmd1", index, "\cmd1[optarg]{arg1}{", "arg2" ,"} " ],.. # where index is just taken from input array # command must have a textual argument as last argument # # requires: iscmd # sub extractcommands { my $block=shift; my ($i,$token,$index,$cmd,$open,$mid,$closing); my $retval=[]; for ($i=0;$i< scalar @$block;$i++) { ($token,$index)=@{ $block->[$i] }; # check if token is an alphanumeric command sequence with at least one non-optional argument # \cmd[...]{...}{last argument} # Capturing in the following results in these associations # $1: \cmd[...]{...}{ # $2: \cmd # $3: last argument # $4: } + trailing spaces if ( ( $token =~ m/^(\\([\w\d\*]+)(?:${extraspace}\[$brat0\]|${extraspace}\{$pat6\})*${extraspace}\{)($pat6)(\}\s*)$/so ) && iscmd($2,\@TEXTCMDLIST,\@TEXTCMDEXCL) ) { # push(@$retval,[ $2,$index,$1,$3,$4 ]); ($cmd,$open,$mid,$closing) = ($2,$1,$3,$4) ; $closing =~ s/\}/\\RIGHTBRACE/ ; push(@$retval,[ $cmd,$index,$open,$mid,$closing ]); } } return $retval; } # iscmd($cmd,\@regexarray,\@regexexcl) checks # return 1 if $cmd matches any of the patterns in the # array $@regexarray, and none of the patterns in \@regexexcl, otherwise return 0 sub iscmd { my ($cmd,$regexar,$regexexcl)=@_; my ($ret)=0; foreach $pat ( @$regexar ) { if ( $cmd =~ m/^${pat}$/ ) { $ret=1 ; last; } } return 0 unless $ret; foreach $pat ( @$regexexcl ) { return 0 if ( $cmd =~ m/^${pat}$/ ); } return 1; } # pass2( \@seq1,\@seq2) # Look for differences between seq1 and seq2. # Mark begin and end of deleted and appended sequences with tags $DELOPEN and $DELCLOSE # and $ADDOPEN and $ADDCLOSE, respectively, however exclude { } & and all comands, unless # they match an element of the whitelist (SAFECMD) # For words in TEXTCMD but not in SAFECMD, enclose interior with $ADDOPEN and $ADDCLOSE brackets # Deleted comment lines are marked with %DIF < # Added comment lines are marked with %DIF > sub pass2 { my $seq1 = shift ; my $seq2 = shift ; my ($addtokcnt,$deltokcnt,$mattokcnt)=(0,0,0); my ($addblkcnt,$delblkcnt,$matblkcnt)=(0,0,0); my $retval = []; my $delhunk = []; my $addhunk = []; my $discard = sub { $deltokcnt++; push ( @$delhunk, $seq1->[$_[0]]) }; my $add = sub { $addtokcnt++; push ( @$addhunk, $seq2->[$_[1]]) }; my $match = sub { $mattokcnt++; if ( scalar @$delhunk ) { $delblkcnt++; # mark up changes, but comment out commands push @$retval,marktags($DELMARKOPEN,$DELMARKCLOSE,$DELOPEN,$DELCLOSE,$DELCMDOPEN,$DELCMDCLOSE,$DELCOMMENT,$delhunk); $delhunk = []; } if ( scalar @$addhunk ) { $addblkcnt++; # we mark up changes, but simply quote commands push @$retval,marktags($ADDMARKOPEN,$ADDMARKCLOSE,$ADDOPEN,$ADDCLOSE,"","",$ADDCOMMENT,$addhunk); $addhunk = []; } push(@$retval,$seq2->[$_[1]]) }; my $keyfunc = sub { join(" ",split(" ",shift())) }; traverse_sequences($seq1,$seq2, { MATCH=>$match, DISCARD_A=>$discard, DISCARD_B=>$add }, $keyfunc ); # clear up unprocessed hunks push @$retval,marktags($DELMARKOPEN,$DELMARKCLOSE,$DELOPEN,$DELCLOSE,$DELCMDOPEN,$DELCMDCLOSE,$DELCOMMENT,$delhunk) if scalar @$delhunk; push @$retval,marktags($ADDMARKOPEN,$ADDMARKCLOSE,$ADDOPEN,$ADDCLOSE,"","",$ADDCOMMENT,$addhunk) if scalar @$addhunk; if ($verbose) { print STDERR "\n"; print STDERR " $mattokcnt matching tokens. \n"; print STDERR " $deltokcnt discarded tokens in $delblkcnt blocks.\n"; print STDERR " $addtokcnt appended tokens in $addblkcnt blocks.\n"; } return(@$retval); } # marktags($openmark,$closemark,$open,$close,$opencmd,$closecmd,$comment,\@block) # returns ($openmark,$open,$block,$close,$closemark) if @block only contains no commands (except white-listed ones), # braces, ampersands, or comments # mark comments with $comment # exclude all other exceptions from scope of open, close like this # ($openmark, $open,...,$close, $opencmd,command, command,$closecmd, $open, ..., $close, $closemark) # If $opencmd begins with "%" marktags assumes it is operating on a deleted block, otherwise on an added block sub marktags { my ($openmark,$closemark,$open,$close,$opencmd,$closecmd,$comment,$block)=@_; my $word; my (@argtext); my $retval=[]; my $noncomment=0; my $cmd=-1; # -1 at beginning 0: last token written is a ordinary word # 1: last token written is a command # for keeping track whether we are just in a command sequence or in a word sequence my $cmdcomment= ($opencmd =~ m/^%/); # Flag to indicate whether opencmd is a comment (i.e. if we intend to simply comment out changed commands) my ($command,$commandword,$closingbracket) ; # temporary variables needed below to remember sub-pattern matches # split this block to flatten out sequences joined in pass1 @$block=splitlatex(join "",@$block); foreach (@$block) { $word=$_; if ( $word =~ s/^%/%$comment/ ) { # a comment if ($cmd==1) { push (@$retval,$closecmd) ; $cmd=-1; } push (@$retval,$word); next; } if (! $noncomment) { push (@$retval,$openmark); $noncomment=1; } # negative lookahead pattern (?!) in second clause is put in to avoid mathcing \( .. \) patterns # also note that second pattern will match \\ # Note: the second pattern should really be $word =~ /^\\(?!\()(\\|[\w*@]+)/, ie * replaced by + # and then all commands \" \' etc declared safe. But as I don't have a complete list of one letter # commands, and nobody has complained so far, I will eave this as is if ( $word =~ /^[&{}\[\]]/ || ( $word =~ /^\\(?!\()(\\|[\w*@]*)/ && !iscmd($1,\@SAFECMDLIST,\@SAFECMDEXCL)) ) { # word is a command or other significant token (not in SAFECMDLIST) ## same conditions as in subroutine extractcommand: # check if token is an alphanumeric command sequence with at least one non-optional argument # \cmd[...]{...}{last argument} # Capturing in the following results in these associations # $1: \cmd[...]{...}{ # $2: cmd # $3: last argument # $4: } + trailing spaces ### pre-0.3 if ( ( $token =~ m/^(\\([\w\d\*]+)(?:\[$brat0\]|\{$pat6\})*\{)($pat6)(\}\s*)$/so ) if ( ( $word =~ m/^(\\([\w\d\*]+)(?:${extraspace}\[$brat0\]|${extraspace}\{$pat6\})*${extraspace}\{)($pat6)(\}\s*)$/so ) && (iscmd($2,\@TEXTCMDLIST,\@TEXTCMDEXCL)|| iscmd($2,\@MATHTEXTCMDLIST,\@MATHTEXTCMDEXCL)) && ( !$cmdcomment || !iscmd($2,\@CONTEXT2CMDLIST, \@CONTEXT2CMDEXCL) ) ) { # Condition 1: word is a command? - if yes, $1,$2,.. will be set as above # Condition 2: word is a text command - we mark up the interior of the word. There is a separate check for MATHTEXTCMDLIST # because for $mathmarkup=WHOLE, the commands should not be split in pass1 (ie. math mode commands are not in # TEXTCMDLIST, but the interior of MATHTEXT commands should be highlighted in both deleted and added blocks # Condition 3: But if we are in a deleted block ($cmdcomment=1) and # $2 (the command) is in context2, just treat it as an ordinary command (i.e. comment it open with $opencmd) # Because we do not want to disable this command # here we do not use $opencmd and $closecmd($opencmd is empty) if ($cmd==1) { push (@$retval,$closecmd) ; } elsif ($cmd==0) { push (@$retval,$close) ; } $command=$1; $commandword=$2; $closingbracket=$4; @argtext=splitlatex($3); # split textual argument into tokens # and mark it up (but we do not need openmark and closemark) # insert command with initial arguments, marked-up final argument, and closing bracket if ( $cmdcomment && iscmd($commandword,\@CONTEXT1CMDLIST, \@CONTEXT1CMDEXCL) ) { # context1cmd in a deleted environment; delete command itself but keep last argument, marked up push (@$retval,$opencmd); $command =~ s/\n/\n${opencmd}/sg ; # repeat opencmd at the beginning of each line # argument, note that the additional comment character is included # to suppress linebreak after opening parentheses, which is important # for latexrevise push (@$retval,$command,"%\n{$AUXCMD\n",marktags("","",$open,$close,$opencmd,$closecmd,$comment,\@argtext),$closingbracket); } elsif ( iscmd($commandword,,\@MATHTEXTCMDLIST, \@MATHTEXTCMDEXCL) ) { # MATHBLOCK pseudo command: consider all commands safe, except & and \\ # Keep these commands even in deleted blocks, hence set $opencmd and $closecmd (5th and 6th argument of marktags) to # "" local @SAFECMDLIST=(".*"); local @SAFECMDEXCL=('\\','\\\\'); push(@$retval,$command,marktags("","",$open,$close,"","",$comment,\@argtext)#@argtext ,$closingbracket); } else { # normal textcmd or context1cmd in an added block push (@$retval,$command,marktags("","",$open,$close,$opencmd,$closecmd,$comment,\@argtext),$closingbracket); } push (@$retval,$AUXCMD,"\n") if $cmdcomment ; $cmd=-1 ; } else { # ordinary command push (@$retval,$opencmd) if $cmd==-1 ; push (@$retval,$close,$opencmd) if $cmd==0 ; $word =~ s/\n/\n${opencmd}/sg if $cmdcomment ; # if opencmd is a comment, repeat this at the beginning of every line push (@$retval,$word); $cmd=1; } } else { # just an ordinary word or word in SAFECMD push (@$retval,$open) if $cmd==-1 ; push (@$retval,$closecmd,$open) if $cmd==1 ; push (@$retval,$word); $cmd=0; } } push (@$retval,$close) if $cmd==0; push (@$retval,$closecmd) if $cmd==1; push (@$retval,$closemark) if ($noncomment); return @$retval; } # preprocess($string, ..) # carry out the following pre-processing steps for all arguments: # 1. Remove leading white-space # Change \{ to \LEFTBRACE and \} to \RIGHTBRACE # #. change begin and end commands within comments to BEGINDIF, ENDDIF # so they don't disturb the pattern matching (if there are several \begin or \end in one line # 2. mark all first empty line (in block of several) with \PAR tokens # 3. Convert all '\%' into '\PERCENTAGE ' to make parsing regular expressions easier # 4. Convert all \verb|some verbatim text| commands (where | can be an arbitrary character) # into \verb{hash} # 5. Convert \begin{verbatim} some verbatim text \end{verbatim} into \verbatim{hash} # 6. Convert _n into \SUBSCRIPTNB{n} and _{nnn} into \SUBSCRIPT{nn} # 7. Convert ^n into \SUPERSCRIPTNB{n} and ^{nnn} into \SUPERSCRIPT{nn} # 8. a. Convert $$ $$ into \begin{DOLLARDOLLAR} \end{DOLLARDOLLAR} # b. Convert \[ \] into \begin{SQUAREBRACKET} \end{SQUAREBRACKET} # 9. Convert all picture environmentent (\begin{PICTUREENV} .. \end{PICTUREENV} \PICTUREBLOCKenv # For --block-math-markup option -convert all \begin{MATH} .. \end{MATH} # into \MATHBLOCKmath{...} commands, where MATH/math is any valid math environment # 10. Add final token STOP to the very end. This is put in because the algorithm works better if the last token is identical. This is removed again in postprocessing. # # NB: step 6 and 7 is likely to convert some "_" inappropriately, e.g. in file # names or labels but it does not matter because they are converted back in the postprocessing step # Returns: leading white space removed in step 1 sub preprocess { my @leadin=() ; for (@_) { s/^(\s*)//s; push(@leadin,$1); # Change \{ to \QLEFTBRACE and \} to \QRIGHTBRACE s/(?{$hstr}) && $string ne $hash->{$hstr}) { warn "Repeated hash value for verbatim mode in spite of different content."; $hstr="-$hstr"; } $hash->{$hstr}=$string; return($hstr); } #string=fromhash(\%hash,$fromstring) # restores string value stored in hash #string=fromhash(\%hash,$fromstring,$prependstring) # additionally begins each line with prependstring sub fromhash { my ($hash,$hstr)=($_[0],$_[1]); my $retstr=$hash->{$hstr}; if ( $#_ >= 2) { $retstr =~ s/^/$_[2]/mg; } return $retstr; } # postprocess($string, ..) # carry out the following post-processing steps for all arguments: # * Remove STOP token from the end # * Replace \RIGHTBRACE by } # * change citation commands within comments to protect from processing (using marker CITEDIF) # 1. Check all deleted blocks: # a.where a deleted block contains a matching \begin and # \end environment (these will be disabled by a %DIFDELCMD statements), for selected environments enable # these commands again (such that for example displayed math in a deleted equation # is properly within math mode. For math mode environments replace numbered equation # environments with their display only variety (so that equation numbers in new file and # diff file are identical). Where the correct type of math environment cannot be determined # use a place holder MATHMODE # b.where one of the commands matching $COUNTERCMD is used as a DIFAUXCMD, add a statement # subtracting one from the respective counter to keep numbering consistent with new file # Replace all MATHMODE environment commands by the correct environment to achieve matching # pairs # c. Convert MATHBLOCKmath commands to their uncounted numbers (e.g. convert equation -> displaymath # (environments defined in $MATHENV will be replaced by $MATHREPL, and environments in $MATHARRENV # will be replaced by $MATHARRREPL # d. If in-line math mode contains array environment, enclose the whole environment in \mbox'es # d. place \cite commands in mbox'es (for UNDERLINE style) # # For added blocks: # c. If in-line math mode contains array environment, enclose the whole environment in \mbox'es # d. place \cite commands in mbox'es (for UNDERLINE style) # # 2. If --block-math-markup option set: Convert \MATHBLOCKmath{..} commands back to environments # # Convert all PICTUREblock{..} commands back to the appropriate environments # 3. Convert DIFadd, DIFdel, DIFFaddbegin , ... into FL varieties # within floats (currently recognised float environments: plate,table,figure # plus starred varieties). # 4. Remove empty %DIFDELCMD < lines # 4. Convert \begin{SQUAREBRACKET} \end{SQUAREBRACKET} into \[ \] # Convert \begin{DOLLARDOLLAR} \end{DOLLARDOLLAR} into $$ $$ # 5. Convert \SUPERSCRIPTNB{n} into ^n and \SUPERSCRIPT{nn} into ^{nnn} # 6. Convert \SUBSCRIPTNB{n} into _n and \SUBCRIPT{nn} into _{nnn} # 7. Expand hashes of verb and verbatim environments # 8. Convert '\PERCENTAGE ' back into '\%' # 9.. remove all \PAR tokens # 10. package specific processing: endfloat: make sure \begin{figure} and \end{figure} are always # on a line by themselves, similarly for table environment # 4, undo renaming of the \begin and \end in comments # Change \QLEFTBRACE, \QRIGHTBRACE to \{,\} # # Note have to manually synchronize substitution commands below and # DIF.. command names in the header sub postprocess { my ($begin,$len,$cnt,$float,$delblock,$addblock); # second level blocks my ($begin2,$cnt2,$len2,$eqarrayblock,$mathblock); for (@_) { # change $'s in comments to something harmless 1 while s/(%.*)\$/$1DOLLARDIF/mg ; # Remove final STOP token s/ STOP$//; # Replace \RIGHTBRACE by } s/\\RIGHTBRACE/}/g; # change citation commands within comments to protect from processing if ($CITECMD){ 1 while s/(%.*)\\($CITECMD)/$1\\CITEDIF$2/m ; } # Check all deleted blocks: where a deleted block contains a matching \begin and # \end environment (these will be disabled by a %DIFDELCMD statements), enable # these commands again (such that for example displayed math in a deleted equation # is properly within math mode. For math mode environments replace numbered equation # environments with their display only variety (so that equation numbers in new file and # diff file are identical while ( m/\\DIFdelbegin.*?\\DIFdelend/sg ) { $cnt=0; $len=length($&); $begin=pos($_) - $len; $delblock=$&; ### (.*?[^\n]?)\n? construct is necessary to avoid empty lines in math mode, which result in ### an error # displayed math environments if ($mathmarkup == FINE ) { $delblock=~ s/(\%DIFDELCMD < \s*\\begin\{((?:$MATHENV)|SQUAREBRACKET)\}.*?(?:$DELCMDCLOSE|\n))(.*?[^\n]?)\n?(\%DIFDELCMD < \s*\\end\{\2\})/\\begin{$MATHREPL}$AUXCMD\n$1$3\n\\end{$MATHREPL}$AUXCMD\n$4/sg; # also transform the opposite pair \end{displaymath} .. \begin{displaymath} but we have to be careful not to interfere with the results of the transformation in the line directly above ### pre-0.42 obsolete version which did not work on eqnarray test $delblock=~ s/(? displaymath # (environments defined in $MATHENV will be replaced by $MATHREPL, and environments in $MATHARRENV # will be replaced by $MATHARRREPL $delblock=~ s/\\MATHBLOCK($MATHENV)\{($pat6)\}/\\MATHBLOCK$MATHREPL\{$2\}/sg; $delblock=~ s/\\MATHBLOCK($MATHARRENV)\{($pat6)\}/\\MATHBLOCK$MATHARRREPL\{$2\}/sg; } # b.where one of the commands matching $COUNTERCMD is used as a DIFAUXCMD, add a statement # subtracting one from the respective counter to keep numbering consistent with new file $delblock=~ s/\\($COUNTERCMD)((?:${extraspace}\[$brat0\]${extraspace}|${extraspace}\{$pat6\})*\s*${AUXCMD}\n)/\\$1$2\\addtocounter{$1}{-1}${AUXCMD}\n/sg ; # c. If in-line math mode contains array environment, enclose the whole environment in \mbox'es while ( $delblock =~ m/($math)(\s*)/sg ) { $cnt2=0; $len2=length($&); $begin2=pos($delblock) - $len2; $mathblock="%\n\\mbox{$AUXCMD\n$1\n}$AUXCMD\n"; next unless $mathblock =~ m/\{$ARRENV\}/ ; substr($delblock,$begin2,$len2)=$mathblock; pos($delblock) = $begin2 + length($mathblock); } if ($CITE2CMD) { $delblock=~s/($DELCMDOPEN\s*\\($CITE2CMD)(.*)$DELCMDCLOSE)/ # Replacement code {my ($aux,$all); $aux=$all=$1; $aux=~s#\n?($DELCMDOPEN|$DELCMDCLOSE)##g; $all."$aux$AUXCMD\n";}/sge; } # or protect \cite commands with \mbox if ($CITECMD) { $delblock=~s/(\\($CITECMD)${extraspace}(?:\[$brat0\]${extraspace}){0,2}\{$pat6\})(\s*)/\\mbox{$AUXCMD\n$1\n}$AUXCMD\n/msg ; } # splice in modified delblock substr($_,$begin,$len)=$delblock; pos = $begin + length($delblock); } # make the array modification in added blocks while ( m/\\DIFaddbegin.*?\\DIFaddend/sg ) { $cnt=0; $len=length($&); $begin=pos($_) - $len; $addblock=$&; while ( $addblock =~ m/($math)(\s*)/sg ) { $cnt2=0; $len2=length($&); $begin2=pos($addblock) - $len2; $mathblock="%\n\\mbox{$AUXCMD\n$1\n}$AUXCMD\n"; next unless $mathblock =~ m/\{$ARRENV\}/ ; substr($addblock,$begin2,$len2)=$mathblock; pos($addblock) = $begin2 + length($mathblock); } if ($CITECMD) { my $addblockbefore=$addblock; $addblock=~ s/(\\($CITECMD)${extraspace}(?:\[$brat0\]${extraspace}){0,2}\{$pat2\})(\s*)/\\mbox{$AUXCMD\n$1\n}$AUXCMD\n/msg ; } # splice in modified addblock substr($_,$begin,$len)=$addblock; pos = $begin + length($addblock); } ### old place for BEGINDIF, ENDDIF replacement # change begin and end commands within comments such that they # don't disturb the pattern matching (if there are several \begin or \end in one line # this substitution is insufficient but that appears unlikely) # This needs to be repeated here to also get rid of DIFdelcmd-protected environments s/(%.*)\\begin\{(.*)$/$1\\BEGINDIF\{$2/mg ; s/(%.*)\\end\{(.*)$/$1\\ENDDIF\{$2/mg ; # Replace MATHMODE environments from step 1a above by the correct Math environment # The next line is complicated. The negative look-ahead insertion makes sure that no \end{$MATHENV} (or other mathematical # environments) are between the \begin{$MATHENV} and \end{MATHMODE} commands. This is necessary as the minimal matching # is not globally minimal but only 'locally' (matching is beginning from the left side of the string) if ( $mathmarkup == FINE ) { 1 while s/\\begin{((?:$MATHENV)|(?:$MATHARRENV)|SQUAREBRACKET)}((?:.(?!(?:\\end{(?:(?:$MATHENV)|(?:$MATHARRENV)|SQUAREBRACKET)}|\\begin{MATHMODE})))*?)\\end{MATHMODE}/\\begin{$1}$2\\end{$1}/s; 1 while s/\\begin{MATHMODE}((?:.(?!\\end{MATHMODE}))*?)\\end{((?:$MATHENV)|(?:$MATHARRENV)|SQUAREBRACKET)}/\\begin{$2}$1\\end{$2}/s; # convert remaining \begin{MATHMODE} \end{MATHMODE} (and not containing & or \\ )into MATHREPL environments s/\\begin{MATHMODE}((?:(.(?!(?[1])) { $optargnew=$newhash{$cmd}->[1]; } else { $optargnew=""; } if ( defined($oldhash{$cmd}->[1])) { $optargold=$oldhash{$cmd}->[1]; } else { $optargold=""; } if ( defined($oldhash{$cmd}) ) { $argold=$oldhash{$cmd}->[2]; } else { $argold=""; } $argnew=$newhash{$cmd}->[2]; $argdiff="{" . join("",bodydiff($argold,$argnew)) ."}"; if ( length $optargnew ) { $optargdiff="[".join("",bodydiff($optargold,$optargnew))."]" ; $optargdiff =~ s/\\DIFaddbegin /\\DIFaddbeginFL /g; $optargdiff =~ s/\\DIFaddend /\\DIFaddendFL /g; $optargdiff =~ s/\\DIFadd\{/\\DIFaddFL{/g; $optargdiff =~ s/\\DIFdelbegin /\\DIFdelbeginFL /g; $optargdiff =~ s/\\DIFdelend /\\DIFdelendFL /g; $optargdiff =~ s/\\DIFdel\{/\\DIFdelFL{/g; } else { $optargdiff=""; } ### print STDERR "DEBUG s/\\Q$newhash{$cmd}->[0]\\E/\\$cmd$optargdiff$argdiff/s\n"; # Note: \Q and \E force literal interpretation of what it between them but allow # variable interpolation, such that e.g. \title matches just that and not TAB-itle $$newpreambleref=~s/\Q$newhash{$cmd}->[0]\E/\\$cmd$optargdiff$argdiff/s; # replace this in old preamble if necessary if ( defined($oldhash{$cmd}->[0])) { $$oldpreambleref=~s/\Q$oldhash{$cmd}->[0]\E/\\$cmd$optargdiff$argdiff/s ; } ### print STDERR "DEBUG NEW PRE ".$$newpreambleref."\n"; } foreach $cmd ( keys %oldhash ) { # if this has already been dealt with above can just skip next if defined($newhash{$cmd}) ; if ( defined($oldhash{$cmd}->[1])) { $optargold=$oldhash{$cmd}->[1]; $optargdiff="[".join("",bodydiff($optargold,""))."]" ; $optargdiff =~ s/\\DIFdelbegin /\\DIFdelbeginFL /g; $optargdiff =~ s/\\DIFdelend /\\DIFdelendFL /g; $optargdiff =~ s/\\DIFdel\{/\\DIFdelFL{/g; } else { $optargdiff=""; } $argdiff="{" . join("",bodydiff($argold,"")) ."}"; $auxline = "\\$cmd$optargdiff$argdiff"; $auxline =~s/$/$AUXCMD/sg; push @auxlines,$auxline; } # add auxcmd comment to highlight added lines return(@auxlines); } # @diffs=linediff(\@seq1, \@seq2) # mark up lines like this #%DIF mm-mmdnn #%< old deleted line(s) #%DIF ------- #%DIF mmann-nn #new appended line %< #%DIF ------- # Future extension: mark change explicitly # Assumes: traverse_sequence traverses deletions before insertions in changed sequences # all line numbers relative to line 0 (first line of real file) sub linediff { my $seq1 = shift ; my $seq2 = shift ; my $block = []; my $retseq = []; my @begin=('','',''); # dummy initialisation my $instring ; my $discard = sub { @begin=('d',$_[0],$_[1]) unless scalar @$block ; push(@$block, "%DIF < " . $seq1->[$_[0]]) }; my $add = sub { if (! scalar @$block) { @begin=('a',$_[0],$_[1]) ;} elsif ( $begin[0] eq 'd' ) { $begin[0]='c'; $begin[2]=$_[1]; push(@$block, "%DIF -------") } push(@$block, $seq2->[$_[1]] . " %DIF > " ) }; my $match = sub { if ( scalar @$block ) { if ( $begin[0] eq 'd' && $begin[1]!=$_[0]-1) { $instring = sprintf "%%DIF %d-%dd%d",$begin[1],$_[0]-1,$begin[2]; } elsif ( $begin[0] eq 'a' && $begin[2]!=$_[1]-1) { $instring = sprintf "%%DIF %da%d-%d",$begin[1],$begin[2],$_[1]-1; } elsif ( $begin[0] eq 'c' ) { $instring = sprintf "%%DIF %sc%s", ($begin[1]==$_[0]-1) ? "$begin[1]" : $begin[1]."-".($_[0]-1) , ($begin[2]==$_[1]-1) ? "$begin[2]" : $begin[2]."-".($_[1]-1) ; } else { $instring = sprintf "%%DIF %d%s%d",$begin[1],$begin[0],$begin[2]; } push @$retseq, $instring,@$block, "%DIF -------" ; $block = []; } push @$retseq, $seq2->[$_[1]] }; # key function: remove multiple spaces (such that insertion or deletion of redundant white space is not reported) my $keyfunc = sub { join(" ",split(" ",shift())) }; traverse_sequences($seq1,$seq2, { MATCH=>$match, DISCARD_A=>$discard, DISCARD_B=>$add }, $keyfunc ); push @$retseq, @$block if scalar @$block; return wantarray ? @$retseq : $retseq ; } # init_regex_arr_data(\@array,"TOKEN INIT") # scans DATA file handel for line "%% TOKEN INIT" line # then appends each line not beginning with % into array (as a quoted regex) sub init_regex_arr_data { my ($arr,$token)=@_; my ($copy); while () { if ( m/^%%BEGIN $token\s*$/ ) { $copy=1; } elsif ( m/^%%END $token\s*/ ) { last; } chomp; push (@$arr,qr/^$_$/) if ( $copy && !/^%/ ) ; } seek DATA,0,0; # rewind DATA handle to file begin } # init_regex_arr_ext(\@array,$arg) # fills array with regular expressions. # if arg is a file name, then read in list of regular expressions from that file # (one expression per line) # Otherwise treat arg as a comma separated list of regular expressions sub init_regex_arr_ext { my ($arr,$arg)=@_; my $regex; if ( -f $ arg ) { open(FILE,"$arg") or die ("Couldn't open $arg: $!"); while () { chomp; next if /^\s*#/ || /^\s*%/ || /^\s*$/ ; push (@$arr,qr/^$_$/); } close(FILE); } else { # assume it is a comma-separated list of reg-ex foreach $regex (split(qr/(?=1) { $reset=shift; } if ($reset) { $lasttime=times(); } else { $retval=times()-$lasttime; $lasttime=$lasttime+$retval; return($retval); } } sub usage { die <<"EOF"; Usage: $0 [options] old.tex new.tex > diff.tex Compares two latex files and writes tex code to stdout, which has the same format as new.tex but has all changes relative to old.tex marked up or commented. --type=markupstyle -t markupstyle Add code to preamble for selected markup style Available styles: UNDERLINE CTRADITIONAL TRADITIONAL CFONT FONTSTRIKE INVISIBLE CHANGEBAR CCHANGEBAR CULINECHBAR CFONTCBHBAR [ Default: UNDERLINE ] --subtype=markstyle -s markstyle Add code to preamble for selected style for bracketing commands (e.g. to mark changes in margin) Available styles: SAFE MARGINAL DVIPSCOL COLOR [ Default: SAFE ] --floattype=markstyle -f markstyle Add code to preamble for selected style which replace standard marking and markup commands within floats (e.g., marginal remarks cause an error within floats so marginal marking can be disabled thus) Available styles: FLOATSAFE IDENTICAL [ Default: FLOATSAFE ] --encoding=enc -e enc Specify encoding of old.tex and new.tex. Typical encodings are ascii, utf8, latin1, latin9. A list of available encodings can be obtained by executing perl -MEncode -e 'print join ("\\n",Encode->encodings( ":all" )) ;' [Default encoding is utf8 unless the first few lines of the preamble contain an invocation "\\usepackage[..]{inputenc} in which case the encoding chosen by this command is asssumed. Note that ASCII (standard latex) is a subset of utf8] --preamble=file -p file Insert file at end of preamble instead of auto-generating preamble. The preamble must define the following commands \\DIFaddbegin,\\DIFaddend,\\DIFadd{..}, \\DIFdelbegin,\\DIFdelend,\\DIFdel{..}, and varieties for use within floats \\DIFaddbeginFL,\\DIFaddendFL,\\DIFaddFL{..}, \\DIFdelbeginFL,\\DIFdelendFL,\\DIFdelFL{..} (If this option is set -t, -s, and -f options are ignored.) --exclude-safecmd=exclude-file --exclude-safecmd="cmd1,cmd2,..." -A exclude-file --replace-safecmd=replace-file --append-safecmd=append-file --append-safecmd="cmd1,cmd2,..." -a append-file Exclude from, replace or append to the list of regex matching commands which are safe to use within the scope of a \\DIFadd or \\DIFdel command. The file must contain one Perl-RegEx per line (Comment lines beginning with # or % are ignored). A literal comma within the comma-separated list must be escaped thus "\\,", Note that the RegEx needs to match the whole of the token, i.e., /^regex\$/ is implied and that the initial "\\" of the command is not included. The --exclude-safecmd and --append-safecmd options can be combined with the --replace-safecmd option and can be used repeatedly to add cumulatively to the lists. --exclude-textcmd=exclude-file --exclude-textcmd="cmd1,cmd2,..." -X exclude-file --replace-textcmd=replace-file --append-textcmd=append-file --append-textcmd="cmd1,cmd2,..." -x append-file Exclude from, replace or append to the list of regex matching commands whose last argument is text. See entry for --exclude-safecmd directly above for further details. --replace-context1cmd=replace-file --append-context1cmd=append-file --append-context1cmd="cmd1,cmd2,..." Replace or append to the list of regex matching commands whose last argument is text but which require a particular context to work, e.g. \\caption will only work within a figure or table. These commands behave like text commands, except when they occur in a deleted section, when they are disabled, but their argument is shown as deleted text. --replace-context2cmd=replace-file --append-context2cmd=append-file --append-context2cmd="cmd1,cmd2,..." As corresponding commands for context1. The only difference is that context2 commands are completely disabled in deleted sections, including their arguments. --config var1=val1,var2=val2,... -c var1=val1,.. Set configuration variables. -c configfile Available variables: MINWORDSBLOCK (integer) FLOATENV (RegEx) PICTUREENV (RegEx) MATHENV (RegEx) MATHREPL (String) MATHARRENV (RegEx) MATHARRREPL (String) ARRENV (RegEx) COUNTERCMD (RegEx) This option can be repeated. --packages=pkg1,pkg2,.. Tell latexdiff that .tex file is processed with the packages in list loaded. This is normally not necessary if the .tex file includes the preamble, as the preamble is automatically scanned for \\usepackage commands. Use of the --packages option disables automatic scanning, so if for any reason package specific parsing needs to be switched off, use --packages=none. The following packages trigger special behaviour: endfloat hyperref amsmath [ Default: scan the preamble for \\usepackage commands to determine loaded packages.] --show-preamble Print generated or included preamble commands to stdout. --show-safecmd Print list of regex matching and excluding safe commands. --show-textcmd Print list of regex matching and excluding commands with text argument. --show-config Show values of configuration variables --show-all Show all of the above NB For all --show commands, no old.tex or new.tex file needs to be given, and no differencing takes place. Other configuration options: --allow-spaces Allow spaces between bracketed or braced arguments to commands [Default requires arguments to directly follow each other without intervening spaces] --math-markup=level Determine granularity of markup in displayed math environments: Possible values for level are (both numerical and text labels are acceptable): off or 0: suppress markup for math environments. Deleted equations will not appear in diff file. This mode can be used if all the other modes cause invalid latex code. whole or 1: Differencing on the level of whole equations. Even trivial changes to equations cause the whole equation to be marked changed. This mode can be used if processing in coarse or fine mode results in invalid latex code. coarse or 2: Detect changes within equations marked up with a coarse granularity; changes in equation type (e.g.displaymath to equation) appear as a change to the complete equation. This mode is recommended for situations where the content and order of some equations are still being changed. [Default] fine or 3: Detect small change in equations and mark up and fine granularity. This mode is most suitable, if only minor changes to equations are expected, e.g. correction of typos. --disable-citation-markup Suppress citation markup in styles using ulem (UNDERLINE, FONTSTRIKE, CULINECHBAR) --enable-citation-markup Protect citation commands in changed sections with \\mbox command [i.e. use default behaviour for ulem package for other packages] Miscelleneous options --label=label -L label Sets the labels used to describe the old and new files. The first use of this option sets the label describing the old file and the second use of the option sets the label for the new file. [Default: use the filename and modification dates for the label] --no-label Suppress inclusion of old and new file names as comment in output file --visble-label Include old and new filenames (or labels set with --label option) as visible output --flatten Replace \\input and \\include commands within body by the content of the files in their argument. If \\includeonly is present in the preamble, only those files are expanded into the document. However, no recursion is done, i.e. \\input and \\include commands within included sections are not expanded. The included files are assumed to be located in the same directories as the old and new master files, respectively, making it possible to organise files into old and new directories. --flatten is applied recursively, so inputted files can contain further \\input statements. --help -h Show this help text. --ignore-warnings Suppress warnings about inconsistencies in length between input and parsed strings and missing characters. --verbose -V Output various status information to stderr during processing. Default is to work silently. --version Show version number. For further information, consult http://latexdiff.berlios.de EOF } =head1 NAME latexdiff - determine and markup differences between two latex files =head1 SYNOPSIS B [ B ] F F > F =head1 DESCRIPTION Briefly, I is a utility program to aid in the management of revisions of latex documents. It compares two valid latex files, here called C and C, finds significant differences between them (i.e., ignoring the number of white spaces and position of line breaks), and adds special commands to highlight the differences. Where visual highlighting is not possible, e.g. for changes in the formatting, the differences are nevertheless marked up in the source. The program treats the preamble differently from the main document. Differences between the preambles are found using line-based differencing (similarly to the Unix diff command, but ignoring white spaces). A comment, "S>>" is appended to each added line, i.e. a line present in C but not in C. Discarded lines are deactivated by prepending "S>>". Changed blocks are preceded by comment lines giving information about line numbers in the original files. Where there are insignificant differences, the resulting file C will be similar to C. At the end of the preamble, the definitions for I markup commands are inserted. In differencing the main body of the text, I attempts to satisfy the following guidelines (in order of priority): =over 3 =item 1 If both C and C are valid LaTeX, then the resulting C should also be valid LateX. (NB If a few plain TeX commands are used within C or C then C is not guaranteed to work but usually will). =item 2 Significant differences are determined on the level of individual words. All significant differences, including differences between comments should be clearly marked in the resulting source code C. =item 3 If a changed passage contains text or text-producing commands, then running C through LateX should produce output where added and discarded passages are highlighted. =item 4 Where there are insignificant differences, e.g. in the positioning of line breaks, C should follow the formatting of C =back For differencing the same algorithm as I is used but words instead of lines are compared. An attempt is made to recognize blocks which are completely changed such that they can be marked up as a unit. Comments are differenced line by line but the number of spaces within comments is ignored. Commands including all their arguments are generally compared as one unit, i.e., no mark-up is inserted into the arguments of commands. However, for a selected number of commands (for example, C<\caption> and all sectioning commands) the last argument is known to be text. This text is split into words and differenced just as ordinary text (use options to show and change the list of text commands, see below). As the algorithm has no detailed knowledge of LaTeX, it assumes all pairs of curly braces immediately following a command (i.e. a sequence of letters beginning with a backslash) are arguments for that command. As a restriction to condition 1 above it is thus necessary to surround all arguments with curly braces, and to not insert extraneous spaces. For example, write \section{\textem{This is an emphasized section title}} and not \section {\textem{This is an emphasized section title}} or \section\textem{This is an emphasized section title} even though all varieties are the same to LaTeX (but see B<--allow-spaces> option which allows the second variety). For environments whose content does not conform to standard LaTeX or where graphical markup does not make sense all markup commands can be removed by setting the PICTUREENV configuration variable, set by default to C and C environments; see B<--config> option). The latter environment (C) can be used to protect parts of the latex file where the markup results in illegal markup. You have to surround the offending passage in both the old and new file by C<\begin{DIFnomarkup}> and C<\end{DIFnomarkup}>. You must define the environment in the preambles of both old and new documents. I prefer to define it as a null-environment, C<\newenvironment{DIFnomarkup}{}{}> but the choice is yours. Any markup within the environment will be removed, and generally everything within the environment will just be taken from the new file. It is also possible to difference files which do not have a preamble. In this case, the file is processed in the main document mode, but the definitions of the markup commands are not inserted. All markup commands inserted by I begin with "C<\DIF>". Added blocks containing words, commands or comments which are in C but not in C are marked by C<\DIFaddbegin> and C<\DIFaddend>. Discarded blocks are marked by C<\DIFdelbegin> and C<\DIFdelend>. Within added blocks all text is highlighted with C<\DIFadd> like this: C<\DIFadd{Added text block}> Selected `safe' commands can be contained in these text blocks as well (use options to show and change the list of safe commands, see below). All other commands as well as braces "{" and "}" are never put within the scope of C<\DIFadd>. Added comments are marked by prepending "S >>". Within deleted blocks text is highlighted with C<\DIFdel>. Deleted comments are marked by prepending "S >>". Non-safe command and curly braces within deleted blocks are commented out with "S >>". =head1 OPTIONS =head2 Preamble The following options determine the visual markup style by adding the appropriate command definitions to the preamble. See the end of this section for a description of available styles. =over 4 =item B<--type=markupstyle> or B<-t markupstyle> Add code to preamble for selected markup style. This option defines C<\DIFadd> and C<\DIFdel> commands. Available styles: C [ Default: C ] =item B<--subtype=markstyle> or B<-s markstyle> Add code to preamble for selected style for bracketing commands (e.g. to mark changes in margin). This option defines C<\DIFaddbegin>, C<\DIFaddend>, C<\DIFdelbegin> and C<\DIFdelend> commands. Available styles: C [ Default: C ] =item B<--floattype=markstyle> or B<-f markstyle> Add code to preamble for selected style which replace standard marking and markup commands within floats (e.g., marginal remarks cause an error within floats so marginal marking can be disabled thus). This option defines all C<\DIF...FL> commands. Available styles: C [ Default: C ] =item B<--encoding=enc> or B<-e enc> Specify encoding of old.tex and new.tex. Typical encodings are C, C, C, C. A list of available encodings can be obtained by executing Cencodings( ":all" )) ;' > [Default encoding is utf8 unless the first few lines of the preamble contain an invocation C<\usepackage[..]{inputenc}> in which case the encoding chosen by this command is asssumed. Note that ASCII (standard latex) is a subset of utf8] =item B<--preamble=file> or B<-p file> Insert file at end of preamble instead of generating preamble. The preamble must define the following commands C<\DIFaddbegin, \DIFaddend, \DIFadd{..}, \DIFdelbegin,\DIFdelend,\DIFdel{..},> and varieties for use within floats C<\DIFaddbeginFL, \DIFaddendFL, \DIFaddFL{..}, \DIFdelbeginFL, \DIFdelendFL, \DIFdelFL{..}> (If this option is set B<-t>, B<-s>, and B<-f> options are ignored.) =item B<--packages=pkg1,pkg2,..> Tell latexdiff that .tex file is processed with the packages in list loaded. This is normally not necessary if the .tex file includes the preamble, as the preamble is automatically scanned for C<\usepackage> commands. Use of the B<--packages> option disables automatic scanning, so if for any reason package specific parsing needs to be switched off, use B<--packages=none>. The following packages trigger special behaviour: =over 8 =item C Configuration variable amsmath is set to C (Default: C) =item C Ensure that C<\begin{figure}> and C<\end{figure}> always appear by themselves on a line. =item C Change name of C<\DIFadd> and C<\DIFdel> commands to C<\DIFaddtex> and C<\DIFdeltex> and define new C<\DIFadd> and C<\DIFdel> commands, which provide a wrapper for these commands, using them for the text but not for the link defining command (where any markup would cause errors). =back [ Default: scan the preamble for C<\\usepackage> commands to determine loaded packages.] =item B<--show-preamble> Print generated or included preamble commands to stdout. =back =head2 Configuration =over 4 =item B<--exclude-safecmd=exclude-file> or B<-A exclude-file> or B<--exclude-safecmd="cmd1,cmd2,..."> =item B<--replace-safecmd=replace-file> =item B<--append-safecmd=append-file> or B<-a append-file> or B<--append-safecmd="cmd1,cmd2,..."> Exclude from, replace or append to the list of regular expressions (RegEx) matching commands which are safe to use within the scope of a C<\DIFadd> or C<\DIFdel> command. The file must contain one Perl-RegEx per line (Comment lines beginning with # or % are ignored). Note that the RegEx needs to match the whole of the token, i.e., /^regex$/ is implied and that the initial "\" of the command is not included. The B<--exclude-safecmd> and B<--append-safecmd> options can be combined with the -B<--replace-safecmd> option and can be used repeatedly to add cumulatively to the lists. B<--exclude-safecmd> and B<--append-safecmd> can also take a comma separated list as input. If a comma for one of the regex is required, escape it thus "\,". In most cases it will be necessary to protect the comma-separated list from the shell by putting it in quotation marks. =item B<--exclude-textcmd=exclude-file> or B<-X exclude-file> or B<--exclude-textcmd="cmd1,cmd2,..."> =item B<--replace-textcmd=replace-file> =item B<--append-textcmd=append-file> or B<-x append-file> or B<--append-textcmd="cmd1,cmd2,..."> Exclude from, replace or append to the list of regular expressions matching commands whose last argument is text. See entry for B<--exclude-safecmd> directly above for further details. =item B<--replace-context1cmd=replace-file> =item B<--append-context1cmd=append-file> or =item B<--append-context1cmd="cmd1,cmd2,..."> Replace or append to the list of regex matching commands whose last argument is text but which require a particular context to work, e.g. \caption will only work within a figure or table. These commands behave like text commands, except when they occur in a deleted section, when they are disabled, but their argument is shown as deleted text. =item B<--replace-context2cmd=replace-file> =item B<--append-context2cmd=append-file> or =item B<--append-context2cmd="cmd1,cmd2,..."> As corresponding commands for context1. The only difference is that context2 commands are completely disabled in deleted sections, including their arguments. =item B<--config var1=val1,var2=val2,...> or B<-c var1=val1,..> =item B<-c configfile> 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 (integer) C (RegEx) C (RegEx) C (RegEx) C (String) C (RegEx) C (String) C (RegEx) C (RegEx) =item B<--show-safecmd> Print list of RegEx matching and excluding safe commands. =item B<--show-textcmd> Print list of RegEx matching and excluding commands with text argument. =item B<--show-config> Show values of configuration variables. =item B<--show-all> Combine all --show commands. NB For all --show commands, no C or C file needs to be specified, and no differencing takes place. =back =head2 Other configuration options: =over 4 =item B<--allow-spaces> Allow spaces between bracketed or braced arguments to commands. Note that this option might have undesirable side effects (unrelated scope might get lumpeded with preceding commands) so should only be used if the default produces erroneous results. (Default requires arguments to directly follow each other without intervening spaces). =item B<--math-markup=level> Determine granularity of markup in displayed math environments: Possible values for level are (both numerical and text labels are acceptable): C or C<0>: suppress markup for math environments. Deleted equations will not appear in diff file. This mode can be used if all the other modes cause invalid latex code. C or C<1>: Differencing on the level of whole equations. Even trivial changes to equations cause the whole equation to be marked changed. This mode can be used if processing in coarse or fine mode results in invalid latex code. C or C<2>: Detect changes within equations marked up with a coarse granularity; changes in equation type (e.g.displaymath to equation) appear as a change to the complete equation. This mode is recommended for situations where the content and order of some equations are still being changed. [Default] C or C<3>: Detect small change in equations and mark up at fine granularity. This mode is most suitable, if only minor changes to equations are expected, e.g. correction of typos. =item B<--disable-citation-markup> Suppress citation markup in styles using ulem (UNDERLINE, FONTSTRIKE, CULINECHBAR) =item B<--enable-citation-markup> Protect citation commands in changed sections with \\mbox command [i.e. use default behaviour for ulem package for other packages] =back =head2 Miscellaneous =over 4 =item B<--verbose> or B<-V> Output various status information to stderr during processing. Default is to work silently. =item B<--driver=type> Choose driver for changebar package (only relevant for styles using changebar: CCHANGEBAR CFONTCHBAR CULINECHBAR CHANGEBAR). Possible drivers are listed in changebar manual, e.g. pdftex,dvips,dvitops [Default: dvips] =item B<--ignore-warnings> Suppress warnings about inconsistencies in length between input and parsed strings and missing characters. These warning messages are often related to non-standard latex or latex constructions with a syntax unknown to C but the resulting difference argument is often fully functional anyway, particularly if the non-standard latex only occurs in parts of the text which have not changed. =item B<--label=label> or B<-L label> Sets the labels used to describe the old and new files. The first use of this option sets the label describing the old file and the second use of the option sets the label for the new file, i.e. set both labels like this C<-L labelold -L labelnew>. [Default: use the filename and modification dates for the label] =item B<--no-label> Suppress inclusion of old and new file names as comment in output file =item B<--visble-label> Include old and new filenames (or labels set with --label option) as visible output. =item B<--flatten> Replace C<\input> and C<\include> commands within body by the content of the files in their argument. If C<\includeonly> is present in the preamble, only those files are expanded into the document. However, no recursion is done, i.e. C<\input> and C<\include> commands within included sections are not expanded. The included files are assumed to be located in the same directories as the old and new master files, respectively, making it possible to organise files into old and new directories. --flatten is applied recursively, so inputted files can contain further C<\input> statements. Use of this option might result in prohibitive processing times for larger documents, and the resulting difference document no longer reflects the structure of the input documents. =item B<--help> or B<-h> Show help text =item B<--version> Show version number =back =head2 Predefined styles =head2 Major types The major type determine the markup of plain text and some selected latex commands outside floats by defining the markup commands C<\DIFadd{...}> and C<\DIFdel{...}> . =over 10 =item C Added text is wavy-underlined and blue, discarded text is struck out and red (Requires color and ulem packages). Overstriking does not work in displayed math equations such that deleted parts of equation are underlined, not struck out (this is a shortcoming inherent to the ulem package). =item C Added text is blue and set in sans-serif, and a red footnote is created for each discarded piece of text. (Requires color package) =item C Like C but without the use of color. =item C Added text is blue and set in sans-serif, and discarded text is red and very small size. =item C Added tex is set in sans-serif, discarded text small and struck out =item C Added text is blue, and discarded text is red. Additionally, the changed text is marked with a bar in the margin (Requires color and changebar packages). =item C Like C but with additional changebars (Requires color and changebar packages). =item C Like C but with additional changebars (Requires color, ulem and changebar packages). =item C No mark up of text, but mark margins with changebars (Requires changebar package). =item C No visible markup (but generic markup commands will still be inserted. =back =head2 Subtypes The subtype defines the commands that are inserted at the begin and end of added or discarded blocks, irrespectively of whether these blocks contain text or commands (Defined commands: C<\DIFaddbegin, \DIFaddend, \DIFdelbegin, \DIFdelend>) =over 10 =item C No additional markup (Recommended choice) =item C Mark beginning and end of changed blocks with symbols in the margin nearby (using the standard C<\marginpar> command - note that this sometimes moves somewhat from the intended position. =item C An alternative way of marking added passages in blue, and deleted ones in red. (It is recommeneded to use instead the main types to effect colored markup, although in some cases coloring with dvipscol can be more complete, for example with citation commands). =item C An alternative way of marking added passages in blue, and deleted ones in red. Note that C only works with the dvips converter, e.g. not pdflatex. (it is recommeneded to use instead the main types to effect colored markup, although in some cases coloring with dvipscol can be more complete). =back =head2 Float Types Some of the markup used in the main text might cause problems when used within floats (e.g. figures or tables). For this reason alternative versions of all markup commands are used within floats. The float type defines these alternative commands. =over 10 =item C Use identical markup for text as in the main body, but set all commands marking the begin and end of changed blocks to null-commands. You have to choose this float type if your subtype is C as C<\marginpar> does not work properly within floats. =item C Mark additions the same way as in the main text. Deleted environments are marked by angular brackets \[ and \] and the deleted text is set in scriptscript size. This float type should always be used with the C and C markup types as the \footnote command does not work properly in floating environments. =item C Make no difference between the main text and floats. =back =head2 Configuration Variables =over 10 =item C 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 to the preceding added and discarded parts. [ Default: 3 ] =item C Environments whose name matches the regular expression in C are considered floats. Within these environments, the I markup commands are replaced by their FL variaties. [ Default: S >] =item C Within environments whose name matches the regular expression in C all latexdiff markup is removed (in pathologic cases this might lead to inconsistent markup but this situation should be rare). [ Default: S >] =item C,C If both \begin and \end for a math environment (environment name matching C or \[ and \]) are within the same deleted block, they are replaced by a \begin and \end commands for C rather than being commented out. [ Default: C=S >, C=S >] =item C,C as C,C but for equation arrays [ Default: C=S >, C=S >] =item C If a match to C 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: C=S > =item C If a command in a deleted block which is also in the textcmd list matches C then an additional command C<\addtocounter{>FC<}{-1}>, where F 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=C<(?:footnote|part|section|subsection> ... C<|subsubsection|paragraph|subparagraph)> ] =back =head1 COMMON PROBLEMS =over 10 =item Citations result in overfull boxes There is an incompatibility between the C package, which C uses for underlining and striking out in the UNDERLINE style, the default style. In order to be able to mark up citations properly, they are placed with an C<\mbox> command in post-processing. As mboxes cannot be broken across lines, this procedure frequently results in overfull boxes, possibly obscuring the content as it extends beyond the right margin. If this is a problem, you have two possibilities: 1. Use C or C subtype markup (option C<-s COLOR>): If this markup is chosen, then changed citations are no longer marked up with the wavy line (additions) or struck out (deletions), but are still highlighted in the appropriate color. 2. Choose option C<--disable-citation-markup> which turns off the marking up of citations: deleted citations are no longer shown, and added ctations are shown without markup. (This was the default behaviour of latexdiff at versions 0.6 and older) =item Changes in complicated mathematical equations result in latex processing errors Try options C<--math-markup=whole>. If even that fails, you can turn off mark up for equations with C<--math-markup=off>. =back =head1 BUGS Option allow-spaces not implemented entirely consistently. It breaks the rules that number and type of white space does not matter, as different numbers of inter-argument spaces are treated as significant. Please submit bug reports on the latexdiff project page I, send them to user discussion list C (prior subscription to list required, also on project webpage) or send them to I. Include the serial number of I (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 latex, please send me those files, ideally edited to only contain the offending passage as long as that still reproduces the problem. If your file relies on non-standard class files, you must include those. I will not look at examples where I have trouble to latex the original files. =head1 SEE ALSO L, L =head1 PORTABILITY I does not make use of external commands and thus should run on any platform supporting Perl 5.6 or higher. If files with encodings other than ASCII or UTF-8 are processed, Perl 5.8 or higher is required. The standard version of I requires installation of the Perl package C (available from I - I) but a stand-alone version, I, which has this package inlined, is available, too. I requires the I command to be present. =head1 AUTHOR Version 1.0.2 Copyright (C) 2004-2012 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 Contributors of fixes and additions: V. Kuhlmann, J. Paisley, N. Becker, T. Doerges, K. Huebner, T. Connors, Sebastian Gouezel and many others. Thanks to the many people who send in bug reports, feature suggestions, and other feedback. =cut __END__ %%BEGIN SAFE COMMANDS % Regex matching commands which can safely be in the % argument of a \DIFadd or \DIFdel command (leave out the \) arabic dashbox emph fbox framebox hspace math.* makebox mbox pageref ref symbol raisebox rule text.* shortstack usebox dag ddag copyright pounds S P oe OE ae AE aa AA o O l L frac ss sqrt ldots cdots vdots ddots alpha beta gamma delta epsilon varepsilon zeta eta theta vartheta iota kappa lambda mu nu xi pi varpi rho varrho sigma varsigma tau upsilon phi varphi chi psi omega Gamma Delta Theta Lambda Xi Pi Sigma Upsilon Phi Psi Omega ps mp times div ast star circ bullet cdot cap cup uplus sqcap vee wedge setminus wr diamond (?:big)?triangle.* lhd rhd unlhd unrhd oplus ominus otimes oslash odot bigcirc d?dagger amalg leq prec preceq ll (?:sq)?su[bp]set(?:eq)? in vdash geq succ(?:eq)? gg ni dashv equiv sim(?:eq)? asymp approx cong neq doteq propto models perp mid parallel bowtie Join smile frown .*arrow (?:long)?mapsto .*harpoon.* leadsto aleph hbar imath jmath ell wp Re Im mho prime emptyset nabla surd top bot angle forall exists neg flat natural sharp backslash partial infty Box Diamond triangle clubsuit diamondsuit heartsuit spadesuit sum prod coprod int oint big(?:sq)?c[au]p bigvee bigwedge bigodot bigotimes bigoplus biguplus (?:arc)?(?:cos|sin|tan|cot)h? csc arg deg det dim exp gcd hom inf ker lg lim liminf limsup ln log max min Pr sec sup (SUPER|SUB)SCRIPTNB (SUPER|SUB)SCRIPT %%END SAFE COMMANDS %%BEGIN TEXT COMMANDS % Regex matching commands with a text argument (leave out the \) addcontents.* cc closing chapter dashbox emph encl fbox framebox footnote footnotetext framebox part (sub){0,2}section\*? (sub)?paragraph\*? makebox mbox opening parbox raisebox savebox sbox shortstack signature text.* value underline sqrt (SUPER|SUB)SCRIPT %%END TEXT COMMANDS %%BEGIN CONTEXT1 COMMANDS % Regex matching commands with a text argument (leave out the \), which will fail out of context, but whose argument should be printed as plain text caption %%END CONTEXT1 COMMANDS %%BEGIN CONTEXT2 COMMANDS % Regex matching commands with a text argument (leave out the \), which will fail out of context, but whose argument should be printed as plain text title author date institute %%END CONTEXT2 COMMANDS %% TYPES (Commands for highlighting changed blocks) %DIF UNDERLINE PREAMBLE \RequirePackage[normalem]{ulem} \RequirePackage{color}\definecolor{RED}{rgb}{1,0,0}\definecolor{BLUE}{rgb}{0,0,1} \providecommand{\DIFadd}[1]{{\protect\color{blue}\uwave{#1}}} \providecommand{\DIFdel}[1]{{\protect\color{red}\sout{#1}}} %DIF END UNDERLINE PREAMBLE %DIF CTRADITIONAL PREAMBLE \RequirePackage{color}\definecolor{RED}{rgb}{1,0,0}\definecolor{BLUE}{rgb}{0,0,1} \RequirePackage[stable]{footmisc} \providecommand{\DIFadd}[1]{{\protect\color{blue} \sf #1}} \providecommand{\DIFdel}[1]{{\protect\color{red} [..\footnote{removed: #1} ]}} %DIF END CTRADITIONAL PREAMBLE %DIF TRADITIONAL PREAMBLE \RequirePackage[stable]{footmisc} \providecommand{\DIFadd}[1]{{\sf #1}} \providecommand{\DIFdel}[1]{{[..\footnote{removed: #1} ]}} %DIF END TRADITIONAL PREAMBLE %DIF CFONT PREAMBLE \RequirePackage{color}\definecolor{RED}{rgb}{1,0,0}\definecolor{BLUE}{rgb}{0,0,1} \providecommand{\DIFadd}[1]{{\protect\color{blue} \sf #1}} \providecommand{\DIFdel}[1]{{\protect\color{red} \scriptsize #1}} %DIF END CFONT PREAMBLE %DIF FONTSTRIKE PREAMBLE \RequirePackage[normalem]{ulem} \providecommand{\DIFadd}[1]{{\sf #1}} \providecommand{\DIFdel}[1]{{\footnotesize \sout{#1}}} %DIF END FONTSTRIKE PREAMBLE %DIF CCHANGEBAR PREAMBLE \RequirePackage[dvips]{changebar} \RequirePackage{color}\definecolor{RED}{rgb}{1,0,0}\definecolor{BLUE}{rgb}{0,0,1} \providecommand{\DIFadd}[1]{\protect\cbstart{\protect\color{blue}#1}\protect\cbend} \providecommand{\DIFdel}[1]{\protect\cbdelete{\protect\color{red}#1}\protect\cbdelete} %DIF END CCHANGEBAR PREAMBLE %DIF CFONTCHBAR PREAMBLE \RequirePackage[dvips]{changebar} \RequirePackage{color}\definecolor{RED}{rgb}{1,0,0}\definecolor{BLUE}{rgb}{0,0,1} \providecommand{\DIFadd}[1]{\protect\cbstart{\protect\color{blue}\sf #1}\protect\cbend} \providecommand{\DIFdel}[1]{\protect\cbdelete{\protect\color{red}\scriptsize #1}\protect\cbdelete} %DIF END CFONTCHBAR PREAMBLE %DIF CULINECHBAR PREAMBLE \RequirePackage[normalem]{ulem} \RequirePackage[dvips]{changebar} \RequirePackage{color} \providecommand{\DIFadd}[1]{\protect\cbstart{\protect\color{blue}\uwave{#1}}\protect\cbend} \providecommand{\DIFdel}[1]{\protect\cbdelete{\protect\color{red}\sout{#1}}\protect\cbdelete} %DIF END CULINECHBAR PREAMBLE %DIF CHANGEBAR PREAMBLE \RequirePackage[dvips]{changebar} \providecommand{\DIFadd}[1]{\protect\cbstart{#1}\protect\cbend} \providecommand{\DIFdel}[1]{\protect\cbdelete} %DIF END CHANGEBAR PREAMBLE %DIF INVISIBLE PREAMBLE \providecommand{\DIFadd}[1]{#1} \providecommand{\DIFdel}[1]{} %DIF END INVISIBLE PREAMBLE %% SUBTYPES (Markers for beginning and end of changed blocks) %DIF SAFE PREAMBLE \providecommand{\DIFaddbegin}{} \providecommand{\DIFaddend}{} \providecommand{\DIFdelbegin}{} \providecommand{\DIFdelend}{} %DIF END SAFE PREAMBLE %DIF MARGIN PREAMBLE \providecommand{\DIFaddbegin}{\protect\marginpar{a[}} \providecommand{\DIFaddend}{\protect\marginpar{]}} \providecommand{\DIFdelbegin}{\protect\marginpar{d[}} \providecommand{\DIFdelend}{\protect\marginpar{]}} %DIF END BRACKET PREAMBLE %DIF DVIPSCOL PREAMBLE %Note: only works with dvips converter \RequirePackage{color} \RequirePackage{dvipscol} \providecommand{\DIFaddbegin}{\protect\nogroupcolor{blue}} \providecommand{\DIFaddend}{\protect\nogroupcolor{black}} \providecommand{\DIFdelbegin}{\protect\nogroupcolor{red}} \providecommand{\DIFdelend}{\protect\nogroupcolor{black}} %DIF END DVIPSCOL PREAMBLE %DIF COLOR PREAMBLE \RequirePackage{color} \providecommand{\DIFaddbegin}{\protect\color{blue}} \providecommand{\DIFaddend}{\protect\color{black}} \providecommand{\DIFdelbegin}{\protect\color{red}} \providecommand{\DIFdelend}{\protect\color{black}} %DIF END COLOR PREAMBLE %% FLOAT TYPES %DIF FLOATSAFE PREAMBLE \providecommand{\DIFaddFL}[1]{\DIFadd{#1}} \providecommand{\DIFdelFL}[1]{\DIFdel{#1}} \providecommand{\DIFaddbeginFL}{} \providecommand{\DIFaddendFL}{} \providecommand{\DIFdelbeginFL}{} \providecommand{\DIFdelendFL}{} %DIF END FLOATSAFE PREAMBLE %DIF IDENTICAL PREAMBLE \providecommand{\DIFaddFL}[1]{\DIFadd{#1}} \providecommand{\DIFdelFL}[1]{\DIFdel{#1}} \providecommand{\DIFaddbeginFL}{\DIFaddbegin} \providecommand{\DIFaddendFL}{\DIFaddend} \providecommand{\DIFdelbeginFL}{\DIFdelbegin} \providecommand{\DIFdelendFL}{\DIFdelend} %DIF END IDENTICAL PREAMBLE %DIF TRADITIONALSAFE PREAMBLE % procidecommand color to make this work for TRADITIONAL and CTRADITIONAL \providecommand{\color}[1]{} \providecommand{\DIFaddFL}[1]{\DIFadd{#1}} \providecommand{\DIFdel}[1]{{\protect\color{red}[..{\scriptsize {removed: #1}} ]}} \providecommand{\DIFaddbeginFL}{} \providecommand{\DIFaddendFL}{} \providecommand{\DIFdelbeginFL}{} \providecommand{\DIFdelendFL}{} %DIF END FLOATSAFE PREAMBLE %% SPECIAL PACKAGE PREAMBLE COMMANDS % Standard \DIFadd and \DIFdel are redefined as \DIFaddtex and \DIFdeltex % when hyperref package is included. %DIF HYPERREF PREAMBLE \providecommand{\DIFadd}[1]{\texorpdfstring{\DIFaddtex{#1}}{#1}} \providecommand{\DIFdel}[1]{\texorpdfstring{\DIFdeltex{#1}}{}} %DIF END HYPERREF PACKAGE latexdiff-1.0.2/README0000644000076400007640000001016412063450740014241 0ustar tilmanntilmannINTRODUCTION latexdiff is a Perl script, which compares two latex files and marks up significant differences between them (i.e. a diff for latex files). Various options are available for visual markup using standard latex packages such as "color.sty". Changes not directly affecting visible text, for example in formatting commands, are still marked in the latex source. A rudimentary revision facilility is provided by another Perl script, latexrevise, which accepts or rejects all changes. Manual editing of the difference file can be used to override this default behaviour and accept or reject selected changes only. The author is F Tilmann (ftilmann@users.berlios.de). Project webpage: http://latexdiff.berlios.de/ CTAN page: http://www.ctan.org/tex-archive/support/latexdiff REQUIREMENTS Perl 5.8 or higher must be installed. The latexdiff script makes use of the Perl package Algorithm::Diff (available from www.cpan.org, current version 1.19). You can either install this package, or use the standalone version of latexdiff, latexdiff-so, which has version 1.15 of this package inlined and does not require external installation of the package. Because latexdiff uses internal functions of Algorithm:Diff whose calling format or availability can change without notice, the preferred method is now to use the standalone version. As an alternative, latexdiff-fast has a modified version of Algorithm::Diff inlined, which internally uses the UNIX diff command. This version is much faster but is dependent on an external "diff" command. Subtle differences in the algorithm of Algorithm::Diff and UNIX-diff mean that the resulting set of differences will generally not be the same as for the standard latexdiff. In most practical cases, these differences are minor, though. INSTALLATION UNIX/LINUX The basic installation procedure is almost trivial: 1. Copy latexdiff, latexrevise and latexdiff-vc into a directory which is in the search path and make them executable. If the Algorithm::Diff package is not installed, use latexdiff-so instead of latexdiff. 2. Copy latexdiff.1 and latexrevise.1 into the correct man directory 3. Optionally create soft links latexdiff-cvs latexdiff-rcs, and latexdiff-svn for latexdiff-vc. The attached Makefile contains example commands to carry out above steps as root for a typical UNIX installation. Type make install (for the stand alone version) or make install-ext (for the version using the external Algorithm::Diff) or make install-fast (for the version using the UNIX 'diff' function for fast differencing) to get it rolling. You can type make test or make test-ext or make test-fast to test the respective versions on a brief example before installation DOCUMENTATION: Usage instructions are in the manual latexdiff-man.pdf as well as the man pages. CHANGELOGS: Check out the comment lines at the beginning of the perl scripts (latexdiff, latexdiff-vc, latexrevise) CONTRIBUTIONS The directory contrib contains code written by others relating to latexdiff. Currently this directory contains: latexdiff-wrap (Author: V. Kuhlmann) An alternative wrapper script which can be used instead of latexdiff-vc. Its main use is as a template for customised wrapper scripts. latexdiff.spec (Author: T. Doerges) spec file for RPM generation latexchanges (Author: Jan-Ake Larsson) Wrapper script for applying latexdiff with numbered documen version (see contrib/README.latexchanges for a more detailed description) Cntributions by the following authors were incorporated into the latexdiff code, or inspired me to extend latexdiff in a similar way: J. Paisley, N. Becker, K. Huebner LICENSE (also see file COPYING) This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License Version 3 as published by the Free Software Foundation. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details (file LICENSE in the distribution). latexdiff-1.0.2/latexdiff-so0000755000076400007640000042701412063450736015707 0ustar tilmanntilmann#!/usr/bin/env perl ##!/usr/bin/perl -w # latexdiff - differences two latex files on the word level # and produces a latex file with the differences marked up. # # Copyright (C) 2004-12 F J Tilmann (tilmann@gfz-potsdam.de, ftilmann@users.berlios.de) # # Project webpages: http://latexdiff.berlios.de/ # CTAN page: http://www.ctan.org/tex-archive/support/latexdiff # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation, either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # You should have received a copy of the GNU General Public License # along with this program. If not, see . # # Detailed usage information at the end of the file # # Version 1.0.1 - treat \big,\bigg etc. equivalently to \left and # \right - include starred version in MATHENV - apply # - flatten recursively and --flatten expansion is now # aware of comments (thanks to Tim Connors for patch) # - Change to post-processing for more reliability for # deleted math environments # - On linux systems, recognise and remove DOS style newlines # - Provide markup for some special preamble commands (\title, # \author,\date, # - configurable by setting context2cmd # - for styles using ulem package, remove \emph and \text.. from list of # safe commands in order to allow linebreaks within the # highlighted sections. # - for ulem style, now show citations by enclosing them in \mbox commands. # This unfortunately implies linebreaks within citations no longer function, # so this functionality can be turned off (Option --disable-citation-markup). # With --enable-citation-markup, the mbox markup is forced for other styles) # - new substyle COLOR. This is particularly useful for marking up citations # and some special post-processing is implemented to retain cite # commands in deleted blocks. # - four different levels of math-markup # - Option --driver for choosing driver for modes employing changebar package # - accept \\* as valid command (and other commands of form \.*). Also accept # \ (backslashed newline) # - some typo fixes, include commands defined in preamble as safe commands # (Sebastian Gouezel) # - include compared filenames as comments as line 2 and 3 of # the preamble (can be modified with option --label, and suppressed with # --no-label), option --visible-label to show files in generated pdf or dvi # at the beginning of main document # # Version 0.5 A number of minor improvements based on feedback # Deleted blocks are now shown before added blocks # Package specific processing # # Version 0.43 unreleased typo in list of styles at the end # Add protect to all \cbstart, \cbend commands # More robust substitution of deleted math commands # # Version 0.42 November 06 Bug fixes only # # Version 0.4 March 06 option for fast differencing using UNIX diff command, several minor bug fixes (\par bug, improved highlighting of textcmds) # # Version 0.3 August 05 improved parsing of displayed math, --allow-spaces # option, several minor bug fixes # # Version 0.25 October 04 Fix bug with deleted equations, add math mode commands to safecmd, add | to allowed interpunctuation signs # Version 0.2 September 04 extension to utf-8 and variable encodings # Version 0.1 August 04 First public release # Inserted block for stand-alone version replaces # use Algorithm::Diff qw(traverse_sequences); # in standard version # The following BEGIN block contains a verbatim copy of # Ned Konz' Algorithm::Diff package version 1.15 except # that all POD documentation has been stripped out. # I encourage you to download and install the Algorithm::Diff # package and use the standard latexdiff version instead # (current distribution available from http://search.cpan.org/~nedkonz/Algorithm-Diff-1.15 # the most recent version can be found via http://search.cpan.org/search?module=Algorithm::Diff ) # Please note that the LICENCSE for Algorithm::Diff : # "Copyright (c) 2000-2002 Ned Konz. All rights reserved. # This program is free software; # you can redistribute it and/or modify it under the same terms # as Perl itself." # The stand-alone version of latexdiff is provided as a convenience # for latex users with no knowledge of PERL who do not wish to install # additional packages to be able to use latexdiff. If you believe # the inlining of Algorithm::Diff violates its license please contact # me and I will modify the latexdiff distribution accordingly. # Frederik Tilmann (tilmann@esc.cam.ac.uk) BEGIN { package Algorithm::Diff; use strict; use vars qw($VERSION @EXPORT_OK @ISA @EXPORT); use integer; # see below in _replaceNextLargerWith() for mod to make # if you don't use this require Exporter; @ISA = qw(Exporter); @EXPORT = qw(); @EXPORT_OK = qw(LCS diff traverse_sequences traverse_balanced sdiff); $VERSION = sprintf('%d.%02d so', (q$Revision: 1.15 $ =~ /\d+/g)); # McIlroy-Hunt diff algorithm # Adapted from the Smalltalk code of Mario I. Wolczko, # by Ned Konz, perl@bike-nomad.com # Create a hash that maps each element of $aCollection to the set of positions # it occupies in $aCollection, restricted to the elements within the range of # indexes specified by $start and $end. # The fourth parameter is a subroutine reference that will be called to # generate a string to use as a key. # Additional parameters, if any, will be passed to this subroutine. # # my $hashRef = _withPositionsOfInInterval( \@array, $start, $end, $keyGen ); sub _withPositionsOfInInterval { my $aCollection = shift; # array ref my $start = shift; my $end = shift; my $keyGen = shift; my %d; my $index; for ( $index = $start ; $index <= $end ; $index++ ) { my $element = $aCollection->[$index]; my $key = &$keyGen( $element, @_ ); if ( exists( $d{$key} ) ) { unshift ( @{ $d{$key} }, $index ); } else { $d{$key} = [$index]; } } return wantarray ? %d : \%d; } # Find the place at which aValue would normally be inserted into the array. If # that place is already occupied by aValue, do nothing, and return undef. If # the place does not exist (i.e., it is off the end of the array), add it to # the end, otherwise replace the element at that point with aValue. # It is assumed that the array's values are numeric. # This is where the bulk (75%) of the time is spent in this module, so try to # make it fast! sub _replaceNextLargerWith { my ( $array, $aValue, $high ) = @_; $high ||= $#$array; # off the end? if ( $high == -1 || $aValue > $array->[-1] ) { push ( @$array, $aValue ); return $high + 1; } # binary search for insertion point... my $low = 0; my $index; my $found; while ( $low <= $high ) { $index = ( $high + $low ) / 2; # $index = int(( $high + $low ) / 2); # without 'use integer' $found = $array->[$index]; if ( $aValue == $found ) { return undef; } elsif ( $aValue > $found ) { $low = $index + 1; } else { $high = $index - 1; } } # now insertion point is in $low. $array->[$low] = $aValue; # overwrite next larger return $low; } # This method computes the longest common subsequence in $a and $b. # Result is array or ref, whose contents is such that # $a->[ $i ] == $b->[ $result[ $i ] ] # foreach $i in ( 0 .. $#result ) if $result[ $i ] is defined. # An additional argument may be passed; this is a hash or key generating # function that should return a string that uniquely identifies the given # element. It should be the case that if the key is the same, the elements # will compare the same. If this parameter is undef or missing, the key # will be the element as a string. # By default, comparisons will use "eq" and elements will be turned into keys # using the default stringizing operator '""'. # Additional parameters, if any, will be passed to the key generation routine. sub _longestCommonSubsequence { my $a = shift; # array ref my $b = shift; # array ref my $keyGen = shift; # code ref my $compare; # code ref # set up code refs # Note that these are optimized. if ( !defined($keyGen) ) # optimize for strings { $keyGen = sub { $_[0] }; $compare = sub { my ( $a, $b ) = @_; $a eq $b }; } else { $compare = sub { my $a = shift; my $b = shift; &$keyGen( $a, @_ ) eq &$keyGen( $b, @_ ); }; } my ( $aStart, $aFinish, $bStart, $bFinish, $matchVector ) = ( 0, $#$a, 0, $#$b, [] ); # First we prune off any common elements at the beginning while ( $aStart <= $aFinish and $bStart <= $bFinish and &$compare( $a->[$aStart], $b->[$bStart], @_ ) ) { $matchVector->[ $aStart++ ] = $bStart++; } # now the end while ( $aStart <= $aFinish and $bStart <= $bFinish and &$compare( $a->[$aFinish], $b->[$bFinish], @_ ) ) { $matchVector->[ $aFinish-- ] = $bFinish--; } # Now compute the equivalence classes of positions of elements my $bMatches = _withPositionsOfInInterval( $b, $bStart, $bFinish, $keyGen, @_ ); my $thresh = []; my $links = []; my ( $i, $ai, $j, $k ); for ( $i = $aStart ; $i <= $aFinish ; $i++ ) { $ai = &$keyGen( $a->[$i], @_ ); if ( exists( $bMatches->{$ai} ) ) { $k = 0; for $j ( @{ $bMatches->{$ai} } ) { # optimization: most of the time this will be true if ( $k and $thresh->[$k] > $j and $thresh->[ $k - 1 ] < $j ) { $thresh->[$k] = $j; } else { $k = _replaceNextLargerWith( $thresh, $j, $k ); } # oddly, it's faster to always test this (CPU cache?). if ( defined($k) ) { $links->[$k] = [ ( $k ? $links->[ $k - 1 ] : undef ), $i, $j ]; } } } } if (@$thresh) { for ( my $link = $links->[$#$thresh] ; $link ; $link = $link->[0] ) { $matchVector->[ $link->[1] ] = $link->[2]; } } return wantarray ? @$matchVector : $matchVector; } sub traverse_sequences { my $a = shift; # array ref my $b = shift; # array ref my $callbacks = shift || {}; my $keyGen = shift; my $matchCallback = $callbacks->{'MATCH'} || sub { }; my $discardACallback = $callbacks->{'DISCARD_A'} || sub { }; my $finishedACallback = $callbacks->{'A_FINISHED'}; my $discardBCallback = $callbacks->{'DISCARD_B'} || sub { }; my $finishedBCallback = $callbacks->{'B_FINISHED'}; my $matchVector = _longestCommonSubsequence( $a, $b, $keyGen, @_ ); # Process all the lines in @$matchVector my $lastA = $#$a; my $lastB = $#$b; my $bi = 0; my $ai; for ( $ai = 0 ; $ai <= $#$matchVector ; $ai++ ) { my $bLine = $matchVector->[$ai]; if ( defined($bLine) ) # matched { &$discardBCallback( $ai, $bi++, @_ ) while $bi < $bLine; &$matchCallback( $ai, $bi++, @_ ); } else { &$discardACallback( $ai, $bi, @_ ); } } # The last entry (if any) processed was a match. # $ai and $bi point just past the last matching lines in their sequences. while ( $ai <= $lastA or $bi <= $lastB ) { # last A? if ( $ai == $lastA + 1 and $bi <= $lastB ) { if ( defined($finishedACallback) ) { &$finishedACallback( $lastA, @_ ); $finishedACallback = undef; } else { &$discardBCallback( $ai, $bi++, @_ ) while $bi <= $lastB; } } # last B? if ( $bi == $lastB + 1 and $ai <= $lastA ) { if ( defined($finishedBCallback) ) { &$finishedBCallback( $lastB, @_ ); $finishedBCallback = undef; } else { &$discardACallback( $ai++, $bi, @_ ) while $ai <= $lastA; } } &$discardACallback( $ai++, $bi, @_ ) if $ai <= $lastA; &$discardBCallback( $ai, $bi++, @_ ) if $bi <= $lastB; } return 1; } sub traverse_balanced { my $a = shift; # array ref my $b = shift; # array ref my $callbacks = shift || {}; my $keyGen = shift; my $matchCallback = $callbacks->{'MATCH'} || sub { }; my $discardACallback = $callbacks->{'DISCARD_A'} || sub { }; my $discardBCallback = $callbacks->{'DISCARD_B'} || sub { }; my $changeCallback = $callbacks->{'CHANGE'}; my $matchVector = _longestCommonSubsequence( $a, $b, $keyGen, @_ ); # Process all the lines in match vector my $lastA = $#$a; my $lastB = $#$b; my $bi = 0; my $ai = 0; my $ma = -1; my $mb; while (1) { # Find next match indices $ma and $mb do { $ma++ } while ( $ma <= $#$matchVector && !defined $matchVector->[$ma] ); last if $ma > $#$matchVector; # end of matchVector? $mb = $matchVector->[$ma]; # Proceed with discard a/b or change events until # next match while ( $ai < $ma || $bi < $mb ) { if ( $ai < $ma && $bi < $mb ) { # Change if ( defined $changeCallback ) { &$changeCallback( $ai++, $bi++, @_ ); } else { &$discardACallback( $ai++, $bi, @_ ); &$discardBCallback( $ai, $bi++, @_ ); } } elsif ( $ai < $ma ) { &$discardACallback( $ai++, $bi, @_ ); } else { # $bi < $mb &$discardBCallback( $ai, $bi++, @_ ); } } # Match &$matchCallback( $ai++, $bi++, @_ ); } while ( $ai <= $lastA || $bi <= $lastB ) { if ( $ai <= $lastA && $bi <= $lastB ) { # Change if ( defined $changeCallback ) { &$changeCallback( $ai++, $bi++, @_ ); } else { &$discardACallback( $ai++, $bi, @_ ); &$discardBCallback( $ai, $bi++, @_ ); } } elsif ( $ai <= $lastA ) { &$discardACallback( $ai++, $bi, @_ ); } else { # $bi <= $lastB &$discardBCallback( $ai, $bi++, @_ ); } } return 1; } sub LCS { my $a = shift; # array ref my $matchVector = _longestCommonSubsequence( $a, @_ ); my @retval; my $i; for ( $i = 0 ; $i <= $#$matchVector ; $i++ ) { if ( defined( $matchVector->[$i] ) ) { push ( @retval, $a->[$i] ); } } return wantarray ? @retval : \@retval; } sub diff { my $a = shift; # array ref my $b = shift; # array ref my $retval = []; my $hunk = []; my $discard = sub { push ( @$hunk, [ '-', $_[0], $a->[ $_[0] ] ] ) }; my $add = sub { push ( @$hunk, [ '+', $_[1], $b->[ $_[1] ] ] ) }; my $match = sub { push ( @$retval, $hunk ) if scalar(@$hunk); $hunk = [] }; traverse_sequences( $a, $b, { MATCH => $match, DISCARD_A => $discard, DISCARD_B => $add }, @_ ); &$match(); return wantarray ? @$retval : $retval; } sub sdiff { my $a = shift; # array ref my $b = shift; # array ref my $retval = []; my $discard = sub { push ( @$retval, [ '-', $a->[ $_[0] ], "" ] ) }; my $add = sub { push ( @$retval, [ '+', "", $b->[ $_[1] ] ] ) }; my $change = sub { push ( @$retval, [ 'c', $a->[ $_[0] ], $b->[ $_[1] ] ] ); }; my $match = sub { push ( @$retval, [ 'u', $a->[ $_[0] ], $b->[ $_[1] ] ] ); }; traverse_balanced( $a, $b, { MATCH => $match, DISCARD_A => $discard, DISCARD_B => $add, CHANGE => $change, }, @_ ); return wantarray ? @$retval : $retval; } 1; } import Algorithm::Diff qw(traverse_sequences); # End of inserted block for stand-alone version use Getopt::Long ; use strict ; use warnings; use utf8 ; my ($algodiffversion)=split(/ /,$Algorithm::Diff::VERSION); my ($versionstring)=< 0, WHOLE => 1, COARSE => 2, FINE => 3 }; my (@configlist,@labels, @appendsafelist,@excludesafelist, @appendtextlist,@excludetextlist, @appendcontext1list,@appendcontext2list, @packagelist); my ($assign,@config); # Hash where keys corresponds to the names of all included packages (including the documentclass as another package # the optional arguments to the package are the values of the hash elements my ($pkg,%packages); # Defaults $type='UNDERLINE'; $subtype='SAFE'; $floattype='FLOATSAFE'; $mathmarkup=COARSE; $verbose=0; # output debug and intermediate files, set to 0 in final distribution $debug=0; # define character properties sub IsNonAsciiPunct { return <<'END' # Unicode punctuation but excluding ASCII punctuation +utf8::IsPunct -utf8::IsASCII END } sub IsNonAsciiS { return <<'END' # Unicode symbol but excluding ASCII +utf8::IsS -utf8::IsASCII END } my %verbhash; Getopt::Long::Configure('bundling'); GetOptions('type|t=s' => \$type, 'subtype|s=s' => \$subtype, 'floattype|f=s' => \$floattype, 'config|c=s' => \@configlist, 'preamble|p=s' => \$preamblefile, 'encoding|e=s' => \$encoding, 'label|L=s' => \@labels, 'no-label' => \$nolabel, 'visible-label' => \$visiblelabel, 'exclude-safecmd|A=s' => \@excludesafelist, 'replace-safecmd=s' => \$replacesafe, 'append-safecmd|a=s' => \@appendsafelist, 'exclude-textcmd|X=s' => \@excludetextlist, 'replace-textcmd=s' => \$replacetext, 'append-textcmd|x=s' => \@appendtextlist, 'replace-context1cmd=s' => \$replacecontext1, 'append-context1cmd=s' => \@appendcontext1list, 'replace-context2cmd=s' => \$replacecontext2, 'append-context2cmd=s' => \@appendcontext2list, 'show-preamble' => \$showpreamble, 'show-safecmd' => \$showsafe, 'show-textcmd' => \$showtext, 'show-config' => \$showconfig, 'show-all' => \$showall, 'packages=s' => \@packagelist, 'allow-spaces' => \$allowspaces, 'math-markup=s' => \$mathmarkup, 'enable-citation-markup' => \$enablecitmark, 'disable-citation-markup' => \$disablecitmark, 'verbose|V' => \$verbose, 'ignore-warnings' => \$ignorewarnings, 'driver=s'=> \$driver, 'flatten' => \$flatten, 'version' => \$version, 'help|h|H' => \$help); if ( $help ) { usage() ; } if ( $version ) { die $versionstring ; } print STDERR $versionstring if $verbose; if (defined($showall)){ $showpreamble=$showsafe=$showtext=$showconfig=1; } if (defined($mathmarkup)) { $mathmarkup=~tr/a-z/A-Z/; if ( $mathmarkup eq 'OFF' ){ $mathmarkup=OFF; } elsif ( $mathmarkup eq 'WHOLE' ){ $mathmarkup=WHOLE; } elsif ( $mathmarkup eq 'COARSE' ){ $mathmarkup=COARSE; } elsif ( $mathmarkup eq 'FINE' ){ $mathmarkup=FINE; } elsif ( $mathmarkup !~ m/^[0123]$/ ) { die "Illegal value: ($mathmarkup) for option--math-markup. Possible values: OFF,WHOLE,COARSE,FINE,0- "; } # else use numerical value } # setting extra preamble commands if (defined($preamblefile)) { $latexdiffpreamble=join "\n",(extrapream($preamblefile),""); } else { $latexdiffpreamble=join "\n",(extrapream($type,$subtype,$floattype),""); } if ( defined($driver) ) { # for changebar only $latexdiffpreamble=~s/\[dvips\]/[$driver]/sg; } # setting up @SAFECMDLIST and @SAFECMDEXCL if (defined($replacesafe)) { init_regex_arr_ext(\@SAFECMDLIST,$replacesafe); } else { init_regex_arr_data(\@SAFECMDLIST, "SAFE COMMANDS"); } foreach $appendsafe ( @appendsafelist ) { init_regex_arr_ext(\@SAFECMDLIST, $appendsafe); } foreach $excludesafe ( @excludesafelist ) { init_regex_arr_ext(\@SAFECMDEXCL, $excludesafe); } # Special: treat all cite commands as safe except in UNDERLINE and FONTSTRIKE mode # (there is a conflict between citation and ulem package, see # package documentation) # Use post-processing if ( uc($type) ne "UNDERLINE" && uc($type) ne "FONTSTRIKE" && uc($type) ne "CULINECHBAR" ) { push (@SAFECMDLIST, qr/^cite.*$/); } else { ### Experimental: disable text and emph commands push (@SAFECMDLIST, qr/^cite.*$/) unless $disablecitmark; push(@SAFECMDEXCL, qr/^emph$/, qr/^text..$/); # replace \cite{..} by \mbox{\cite{..}} in added or deleted blocks in post-processing if ( uc($subtype) eq "COLOR" or uc($subtype) eq "DVIPSCOL" ) { # remove \cite command again from list of safe commands pop @SAFECMDLIST; # deleted cite commands $CITE2CMD='(?:cite\w*|nocite)' unless $disablecitmark ; # \cite-type commands which should be reinstated in deleted blocks } else { $CITECMD='(?:cite\w*|nocite)' unless $disablecitmark ; # \cite commands which need to be protected within an mbox in UNDERLINE and other modes using ulem } } $CITECMD='(?:cite\w*|nocite)' if $enablecitmark ; # as above for explicit selection # setting up @TEXTCMDLIST and @TEXTCMDEXCL if (defined($replacetext)) { init_regex_arr_ext(\@TEXTCMDLIST,$replacetext); } else { init_regex_arr_data(\@TEXTCMDLIST, "TEXT COMMANDS"); } foreach $appendtext ( @appendtextlist ) { init_regex_arr_ext(\@TEXTCMDLIST, $appendtext); } foreach $excludetext ( @excludetextlist ) { init_regex_arr_ext(\@TEXTCMDEXCL, $excludetext); } # setting up @CONTEXT1CMDLIST ( @CONTEXT1CMDEXCL exist but is always empty ) if (defined($replacecontext1)) { init_regex_arr_ext(\@CONTEXT1CMDLIST,$replacecontext1); } else { init_regex_arr_data(\@CONTEXT1CMDLIST, "CONTEXT1 COMMANDS"); } foreach $appendcontext1 ( @appendcontext1list ) { init_regex_arr_ext(\@CONTEXT1CMDLIST, $appendcontext1); } # setting up @CONTEXT2CMDLIST ( @CONTEXT2CMDEXCL exist but is always empty ) if (defined($replacecontext2)) { init_regex_arr_ext(\@CONTEXT2CMDLIST,$replacecontext2); } else { init_regex_arr_data(\@CONTEXT2CMDLIST, "CONTEXT2 COMMANDS"); } foreach $appendcontext2 ( @appendcontext2list ) { init_regex_arr_ext(\@CONTEXT2CMDLIST, $appendcontext2); } # setting configuration variables @config=(); foreach $config ( @configlist ) { if (-f $config ) { open(FILE,$config) or die ("Couldn't open configuration file $config: $!"); while () { chomp; next if /^\s*#/ || /^\s*%/ || /^\s*$/ ; push (@config,$_); } close(FILE); } else { # foreach ( split(",",$config) ) { # push @config,$_; # } push @config,split(",",$config) } } foreach $assign ( @config ) { $assign=~ m/\s*(\w*)\s*=\s*(\S*)\s*$/ or die "Illegal assignment $assign in configuration list (must be variable=value)"; if ( $1 eq "MINWORDSBLOCK" ) { $MINWORDSBLOCK = $2; } elsif ( $1 eq "FLOATENV" ) { $FLOATENV = $2 ; } elsif ( $1 eq "PICTUREENV" ) { $PICTUREENV = $2 ; } elsif ( $1 eq "MATHENV" ) { $MATHENV = $2 ; } elsif ( $1 eq "MATHREPL" ) { $MATHREPL = $2 ; } elsif ( $1 eq "MATHARRENV" ) { $MATHARRENV = $2 ; } elsif ( $1 eq "MATHARRREPL" ) { $MATHARRREPL = $2 ; } elsif ( $1 eq "ARRENV" ) { $ARRENV = $2 ; } elsif ( $1 eq "COUNTERCMD" ) { $COUNTERCMD = $2 ; } else { die "Unknown variable $1 in assignment.";} } if ( $mathmarkup == COARSE || $mathmarkup == WHOLE ) { push(@MATHTEXTCMDLIST,qr/^MATHBLOCK(?:$MATHENV|$MATHARRENV|SQUAREBRACKET)$/); } foreach $pkg ( @packagelist ) { map { $packages{$_}="" } split(/,/,$pkg) ; } if ($showpreamble) { print "\nPreamble commands:\n"; print $latexdiffpreamble ; } if ($showsafe) { print "\nCommands safe within scope of $ADDOPEN $ADDCLOSE and $DELOPEN $DELCLOSE (unless excluded):\n"; print_regex_arr(@SAFECMDLIST); print "\nCommands not safe within scope of $ADDOPEN $ADDCLOSE and $DELOPEN $DELCLOSE :\n"; print_regex_arr(@SAFECMDEXCL); } if ($showtext) { print "\nCommands with last argument textual (unless excluded) and safe in every context:\n"; print_regex_arr(@TEXTCMDLIST); print "\nContext1 commands (last argument textual, command will be disabled in deleted passages, last argument will be shown as plain text):\n"; print_regex_arr(@CONTEXT1CMDLIST); print "\nContext2 commands (last argument textual, command and its argument will be disabled in deleted passages):\n"; print_regex_arr(@CONTEXT2CMDLIST); print "\nExclude list of Commands with last argument not textual (overrides patterns above):\n"; print_regex_arr(@TEXTCMDEXCL); } if ($showconfig) { print "Configuration variables:\n"; print "MINWORDSBLOCK=$MINWORDSBLOCK\n"; print "FLOATENV=$FLOATENV\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"; } if ($showconfig || $showtext || $showsafe || $showpreamble) { exit 0; } if ( @ARGV != 2 ) { print STDERR "2 and only 2 non-option arguments required. Write latexdiff -h to get help\n"; exit(2); } # Are extra spaces between command arguments permissible? my $extraspace; if ($allowspaces) { $extraspace='\s*'; } else { $extraspace=''; } # append context lists to text lists (as text property is implied) push @TEXTCMDLIST, @CONTEXT1CMDLIST; push @TEXTCMDLIST, @CONTEXT2CMDLIST; push @TEXTCMDLIST, @MATHTEXTCMDLIST if $mathmarkup==COARSE; # internal additions to SAFECMDLIST push(@SAFECMDLIST, qr/^QLEFTBRACE$/, qr/^QRIGHTBRACE$/); # Patterns. These are used by some of the subroutines, too # I can only define them down here because value of extraspace depends on an option my $pat0 = '(?:[^{}])*'; my $pat1 = '(?:[^{}]|\{'.$pat0.'\})*'; my $pat2 = '(?:[^{}]|\{'.$pat1.'\})*'; my $pat3 = '(?:[^{}]|\{'.$pat2.'\})*'; my $pat4 = '(?:[^{}]|\{'.$pat3.'\})*'; my $pat5 = '(?:[^{}]|\{'.$pat4.'\})*'; my $pat6 = '(?:[^{}]|\{'.$pat5.'\})*'; my $brat0 = '(?:[^\[\]]|\\\[|\\\])*'; my $quotemarks = '(?:\'\')|(?:\`\`)'; my $punct='[0.,\/\'\`:;\"\?\(\)\[\]!~\p{IsNonAsciiPunct}\p{IsNonAsciiS}]'; my $number='-?\d*\.\d*'; my $mathpunct='[+=<>\-\|]'; my $and = '&'; my $coords= '[\-.,\s\d]*'; # word: sequence of letters or accents followed by letter my $word='(?:[-\w\d*]|\\\\[\"\'\`~^][A-Za-z\*])+'; my $cmdleftright='\\\\(?:left|right|[Bb]igg?[lrm]?|middle)\s*(?:[()\[\]|]|\\\\(?:[|{}]|\w+))'; my $cmdoptseq='\\\\[\w\d\*]+'.$extraspace.'(?:(?:\['.$brat0.'\]|\{'. $pat6 . '\}|\(' . $coords .'\))'.$extraspace.')*'; my $backslashnl='\\\\\n'; my $oneletcmd='\\\\.\*?(?:\['.$brat0.'\]|\{'. $pat6 . '\})*'; my $math='\$(?:[^$]|\\\$)*?\$|\\\\[(].*?\\\\[)]'; ## the current maths command cannot cope with newline within the math expression my $comment='%.*?\n'; my $pat=qr/(?:\A\s*)?(?:${and}|${quotemarks}|${number}|${word}|$cmdleftright|${cmdoptseq}|${math}|${backslashnl}|${oneletcmd}|${comment}|${punct}|${mathpunct}|\{|\})\s*/ ; # now we are done setting up and can start working my ($oldfile, $newfile) = @ARGV; # check for existence of input files if ( ! -e $oldfile ) { die "Input file $oldfile does not exist."; } if ( ! -e $newfile ) { die "Input file $newfile does not exist."; } # set the labels to be included into the file my ($oldtime,$newtime,$oldlabel,$newlabel); if (defined($labels[0])) { $oldlabel=$labels[0] ; } else { $oldtime=localtime((stat($oldfile))[9]); $oldlabel="$oldfile " . " "x(length($newfile)-length($oldfile)) . $oldtime; } if (defined($labels[1])) { $newlabel=$labels[1] ; } else { $newtime=localtime((stat($newfile))[9]); $newlabel="$newfile " . " "x(length($oldfile)-length($newfile)) . $newtime; } $encoding=guess_encoding($newfile) unless defined($encoding); $encoding = "utf8" if $encoding =~ m/^utf8/i ; if (lc($encoding) eq "utf8" ) { binmode(STDOUT, ":utf8"); binmode(STDERR, ":utf8"); } $old=read_file_with_encoding($oldfile,$encoding); $new=read_file_with_encoding($newfile,$encoding); # reset time exetime(1); ($oldpreamble,$oldbody,$oldpost)=splitdoc($old,'\\\\begin\{document\}','\\\\end\{document\}'); ($newpreamble,$newbody,$newpost)=splitdoc($new,'\\\\begin\{document\}','\\\\end\{document\}'); if ($flatten) { $oldbody=flatten($oldbody,$oldpreamble,$oldfile,$encoding); $newbody=flatten($newbody,$newpreamble,$newfile,$encoding); } my @auxlines; if ( length $oldpreamble && length $newpreamble ) { # pre-process preamble by looking for commands used in \maketitle (title, author, date etc commands) # and marking up content with latexdiff markup @auxlines=preprocess_preamble($oldpreamble,$newpreamble); @oldpreamble = split /\n/, $oldpreamble; @newpreamble = split /\n/, $newpreamble; # If a command is defined in the preamble of the new file, and only uses safe commands, then it can be considered to be safe) (contribution S. Gouezel) # Base this assessment on the new preamble add_safe_commands($newpreamble); %packages=list_packages(@newpreamble) unless %packages; if (defined $packages{"hyperref"} ) { print STDERR "hyperref package detected.\n" if $verbose ; $latexdiffpreamble =~ s/\{\\DIFadd\}/{\\DIFaddtex}/g; $latexdiffpreamble =~ s/\{\\DIFdel\}/{\\DIFdeltex}/g; $latexdiffpreamble .= join "\n",(extrapream("HYPERREF"),""); } print STDERR "Differencing preamble.\n" if $verbose; # insert dummy first line such that line count begins with line 1 (rather than perl's line 0) - just so that line numbers inserted by linediff are correct unshift @newpreamble,''; unshift @oldpreamble,''; @diffpreamble = linediff(\@oldpreamble, \@newpreamble); # remove dummy line again shift @diffpreamble; # add filenames, modification time and latexdiff mark defined($nolabel) or splice @diffpreamble,1,0, "%DIF LATEXDIFF DIFFERENCE FILE", ,"%DIF DEL $oldlabel", "%DIF ADD $newlabel"; if ( @auxlines ) { push @diffpreamble,"%DIF DELETED TITLE COMMANDS FOR MARKUP"; push @diffpreamble,join("\n",@auxlines); } push @diffpreamble,$latexdiffpreamble; push @diffpreamble,'\begin{document}'; } elsif ( !length $oldpreamble && !length $newpreamble ) { @diffpreamble=(); } else { print STDERR "Either both texts must have preamble or neither text must have the preamble.\n"; exit(2); } if (defined $packages{"amsmath"} or defined $packages{"amsart"} or defined $packages{"amsbook"} ) { print STDERR "amsmath package detected.\n" if $verbose ; $MATHARRREPL='align*'; } print STDERR "Preprocessing body. " if $verbose; my ($oldleadin,$newleadin)=preprocess($oldbody,$newbody); # run difference algorithm @diffbody=bodydiff($oldbody, $newbody); $diffbo=join("",@diffbody); if ( $debug ) { open(RAWDIFF,">","latexdiff.debug.bodydiff"); print RAWDIFF $diffbo; close(RAWDIFF); } print STDERR "(",exetime()," s)\n","Postprocessing body. \n " if $verbose; postprocess($diffbo); $diffall =join("\n",@diffpreamble) ; # add visible labels if (defined($visiblelabel)) { # Give information right after \begin{document} (or at the beginning of the text for files without preamble ### if \date command is used, add information to \date argument, otherwise give right after \begin{document} ### $diffall=~s/(\\date$extraspace(?:\[$brat0\])?$extraspace)\{($pat6)\}/$1\{$2 \\ LATEXDIFF comparison \\ Old: $oldlabel \\ New: $newlabel \}/ or $diffbo = "\\begin{verbatim}LATEXDIFF comparison\nOld: $oldlabel\nNew: $newlabel\\end{verbatim}\n$diffbo" ; } $diffall .= "$newleadin$diffbo" ; $diffall .= "\\end{document}$newpost" if length $newpreamble ; if ( lc($encoding) ne "utf8" && lc($encoding) ne "ascii" ) { print STDERR "Encoding output file to $encoding\n" if $verbose; $diffall=Encode::encode($encoding,$diffall); binmode STDOUT; } print $diffall; print STDERR "(",exetime()," s)\n","Done.\n" if $verbose; ## guess_encoding(filename) ## reads the first 20 lines of filename and looks for call of inputenc package ## if found, return the option of this package (encoding), otherwise return ascii sub guess_encoding { my ($filename)=@_; my ($i,$enc); open (FH, $filename) or die("Couldn't open $filename: $!"); $i=0; while () { next if /^\s*%/; # skip comment lines if (m/\\usepackage\[(\w*?)\]\{inputenc\}/) { close(FH); return($1); } last if (++$i > 20 ); # scan at most 20 non-comment lines } close(FH); return("ascii"); } sub read_file_with_encoding { my ($output); my ($filename, $encoding) = @_; if (lc($encoding) eq "utf8" ) { open (FILE, "<:utf8",$filename) or die("Couldn't open $filename: $!"); local $/ ; # locally set record operator to undefined, ie. enable whole-file mode $output=; } elsif ( lc($encoding) eq "ascii") { open (FILE, $filename) or die("Couldn't open $filename: $!"); local $/ ; # locally set record operator to undefined, ie. enable whole-file mode $output=; } else { require Encode; open (FILE, "<",$filename) or die("Couldn't open $filename: $!"); local $/ ; # locally set record operator to undefined, ie. enable whole-file mode $output=; print STDERR "Converting $filename from $encoding to utf8\n" if $verbose; $output=Encode::decode($encoding,$output); } close FILE; if ($^O eq "linux" ) { $output =~ s/\r\n/\n/g ; } return $output; } # %packages=list_packages(@preamble) # scans the arguments for \documentclass and \usepackage statements and constructs a hash # whose keys are the included packages, and whose values are the associated optional arguments sub list_packages { my (@preamble)=@_; my %packages=(); foreach $line ( @preamble ) { # get rid of comments $line=~s/(?catfile($dirname,$fname), "\n" if $debug; # content of file becomes replacement value (use recursion), add \newpage if the command was include ###$replacement=read_file_with_encoding(File::Spec->catfile($dirname,$fname), $encoding) or die "Couldn't find file ",File::Spec->catfile($dirname,$fname),": $!"; $replacement=flatten(read_file_with_encoding(File::Spec->catfile($dirname,$fname), $encoding), $preamble,$filename,$encoding) or die "Couldn't find file ",File::Spec->catfile($dirname,$fname),": $!"; # \include always starts a new page; use explicit \newpage command to simulate this $begline=(defined($1)? $1 : "") ; $newpage=(defined($3)? " \\newpage " : "") ; "$begline$newpage$replacement$newpage"; }/exgm; return($text); } # print_regex_arr(@arr) # prints regex array without x-ism expansion put in by pearl to stdout sub print_regex_arr { my $dumstring; $dumstring = join(" ",@_); # PERL generates string (?-xism:^ref$) for quoted refex ^ref$ $dumstring =~ s/\(\?-xism:\^(.*?)\$\)/$1/g; # remove string and ^,$ marks before output print $dumstring,"\n"; } # @lines=extrapream($type) # reads line from appendix (end of file after __END__ token) sub extrapream { my $type; my @retval=("%DIF PREAMBLE EXTENSION ADDED BY LATEXDIFF") ; my ($copy); while (@_) { $copy=0; $type=shift ; if ( -f $type ) { open (FILE,$type) or die "Cannot open preamble file $type: $!"; print STDERR "Reading preamble file $type\n" if $verbose ; while () { chomp ; if ( $_ =~ m/%DIF PREAMBLE/ ) { push (@retval,"$_"); } else { push (@retval,"$_ %DIF PREAMBLE"); } } } else { # not (-f $type) $type=uc($type); # upcase argument print STDERR "Preamble Internal Type $type\n" if $verbose; while () { if ( m/^%DIF $type/ ) { $copy=1; } elsif ( m/^%DIF END $type/ ) { last; } chomp; push (@retval,"$_ %DIF PREAMBLE") if $copy; } if ( $copy == 0 ) { print STDERR "\nPreamble style $type not implemented.\n"; print STDERR "Write latexdiff -h to get help with available styles\n"; exit(2); } seek DATA,0,0; # rewind DATA handle to file begin } } push (@retval,"%DIF END PREAMBLE EXTENSION ADDED BY LATEXDIFF") ; return @retval; } # ($part1,$part2,$part3)=splitdoc($text,$word1,$word2) # splits $text into 3 parts at $word1 and $word2. # if neither $word1 nor $word2 exist, $part1 and $part3 are empty, $part2 is $text # If only $word1 or $word2 exist but not the other, output an error message. # NB this version avoids $` and $' for performance reason although it only makes a tiny difference # (in one test gain a tenth of a second for a 30s run) sub splitdoc { my ($text,$word1,$word2)=@_; my ($part1,$part2,$part3)=("","",""); my ($rest,$pos); if ( $text =~ m/(^[^%]*)($word1)/mg ) { $pos=pos $text; $part1=substr($text,0,$pos-length($2)); $rest=substr($text,$pos); if ( $rest =~ m/(^[^%]*)($word2)/mg ) { $pos=pos $rest; $part2=substr($rest,0,$pos-length($2)); $part3=substr($rest,$pos); } else { die "$word1 and $word2 not in the correct order or not present as a pair." ; } } else { $part2=$text; die "$word2 present but not $word1." if ( $text =~ m/(^[^%]*)$word2/ms ); } return ($part1,$part2,$part3); } # bodydiff($old,$new) sub bodydiff { my ($oldwords, $newwords) = @_; my @retwords; print STDERR "(",exetime()," s)\n","Splitting into latex tokens \n" if $verbose; print STDERR "Parsing $oldfile \n" if $verbose; my @oldwords = splitlatex($oldwords); print STDERR "Parsing $newfile \n" if $verbose; my @newwords = splitlatex($newwords); if ( $debug ) { open(TOKENOLD,">","latexdiff.debug.tokenold"); print TOKENOLD join("***\n",@oldwords); close(TOKENOLD); open(TOKENNEW,">","latexdiff.debug.tokennew"); print TOKENNEW join("***\n",@newwords); close(TOKENNEW); } print STDERR "(",exetime()," s)\n","Pass 1: Expanding text commands and merging isolated identities with changed blocks " if $verbose; pass1(\@oldwords, \@newwords); print STDERR "(",exetime()," s)\n","Pass 2: inserting DIF tokens and mark up. " if $verbose; if ( $debug ) { open(TOKENOLD,">","latexdiff.debug.tokenold2.tex"); print TOKENOLD join("***\n",@oldwords); close(TOKENOLD); open(TOKENNEW,">","latexdiff.debug.tokennew2.tex"); print TOKENNEW join("***\n",@newwords); close(TOKENNEW); } @retwords=pass2(\@oldwords, \@newwords); return(@retwords); } # @words=splitlatex($string) # split string according to latex rules # Each element of words is either # a word (including trailing spaces and punctuation) # a latex command sub splitlatex { my ($string) = @_ ; # if input is empty, return empty list length($string)>0 or return (); my @retval=($string =~ m/$pat/osg); if (length($string) != length(join("",@retval))) { print STDERR "\nWARNING: Inconsistency in length of input string and parsed string:\n This often indicates faulty or non-standard latex code.\n In many cases you can ignore this and the following warning messages.\n Note that character numbers in the following are counted beginning after \\begin{document} and are only approximate." unless $ignorewarnings; print STDERR "DEBUG Original length ",length($string)," Parsed length ",length(join("",@retval)),"\n" if $debug; print STDERR "DEBUG Input string: |$string|\n" if (length($string)<500) && $debug; print STDERR "DEBUG Token parsing: |",join("+",@retval),"|\n" if (length($string)<500) && $debug ; @retval=(); # slow way only do this if other m//sg method fails my $last = 0; while ( $string =~ m/$pat/osg ) { my $match=$&; if ($last + length $& != pos $string ) { my $pos=pos($string); my $offset=30<$last ? 30 : $last; my $dum=substr($string,$last-$offset,$pos-$last+2*$offset); my $dum1=$dum; my $cnt=$#retval; my $i; $dum1 =~ s/\n/ /g; unless ($ignorewarnings) { print STDERR "\n$dum1\n"; print STDERR " " x 30,"^" x ($pos-$last)," " x 30,"\n"; print STDERR "Missing characters near word " . (scalar @retval) . " character index: " . $last . "-" . pos($string) . " Length: " . length($match) . " Match: |$match| (expected match marked above).\n"; } # put in missing characters `by hand' push (@retval, substr($dum,$offset,$pos-$last-length($match))); # Note: there seems to be a bug in substr with utf8 that made the following line output substr which were too long, # using dum instead appears to work # push (@retval, substr($string,$last, pos($string)-$last-length($match))); } push (@retval, $match); $last=pos $string; } } return @retval; } # pass1( \@seq1,\@seq2) # Look for differences between seq1 and seq2. # Where an common-subsequence block is flanked by deleted or appended blocks, # and is shorter than $MINWORDSBLOCK words it is appended # to the last deleted or appended word. If the block contains tokens other than words # or punctuation it is not merged. # Deleted or appended block consisting of words and safe commands only are # also merged, to prevent break-up in pass2 (after previous isolated words have been removed) # If there are commands with textual arguments (e.g. \caption) both in corresponding # appended and deleted blocks split them such that the command and opening bracket # are one token, then the rest is split up following standard rules, and the closing # bracket is a separate token, ie. turn # "\caption{This is a textual argument}" into # ("\caption{","This ","is ","a ","textual ","argument","}") # No return value. Destructively changes sequences sub pass1 { my $seq1 = shift ; my $seq2 = shift ; my $len1 = scalar @$seq1; my $len2 = scalar @$seq2; my $wpat=qr/^(?:[a-zA-Z.,'`:;?()!]*)[\s~]*$/; #' my ($last1,$last2)=(-1,-1) ; my $cnt=0; my $block=[]; my $addblock=[]; my $delblock=[]; my $todo=[]; my $instruction=[]; my $i; my (@delmid,@addmid,@dummy); my ($addcmds,$delcmds,$matchindex); my ($addtextblocks,$deltextblocks); my ($addtokcnt,$deltokcnt,$mattokcnt)=(0,0,0); my ($addblkcnt,$delblkcnt,$matblkcnt)=(0,0,0); my $adddiscard = sub { if ($cnt > 0 ) { $matblkcnt++; # just after an unchanged block # print STDERR "Unchanged block $cnt, $last1,$last2 \n"; if ($cnt < $MINWORDSBLOCK && $cnt==scalar ( grep { /^$wpat/ || ( /^\\([\w\d\*]+)((?:\[$brat0\]|\{$pat6\})*)/o && iscmd($1,\@SAFECMDLIST,\@SAFECMDEXCL) && scalar(@dummy=split(" ",$2))<3 ) } @$block) ) { # merge identical blocks shorter than $MINWORDSBLOCK # and only containing ordinary words # with preceding different word # We cannot carry out this merging immediately as this # would change the index numbers of seq1 and seq2 and confuse # the algorithm, instead we store in @$todo where we have to merge push(@$todo, [ $last1,$last2,$cnt,@$block ]); } $block = []; $cnt=0; $last1=-1; $last2=-1; } }; my $discard=sub { $deltokcnt++; &$adddiscard; #($_[0],$_[1]); push(@$delblock,[ $seq1->[$_[0]],$_[0] ]); $last1=$_[0] }; my $add = sub { $addtokcnt++; &$adddiscard; #($_[0],$_[1]); push(@$addblock,[ $seq2->[$_[1]],$_[1] ]); $last2=$_[1] }; my $match = sub { $mattokcnt++; if ($cnt==0) { # first word of matching sequence after changed sequence or at beginning of word sequence $deltextblocks = extracttextblocks($delblock); $delblkcnt++ if scalar @$delblock; $addtextblocks = extracttextblocks($addblock); $addblkcnt++ if scalar @$addblock; $delcmds = extractcommands($delblock); $addcmds = extractcommands($addblock); # keygen(third argument of _longestCommonSubsequence) implies to sort on command (0th elements of $addcmd elements) # the calling format for longestCommonSubsequence has changed between versions of # Algorithm::Diff so we need to check which one we are using if ( $algodiffversion > 1.15 ) { ### Algorithm::Diff 1.19 $matchindex=Algorithm::Diff::_longestCommonSubsequence($delcmds,$addcmds, 0, sub { $_[0]->[0] } ); } else { ### Algorithm::Diff 1.15 $matchindex=Algorithm::Diff::_longestCommonSubsequence($delcmds,$addcmds, sub { $_[0]->[0] } ); } for ($i=0 ; $i<=$#$matchindex ; $i++) { if (defined($matchindex->[$i])){ $j=$matchindex->[$i]; @delmid=splitlatex($delcmds->[$i][3]); @addmid=splitlatex($addcmds->[$j][3]); while (scalar(@$deltextblocks) && $deltextblocks->[0][0]<$delcmds->[$i][1]) { my ($index,$block,$cnt)=@{ shift(@$deltextblocks) }; push(@$todo, [$index,-1,$cnt,@$block]); } push(@$todo, [ $delcmds->[$i][1],-1,-1,$delcmds->[$i][2],@delmid,$delcmds->[$i][4]]); while (scalar(@$addtextblocks) && $addtextblocks->[0][0]<$addcmds->[$j][1]) { my ($index,$block,$cnt)=@{ shift(@$addtextblocks) }; push(@$todo, [-1,$index,$cnt,@$block]); } push(@$todo, [ -1,$addcmds->[$j][1],-1,$addcmds->[$j][2],@addmid,$addcmds->[$j][4]]); } } # mop up remaining textblocks while (scalar(@$deltextblocks)) { my ($index,$block,$cnt)=@{ shift(@$deltextblocks) } ; push(@$todo, [$index,-1,$cnt,@$block]); } while (scalar(@$addtextblocks)) { my ($index,$block,$cnt)=@{ shift(@$addtextblocks) }; push(@$todo, [-1,$index,$cnt,@$block]); } $addblock=[]; $delblock=[]; } push(@$block,$seq2->[$_[1]]); $cnt++ }; my $keyfunc = sub { join(" ",split(" ",shift())) }; traverse_sequences($seq1,$seq2, { MATCH=>$match, DISCARD_A=>$discard, DISCARD_B=>$add }, $keyfunc ); # now carry out the merging/splitting. Refer to elements relative from # the end (with negative indices) as these offsets don't change before the instruction is executed # cnt>0: merged small unchanged groups with previous changed blocks # cnt==-1: split textual commands into components foreach $instruction ( @$todo) { ($last1,$last2,$cnt,@$block)=@$instruction ; if ($cnt>=0) { splice(@$seq1,$last1-$len1,1+$cnt,join("",$seq1->[$last1-$len1],@$block)) if $last1>=0; splice(@$seq2,$last2-$len2,1+$cnt,join("",$seq2->[$last2-$len2],@$block)) if $last2>=0; } else { splice(@$seq1,$last1-$len1,1,@$block) if $last1>=0; splice(@$seq2,$last2-$len2,1,@$block) if $last2>=0; } } if ($verbose) { print STDERR "\n"; print STDERR " $mattokcnt matching tokens in $matblkcnt blocks.\n"; print STDERR " $deltokcnt discarded tokens in $delblkcnt blocks.\n"; print STDERR " $addtokcnt appended tokens in $addblkcnt blocks.\n"; } } # extracttextblocks(\@blockindex) # $blockindex has the following format # [ [ token1, index1 ], [token2, index2],.. ] # where index refers to the index in the original old or new word sequence # Returns: reference to an array of the form # [[ $index, $textblock, $cnt ], .. # where $index index of block to be merged # $textblock contains all the words to be merged with the word at $index (but does not contain this word) # $cnt is length of block # # requires: iscmd # sub extracttextblocks { my $block=shift; my ($i,$token,$index); my $textblock=[]; my $last=-1; my $wpat=qr/^(?:[a-zA-Z.,'`:;?()!]*)[\s~]*$/; #' my $retval=[]; for ($i=0;$i< scalar @$block;$i++) { ($token,$index)=@{ $block->[$i] }; # store pure text blocks if ($token =~ /$wpat/ || ( $token =~/^\\([\w\d\*]+)((?:${extraspace}\[$brat0\]${extraspace}|${extraspace}\{$pat6\})*)/o && iscmd($1,\@SAFECMDLIST,\@SAFECMDEXCL) && !iscmd($1,\@TEXTCMDLIST,\@TEXTCMDEXCL))) { # we have text or a command which can be treated as text if ($last<0) { # new pure-text block $last=$index; } else { # add to pure-text block push(@$textblock, $token); } } else { # it is not text if (scalar(@$textblock)) { push(@$retval,[ $last, $textblock, scalar(@$textblock) ]); } $textblock=[]; $last=-1; } } # finish processing a possibly unfinished block before returning if (scalar(@$textblock)) { push(@$retval,[ $last, $textblock, scalar(@$textblock) ]); } return($retval) } # extractcommands( \@blockindex ) # $blockindex has the following format # [ [ token1, index1 ], [token2, index2],.. ] # where index refers to the index in the original old or new word sequence # Returns: reference to an array of the form # [ [ "\cmd1", index, "\cmd1[optarg]{arg1}{", "arg2" ,"} " ],.. # where index is just taken from input array # command must have a textual argument as last argument # # requires: iscmd # sub extractcommands { my $block=shift; my ($i,$token,$index,$cmd,$open,$mid,$closing); my $retval=[]; for ($i=0;$i< scalar @$block;$i++) { ($token,$index)=@{ $block->[$i] }; # check if token is an alphanumeric command sequence with at least one non-optional argument # \cmd[...]{...}{last argument} # Capturing in the following results in these associations # $1: \cmd[...]{...}{ # $2: \cmd # $3: last argument # $4: } + trailing spaces if ( ( $token =~ m/^(\\([\w\d\*]+)(?:${extraspace}\[$brat0\]|${extraspace}\{$pat6\})*${extraspace}\{)($pat6)(\}\s*)$/so ) && iscmd($2,\@TEXTCMDLIST,\@TEXTCMDEXCL) ) { # push(@$retval,[ $2,$index,$1,$3,$4 ]); ($cmd,$open,$mid,$closing) = ($2,$1,$3,$4) ; $closing =~ s/\}/\\RIGHTBRACE/ ; push(@$retval,[ $cmd,$index,$open,$mid,$closing ]); } } return $retval; } # iscmd($cmd,\@regexarray,\@regexexcl) checks # return 1 if $cmd matches any of the patterns in the # array $@regexarray, and none of the patterns in \@regexexcl, otherwise return 0 sub iscmd { my ($cmd,$regexar,$regexexcl)=@_; my ($ret)=0; foreach $pat ( @$regexar ) { if ( $cmd =~ m/^${pat}$/ ) { $ret=1 ; last; } } return 0 unless $ret; foreach $pat ( @$regexexcl ) { return 0 if ( $cmd =~ m/^${pat}$/ ); } return 1; } # pass2( \@seq1,\@seq2) # Look for differences between seq1 and seq2. # Mark begin and end of deleted and appended sequences with tags $DELOPEN and $DELCLOSE # and $ADDOPEN and $ADDCLOSE, respectively, however exclude { } & and all comands, unless # they match an element of the whitelist (SAFECMD) # For words in TEXTCMD but not in SAFECMD, enclose interior with $ADDOPEN and $ADDCLOSE brackets # Deleted comment lines are marked with %DIF < # Added comment lines are marked with %DIF > sub pass2 { my $seq1 = shift ; my $seq2 = shift ; my ($addtokcnt,$deltokcnt,$mattokcnt)=(0,0,0); my ($addblkcnt,$delblkcnt,$matblkcnt)=(0,0,0); my $retval = []; my $delhunk = []; my $addhunk = []; my $discard = sub { $deltokcnt++; push ( @$delhunk, $seq1->[$_[0]]) }; my $add = sub { $addtokcnt++; push ( @$addhunk, $seq2->[$_[1]]) }; my $match = sub { $mattokcnt++; if ( scalar @$delhunk ) { $delblkcnt++; # mark up changes, but comment out commands push @$retval,marktags($DELMARKOPEN,$DELMARKCLOSE,$DELOPEN,$DELCLOSE,$DELCMDOPEN,$DELCMDCLOSE,$DELCOMMENT,$delhunk); $delhunk = []; } if ( scalar @$addhunk ) { $addblkcnt++; # we mark up changes, but simply quote commands push @$retval,marktags($ADDMARKOPEN,$ADDMARKCLOSE,$ADDOPEN,$ADDCLOSE,"","",$ADDCOMMENT,$addhunk); $addhunk = []; } push(@$retval,$seq2->[$_[1]]) }; my $keyfunc = sub { join(" ",split(" ",shift())) }; traverse_sequences($seq1,$seq2, { MATCH=>$match, DISCARD_A=>$discard, DISCARD_B=>$add }, $keyfunc ); # clear up unprocessed hunks push @$retval,marktags($DELMARKOPEN,$DELMARKCLOSE,$DELOPEN,$DELCLOSE,$DELCMDOPEN,$DELCMDCLOSE,$DELCOMMENT,$delhunk) if scalar @$delhunk; push @$retval,marktags($ADDMARKOPEN,$ADDMARKCLOSE,$ADDOPEN,$ADDCLOSE,"","",$ADDCOMMENT,$addhunk) if scalar @$addhunk; if ($verbose) { print STDERR "\n"; print STDERR " $mattokcnt matching tokens. \n"; print STDERR " $deltokcnt discarded tokens in $delblkcnt blocks.\n"; print STDERR " $addtokcnt appended tokens in $addblkcnt blocks.\n"; } return(@$retval); } # marktags($openmark,$closemark,$open,$close,$opencmd,$closecmd,$comment,\@block) # returns ($openmark,$open,$block,$close,$closemark) if @block only contains no commands (except white-listed ones), # braces, ampersands, or comments # mark comments with $comment # exclude all other exceptions from scope of open, close like this # ($openmark, $open,...,$close, $opencmd,command, command,$closecmd, $open, ..., $close, $closemark) # If $opencmd begins with "%" marktags assumes it is operating on a deleted block, otherwise on an added block sub marktags { my ($openmark,$closemark,$open,$close,$opencmd,$closecmd,$comment,$block)=@_; my $word; my (@argtext); my $retval=[]; my $noncomment=0; my $cmd=-1; # -1 at beginning 0: last token written is a ordinary word # 1: last token written is a command # for keeping track whether we are just in a command sequence or in a word sequence my $cmdcomment= ($opencmd =~ m/^%/); # Flag to indicate whether opencmd is a comment (i.e. if we intend to simply comment out changed commands) my ($command,$commandword,$closingbracket) ; # temporary variables needed below to remember sub-pattern matches # split this block to flatten out sequences joined in pass1 @$block=splitlatex(join "",@$block); foreach (@$block) { $word=$_; if ( $word =~ s/^%/%$comment/ ) { # a comment if ($cmd==1) { push (@$retval,$closecmd) ; $cmd=-1; } push (@$retval,$word); next; } if (! $noncomment) { push (@$retval,$openmark); $noncomment=1; } # negative lookahead pattern (?!) in second clause is put in to avoid mathcing \( .. \) patterns # also note that second pattern will match \\ # Note: the second pattern should really be $word =~ /^\\(?!\()(\\|[\w*@]+)/, ie * replaced by + # and then all commands \" \' etc declared safe. But as I don't have a complete list of one letter # commands, and nobody has complained so far, I will eave this as is if ( $word =~ /^[&{}\[\]]/ || ( $word =~ /^\\(?!\()(\\|[\w*@]*)/ && !iscmd($1,\@SAFECMDLIST,\@SAFECMDEXCL)) ) { # word is a command or other significant token (not in SAFECMDLIST) ## same conditions as in subroutine extractcommand: # check if token is an alphanumeric command sequence with at least one non-optional argument # \cmd[...]{...}{last argument} # Capturing in the following results in these associations # $1: \cmd[...]{...}{ # $2: cmd # $3: last argument # $4: } + trailing spaces ### pre-0.3 if ( ( $token =~ m/^(\\([\w\d\*]+)(?:\[$brat0\]|\{$pat6\})*\{)($pat6)(\}\s*)$/so ) if ( ( $word =~ m/^(\\([\w\d\*]+)(?:${extraspace}\[$brat0\]|${extraspace}\{$pat6\})*${extraspace}\{)($pat6)(\}\s*)$/so ) && (iscmd($2,\@TEXTCMDLIST,\@TEXTCMDEXCL)|| iscmd($2,\@MATHTEXTCMDLIST,\@MATHTEXTCMDEXCL)) && ( !$cmdcomment || !iscmd($2,\@CONTEXT2CMDLIST, \@CONTEXT2CMDEXCL) ) ) { # Condition 1: word is a command? - if yes, $1,$2,.. will be set as above # Condition 2: word is a text command - we mark up the interior of the word. There is a separate check for MATHTEXTCMDLIST # because for $mathmarkup=WHOLE, the commands should not be split in pass1 (ie. math mode commands are not in # TEXTCMDLIST, but the interior of MATHTEXT commands should be highlighted in both deleted and added blocks # Condition 3: But if we are in a deleted block ($cmdcomment=1) and # $2 (the command) is in context2, just treat it as an ordinary command (i.e. comment it open with $opencmd) # Because we do not want to disable this command # here we do not use $opencmd and $closecmd($opencmd is empty) if ($cmd==1) { push (@$retval,$closecmd) ; } elsif ($cmd==0) { push (@$retval,$close) ; } $command=$1; $commandword=$2; $closingbracket=$4; @argtext=splitlatex($3); # split textual argument into tokens # and mark it up (but we do not need openmark and closemark) # insert command with initial arguments, marked-up final argument, and closing bracket if ( $cmdcomment && iscmd($commandword,\@CONTEXT1CMDLIST, \@CONTEXT1CMDEXCL) ) { # context1cmd in a deleted environment; delete command itself but keep last argument, marked up push (@$retval,$opencmd); $command =~ s/\n/\n${opencmd}/sg ; # repeat opencmd at the beginning of each line # argument, note that the additional comment character is included # to suppress linebreak after opening parentheses, which is important # for latexrevise push (@$retval,$command,"%\n{$AUXCMD\n",marktags("","",$open,$close,$opencmd,$closecmd,$comment,\@argtext),$closingbracket); } elsif ( iscmd($commandword,,\@MATHTEXTCMDLIST, \@MATHTEXTCMDEXCL) ) { # MATHBLOCK pseudo command: consider all commands safe, except & and \\ # Keep these commands even in deleted blocks, hence set $opencmd and $closecmd (5th and 6th argument of marktags) to # "" local @SAFECMDLIST=(".*"); local @SAFECMDEXCL=('\\','\\\\'); push(@$retval,$command,marktags("","",$open,$close,"","",$comment,\@argtext)#@argtext ,$closingbracket); } else { # normal textcmd or context1cmd in an added block push (@$retval,$command,marktags("","",$open,$close,$opencmd,$closecmd,$comment,\@argtext),$closingbracket); } push (@$retval,$AUXCMD,"\n") if $cmdcomment ; $cmd=-1 ; } else { # ordinary command push (@$retval,$opencmd) if $cmd==-1 ; push (@$retval,$close,$opencmd) if $cmd==0 ; $word =~ s/\n/\n${opencmd}/sg if $cmdcomment ; # if opencmd is a comment, repeat this at the beginning of every line push (@$retval,$word); $cmd=1; } } else { # just an ordinary word or word in SAFECMD push (@$retval,$open) if $cmd==-1 ; push (@$retval,$closecmd,$open) if $cmd==1 ; push (@$retval,$word); $cmd=0; } } push (@$retval,$close) if $cmd==0; push (@$retval,$closecmd) if $cmd==1; push (@$retval,$closemark) if ($noncomment); return @$retval; } # preprocess($string, ..) # carry out the following pre-processing steps for all arguments: # 1. Remove leading white-space # Change \{ to \LEFTBRACE and \} to \RIGHTBRACE # #. change begin and end commands within comments to BEGINDIF, ENDDIF # so they don't disturb the pattern matching (if there are several \begin or \end in one line # 2. mark all first empty line (in block of several) with \PAR tokens # 3. Convert all '\%' into '\PERCENTAGE ' to make parsing regular expressions easier # 4. Convert all \verb|some verbatim text| commands (where | can be an arbitrary character) # into \verb{hash} # 5. Convert \begin{verbatim} some verbatim text \end{verbatim} into \verbatim{hash} # 6. Convert _n into \SUBSCRIPTNB{n} and _{nnn} into \SUBSCRIPT{nn} # 7. Convert ^n into \SUPERSCRIPTNB{n} and ^{nnn} into \SUPERSCRIPT{nn} # 8. a. Convert $$ $$ into \begin{DOLLARDOLLAR} \end{DOLLARDOLLAR} # b. Convert \[ \] into \begin{SQUAREBRACKET} \end{SQUAREBRACKET} # 9. Convert all picture environmentent (\begin{PICTUREENV} .. \end{PICTUREENV} \PICTUREBLOCKenv # For --block-math-markup option -convert all \begin{MATH} .. \end{MATH} # into \MATHBLOCKmath{...} commands, where MATH/math is any valid math environment # 10. Add final token STOP to the very end. This is put in because the algorithm works better if the last token is identical. This is removed again in postprocessing. # # NB: step 6 and 7 is likely to convert some "_" inappropriately, e.g. in file # names or labels but it does not matter because they are converted back in the postprocessing step # Returns: leading white space removed in step 1 sub preprocess { my @leadin=() ; for (@_) { s/^(\s*)//s; push(@leadin,$1); # Change \{ to \QLEFTBRACE and \} to \QRIGHTBRACE s/(?{$hstr}) && $string ne $hash->{$hstr}) { warn "Repeated hash value for verbatim mode in spite of different content."; $hstr="-$hstr"; } $hash->{$hstr}=$string; return($hstr); } #string=fromhash(\%hash,$fromstring) # restores string value stored in hash #string=fromhash(\%hash,$fromstring,$prependstring) # additionally begins each line with prependstring sub fromhash { my ($hash,$hstr)=($_[0],$_[1]); my $retstr=$hash->{$hstr}; if ( $#_ >= 2) { $retstr =~ s/^/$_[2]/mg; } return $retstr; } # postprocess($string, ..) # carry out the following post-processing steps for all arguments: # * Remove STOP token from the end # * Replace \RIGHTBRACE by } # * change citation commands within comments to protect from processing (using marker CITEDIF) # 1. Check all deleted blocks: # a.where a deleted block contains a matching \begin and # \end environment (these will be disabled by a %DIFDELCMD statements), for selected environments enable # these commands again (such that for example displayed math in a deleted equation # is properly within math mode. For math mode environments replace numbered equation # environments with their display only variety (so that equation numbers in new file and # diff file are identical). Where the correct type of math environment cannot be determined # use a place holder MATHMODE # b.where one of the commands matching $COUNTERCMD is used as a DIFAUXCMD, add a statement # subtracting one from the respective counter to keep numbering consistent with new file # Replace all MATHMODE environment commands by the correct environment to achieve matching # pairs # c. Convert MATHBLOCKmath commands to their uncounted numbers (e.g. convert equation -> displaymath # (environments defined in $MATHENV will be replaced by $MATHREPL, and environments in $MATHARRENV # will be replaced by $MATHARRREPL # d. If in-line math mode contains array environment, enclose the whole environment in \mbox'es # d. place \cite commands in mbox'es (for UNDERLINE style) # # For added blocks: # c. If in-line math mode contains array environment, enclose the whole environment in \mbox'es # d. place \cite commands in mbox'es (for UNDERLINE style) # # 2. If --block-math-markup option set: Convert \MATHBLOCKmath{..} commands back to environments # # Convert all PICTUREblock{..} commands back to the appropriate environments # 3. Convert DIFadd, DIFdel, DIFFaddbegin , ... into FL varieties # within floats (currently recognised float environments: plate,table,figure # plus starred varieties). # 4. Remove empty %DIFDELCMD < lines # 4. Convert \begin{SQUAREBRACKET} \end{SQUAREBRACKET} into \[ \] # Convert \begin{DOLLARDOLLAR} \end{DOLLARDOLLAR} into $$ $$ # 5. Convert \SUPERSCRIPTNB{n} into ^n and \SUPERSCRIPT{nn} into ^{nnn} # 6. Convert \SUBSCRIPTNB{n} into _n and \SUBCRIPT{nn} into _{nnn} # 7. Expand hashes of verb and verbatim environments # 8. Convert '\PERCENTAGE ' back into '\%' # 9.. remove all \PAR tokens # 10. package specific processing: endfloat: make sure \begin{figure} and \end{figure} are always # on a line by themselves, similarly for table environment # 4, undo renaming of the \begin and \end in comments # Change \QLEFTBRACE, \QRIGHTBRACE to \{,\} # # Note have to manually synchronize substitution commands below and # DIF.. command names in the header sub postprocess { my ($begin,$len,$cnt,$float,$delblock,$addblock); # second level blocks my ($begin2,$cnt2,$len2,$eqarrayblock,$mathblock); for (@_) { # change $'s in comments to something harmless 1 while s/(%.*)\$/$1DOLLARDIF/mg ; # Remove final STOP token s/ STOP$//; # Replace \RIGHTBRACE by } s/\\RIGHTBRACE/}/g; # change citation commands within comments to protect from processing if ($CITECMD){ 1 while s/(%.*)\\($CITECMD)/$1\\CITEDIF$2/m ; } # Check all deleted blocks: where a deleted block contains a matching \begin and # \end environment (these will be disabled by a %DIFDELCMD statements), enable # these commands again (such that for example displayed math in a deleted equation # is properly within math mode. For math mode environments replace numbered equation # environments with their display only variety (so that equation numbers in new file and # diff file are identical while ( m/\\DIFdelbegin.*?\\DIFdelend/sg ) { $cnt=0; $len=length($&); $begin=pos($_) - $len; $delblock=$&; ### (.*?[^\n]?)\n? construct is necessary to avoid empty lines in math mode, which result in ### an error # displayed math environments if ($mathmarkup == FINE ) { $delblock=~ s/(\%DIFDELCMD < \s*\\begin\{((?:$MATHENV)|SQUAREBRACKET)\}.*?(?:$DELCMDCLOSE|\n))(.*?[^\n]?)\n?(\%DIFDELCMD < \s*\\end\{\2\})/\\begin{$MATHREPL}$AUXCMD\n$1$3\n\\end{$MATHREPL}$AUXCMD\n$4/sg; # also transform the opposite pair \end{displaymath} .. \begin{displaymath} but we have to be careful not to interfere with the results of the transformation in the line directly above ### pre-0.42 obsolete version which did not work on eqnarray test $delblock=~ s/(? displaymath # (environments defined in $MATHENV will be replaced by $MATHREPL, and environments in $MATHARRENV # will be replaced by $MATHARRREPL $delblock=~ s/\\MATHBLOCK($MATHENV)\{($pat6)\}/\\MATHBLOCK$MATHREPL\{$2\}/sg; $delblock=~ s/\\MATHBLOCK($MATHARRENV)\{($pat6)\}/\\MATHBLOCK$MATHARRREPL\{$2\}/sg; } # b.where one of the commands matching $COUNTERCMD is used as a DIFAUXCMD, add a statement # subtracting one from the respective counter to keep numbering consistent with new file $delblock=~ s/\\($COUNTERCMD)((?:${extraspace}\[$brat0\]${extraspace}|${extraspace}\{$pat6\})*\s*${AUXCMD}\n)/\\$1$2\\addtocounter{$1}{-1}${AUXCMD}\n/sg ; # c. If in-line math mode contains array environment, enclose the whole environment in \mbox'es while ( $delblock =~ m/($math)(\s*)/sg ) { $cnt2=0; $len2=length($&); $begin2=pos($delblock) - $len2; $mathblock="%\n\\mbox{$AUXCMD\n$1\n}$AUXCMD\n"; next unless $mathblock =~ m/\{$ARRENV\}/ ; substr($delblock,$begin2,$len2)=$mathblock; pos($delblock) = $begin2 + length($mathblock); } if ($CITE2CMD) { $delblock=~s/($DELCMDOPEN\s*\\($CITE2CMD)(.*)$DELCMDCLOSE)/ # Replacement code {my ($aux,$all); $aux=$all=$1; $aux=~s#\n?($DELCMDOPEN|$DELCMDCLOSE)##g; $all."$aux$AUXCMD\n";}/sge; } # or protect \cite commands with \mbox if ($CITECMD) { $delblock=~s/(\\($CITECMD)${extraspace}(?:\[$brat0\]${extraspace}){0,2}\{$pat6\})(\s*)/\\mbox{$AUXCMD\n$1\n}$AUXCMD\n/msg ; } # splice in modified delblock substr($_,$begin,$len)=$delblock; pos = $begin + length($delblock); } # make the array modification in added blocks while ( m/\\DIFaddbegin.*?\\DIFaddend/sg ) { $cnt=0; $len=length($&); $begin=pos($_) - $len; $addblock=$&; while ( $addblock =~ m/($math)(\s*)/sg ) { $cnt2=0; $len2=length($&); $begin2=pos($addblock) - $len2; $mathblock="%\n\\mbox{$AUXCMD\n$1\n}$AUXCMD\n"; next unless $mathblock =~ m/\{$ARRENV\}/ ; substr($addblock,$begin2,$len2)=$mathblock; pos($addblock) = $begin2 + length($mathblock); } if ($CITECMD) { my $addblockbefore=$addblock; $addblock=~ s/(\\($CITECMD)${extraspace}(?:\[$brat0\]${extraspace}){0,2}\{$pat2\})(\s*)/\\mbox{$AUXCMD\n$1\n}$AUXCMD\n/msg ; } # splice in modified addblock substr($_,$begin,$len)=$addblock; pos = $begin + length($addblock); } ### old place for BEGINDIF, ENDDIF replacement # change begin and end commands within comments such that they # don't disturb the pattern matching (if there are several \begin or \end in one line # this substitution is insufficient but that appears unlikely) # This needs to be repeated here to also get rid of DIFdelcmd-protected environments s/(%.*)\\begin\{(.*)$/$1\\BEGINDIF\{$2/mg ; s/(%.*)\\end\{(.*)$/$1\\ENDDIF\{$2/mg ; # Replace MATHMODE environments from step 1a above by the correct Math environment # The next line is complicated. The negative look-ahead insertion makes sure that no \end{$MATHENV} (or other mathematical # environments) are between the \begin{$MATHENV} and \end{MATHMODE} commands. This is necessary as the minimal matching # is not globally minimal but only 'locally' (matching is beginning from the left side of the string) if ( $mathmarkup == FINE ) { 1 while s/\\begin{((?:$MATHENV)|(?:$MATHARRENV)|SQUAREBRACKET)}((?:.(?!(?:\\end{(?:(?:$MATHENV)|(?:$MATHARRENV)|SQUAREBRACKET)}|\\begin{MATHMODE})))*?)\\end{MATHMODE}/\\begin{$1}$2\\end{$1}/s; 1 while s/\\begin{MATHMODE}((?:.(?!\\end{MATHMODE}))*?)\\end{((?:$MATHENV)|(?:$MATHARRENV)|SQUAREBRACKET)}/\\begin{$2}$1\\end{$2}/s; # convert remaining \begin{MATHMODE} \end{MATHMODE} (and not containing & or \\ )into MATHREPL environments s/\\begin{MATHMODE}((?:(.(?!(?[1])) { $optargnew=$newhash{$cmd}->[1]; } else { $optargnew=""; } if ( defined($oldhash{$cmd}->[1])) { $optargold=$oldhash{$cmd}->[1]; } else { $optargold=""; } if ( defined($oldhash{$cmd}) ) { $argold=$oldhash{$cmd}->[2]; } else { $argold=""; } $argnew=$newhash{$cmd}->[2]; $argdiff="{" . join("",bodydiff($argold,$argnew)) ."}"; if ( length $optargnew ) { $optargdiff="[".join("",bodydiff($optargold,$optargnew))."]" ; $optargdiff =~ s/\\DIFaddbegin /\\DIFaddbeginFL /g; $optargdiff =~ s/\\DIFaddend /\\DIFaddendFL /g; $optargdiff =~ s/\\DIFadd\{/\\DIFaddFL{/g; $optargdiff =~ s/\\DIFdelbegin /\\DIFdelbeginFL /g; $optargdiff =~ s/\\DIFdelend /\\DIFdelendFL /g; $optargdiff =~ s/\\DIFdel\{/\\DIFdelFL{/g; } else { $optargdiff=""; } ### print STDERR "DEBUG s/\\Q$newhash{$cmd}->[0]\\E/\\$cmd$optargdiff$argdiff/s\n"; # Note: \Q and \E force literal interpretation of what it between them but allow # variable interpolation, such that e.g. \title matches just that and not TAB-itle $$newpreambleref=~s/\Q$newhash{$cmd}->[0]\E/\\$cmd$optargdiff$argdiff/s; # replace this in old preamble if necessary if ( defined($oldhash{$cmd}->[0])) { $$oldpreambleref=~s/\Q$oldhash{$cmd}->[0]\E/\\$cmd$optargdiff$argdiff/s ; } ### print STDERR "DEBUG NEW PRE ".$$newpreambleref."\n"; } foreach $cmd ( keys %oldhash ) { # if this has already been dealt with above can just skip next if defined($newhash{$cmd}) ; if ( defined($oldhash{$cmd}->[1])) { $optargold=$oldhash{$cmd}->[1]; $optargdiff="[".join("",bodydiff($optargold,""))."]" ; $optargdiff =~ s/\\DIFdelbegin /\\DIFdelbeginFL /g; $optargdiff =~ s/\\DIFdelend /\\DIFdelendFL /g; $optargdiff =~ s/\\DIFdel\{/\\DIFdelFL{/g; } else { $optargdiff=""; } $argdiff="{" . join("",bodydiff($argold,"")) ."}"; $auxline = "\\$cmd$optargdiff$argdiff"; $auxline =~s/$/$AUXCMD/sg; push @auxlines,$auxline; } # add auxcmd comment to highlight added lines return(@auxlines); } # @diffs=linediff(\@seq1, \@seq2) # mark up lines like this #%DIF mm-mmdnn #%< old deleted line(s) #%DIF ------- #%DIF mmann-nn #new appended line %< #%DIF ------- # Future extension: mark change explicitly # Assumes: traverse_sequence traverses deletions before insertions in changed sequences # all line numbers relative to line 0 (first line of real file) sub linediff { my $seq1 = shift ; my $seq2 = shift ; my $block = []; my $retseq = []; my @begin=('','',''); # dummy initialisation my $instring ; my $discard = sub { @begin=('d',$_[0],$_[1]) unless scalar @$block ; push(@$block, "%DIF < " . $seq1->[$_[0]]) }; my $add = sub { if (! scalar @$block) { @begin=('a',$_[0],$_[1]) ;} elsif ( $begin[0] eq 'd' ) { $begin[0]='c'; $begin[2]=$_[1]; push(@$block, "%DIF -------") } push(@$block, $seq2->[$_[1]] . " %DIF > " ) }; my $match = sub { if ( scalar @$block ) { if ( $begin[0] eq 'd' && $begin[1]!=$_[0]-1) { $instring = sprintf "%%DIF %d-%dd%d",$begin[1],$_[0]-1,$begin[2]; } elsif ( $begin[0] eq 'a' && $begin[2]!=$_[1]-1) { $instring = sprintf "%%DIF %da%d-%d",$begin[1],$begin[2],$_[1]-1; } elsif ( $begin[0] eq 'c' ) { $instring = sprintf "%%DIF %sc%s", ($begin[1]==$_[0]-1) ? "$begin[1]" : $begin[1]."-".($_[0]-1) , ($begin[2]==$_[1]-1) ? "$begin[2]" : $begin[2]."-".($_[1]-1) ; } else { $instring = sprintf "%%DIF %d%s%d",$begin[1],$begin[0],$begin[2]; } push @$retseq, $instring,@$block, "%DIF -------" ; $block = []; } push @$retseq, $seq2->[$_[1]] }; # key function: remove multiple spaces (such that insertion or deletion of redundant white space is not reported) my $keyfunc = sub { join(" ",split(" ",shift())) }; traverse_sequences($seq1,$seq2, { MATCH=>$match, DISCARD_A=>$discard, DISCARD_B=>$add }, $keyfunc ); push @$retseq, @$block if scalar @$block; return wantarray ? @$retseq : $retseq ; } # init_regex_arr_data(\@array,"TOKEN INIT") # scans DATA file handel for line "%% TOKEN INIT" line # then appends each line not beginning with % into array (as a quoted regex) sub init_regex_arr_data { my ($arr,$token)=@_; my ($copy); while () { if ( m/^%%BEGIN $token\s*$/ ) { $copy=1; } elsif ( m/^%%END $token\s*/ ) { last; } chomp; push (@$arr,qr/^$_$/) if ( $copy && !/^%/ ) ; } seek DATA,0,0; # rewind DATA handle to file begin } # init_regex_arr_ext(\@array,$arg) # fills array with regular expressions. # if arg is a file name, then read in list of regular expressions from that file # (one expression per line) # Otherwise treat arg as a comma separated list of regular expressions sub init_regex_arr_ext { my ($arr,$arg)=@_; my $regex; if ( -f $ arg ) { open(FILE,"$arg") or die ("Couldn't open $arg: $!"); while () { chomp; next if /^\s*#/ || /^\s*%/ || /^\s*$/ ; push (@$arr,qr/^$_$/); } close(FILE); } else { # assume it is a comma-separated list of reg-ex foreach $regex (split(qr/(?=1) { $reset=shift; } if ($reset) { $lasttime=times(); } else { $retval=times()-$lasttime; $lasttime=$lasttime+$retval; return($retval); } } sub usage { die <<"EOF"; Usage: $0 [options] old.tex new.tex > diff.tex Compares two latex files and writes tex code to stdout, which has the same format as new.tex but has all changes relative to old.tex marked up or commented. --type=markupstyle -t markupstyle Add code to preamble for selected markup style Available styles: UNDERLINE CTRADITIONAL TRADITIONAL CFONT FONTSTRIKE INVISIBLE CHANGEBAR CCHANGEBAR CULINECHBAR CFONTCBHBAR [ Default: UNDERLINE ] --subtype=markstyle -s markstyle Add code to preamble for selected style for bracketing commands (e.g. to mark changes in margin) Available styles: SAFE MARGINAL DVIPSCOL COLOR [ Default: SAFE ] --floattype=markstyle -f markstyle Add code to preamble for selected style which replace standard marking and markup commands within floats (e.g., marginal remarks cause an error within floats so marginal marking can be disabled thus) Available styles: FLOATSAFE IDENTICAL [ Default: FLOATSAFE ] --encoding=enc -e enc Specify encoding of old.tex and new.tex. Typical encodings are ascii, utf8, latin1, latin9. A list of available encodings can be obtained by executing perl -MEncode -e 'print join ("\\n",Encode->encodings( ":all" )) ;' [Default encoding is utf8 unless the first few lines of the preamble contain an invocation "\\usepackage[..]{inputenc} in which case the encoding chosen by this command is asssumed. Note that ASCII (standard latex) is a subset of utf8] --preamble=file -p file Insert file at end of preamble instead of auto-generating preamble. The preamble must define the following commands \\DIFaddbegin,\\DIFaddend,\\DIFadd{..}, \\DIFdelbegin,\\DIFdelend,\\DIFdel{..}, and varieties for use within floats \\DIFaddbeginFL,\\DIFaddendFL,\\DIFaddFL{..}, \\DIFdelbeginFL,\\DIFdelendFL,\\DIFdelFL{..} (If this option is set -t, -s, and -f options are ignored.) --exclude-safecmd=exclude-file --exclude-safecmd="cmd1,cmd2,..." -A exclude-file --replace-safecmd=replace-file --append-safecmd=append-file --append-safecmd="cmd1,cmd2,..." -a append-file Exclude from, replace or append to the list of regex matching commands which are safe to use within the scope of a \\DIFadd or \\DIFdel command. The file must contain one Perl-RegEx per line (Comment lines beginning with # or % are ignored). A literal comma within the comma-separated list must be escaped thus "\\,", Note that the RegEx needs to match the whole of the token, i.e., /^regex\$/ is implied and that the initial "\\" of the command is not included. The --exclude-safecmd and --append-safecmd options can be combined with the --replace-safecmd option and can be used repeatedly to add cumulatively to the lists. --exclude-textcmd=exclude-file --exclude-textcmd="cmd1,cmd2,..." -X exclude-file --replace-textcmd=replace-file --append-textcmd=append-file --append-textcmd="cmd1,cmd2,..." -x append-file Exclude from, replace or append to the list of regex matching commands whose last argument is text. See entry for --exclude-safecmd directly above for further details. --replace-context1cmd=replace-file --append-context1cmd=append-file --append-context1cmd="cmd1,cmd2,..." Replace or append to the list of regex matching commands whose last argument is text but which require a particular context to work, e.g. \\caption will only work within a figure or table. These commands behave like text commands, except when they occur in a deleted section, when they are disabled, but their argument is shown as deleted text. --replace-context2cmd=replace-file --append-context2cmd=append-file --append-context2cmd="cmd1,cmd2,..." As corresponding commands for context1. The only difference is that context2 commands are completely disabled in deleted sections, including their arguments. --config var1=val1,var2=val2,... -c var1=val1,.. Set configuration variables. -c configfile Available variables: MINWORDSBLOCK (integer) FLOATENV (RegEx) PICTUREENV (RegEx) MATHENV (RegEx) MATHREPL (String) MATHARRENV (RegEx) MATHARRREPL (String) ARRENV (RegEx) COUNTERCMD (RegEx) This option can be repeated. --packages=pkg1,pkg2,.. Tell latexdiff that .tex file is processed with the packages in list loaded. This is normally not necessary if the .tex file includes the preamble, as the preamble is automatically scanned for \\usepackage commands. Use of the --packages option disables automatic scanning, so if for any reason package specific parsing needs to be switched off, use --packages=none. The following packages trigger special behaviour: endfloat hyperref amsmath [ Default: scan the preamble for \\usepackage commands to determine loaded packages.] --show-preamble Print generated or included preamble commands to stdout. --show-safecmd Print list of regex matching and excluding safe commands. --show-textcmd Print list of regex matching and excluding commands with text argument. --show-config Show values of configuration variables --show-all Show all of the above NB For all --show commands, no old.tex or new.tex file needs to be given, and no differencing takes place. Other configuration options: --allow-spaces Allow spaces between bracketed or braced arguments to commands [Default requires arguments to directly follow each other without intervening spaces] --math-markup=level Determine granularity of markup in displayed math environments: Possible values for level are (both numerical and text labels are acceptable): off or 0: suppress markup for math environments. Deleted equations will not appear in diff file. This mode can be used if all the other modes cause invalid latex code. whole or 1: Differencing on the level of whole equations. Even trivial changes to equations cause the whole equation to be marked changed. This mode can be used if processing in coarse or fine mode results in invalid latex code. coarse or 2: Detect changes within equations marked up with a coarse granularity; changes in equation type (e.g.displaymath to equation) appear as a change to the complete equation. This mode is recommended for situations where the content and order of some equations are still being changed. [Default] fine or 3: Detect small change in equations and mark up and fine granularity. This mode is most suitable, if only minor changes to equations are expected, e.g. correction of typos. --disable-citation-markup Suppress citation markup in styles using ulem (UNDERLINE, FONTSTRIKE, CULINECHBAR) --enable-citation-markup Protect citation commands in changed sections with \\mbox command [i.e. use default behaviour for ulem package for other packages] Miscelleneous options --label=label -L label Sets the labels used to describe the old and new files. The first use of this option sets the label describing the old file and the second use of the option sets the label for the new file. [Default: use the filename and modification dates for the label] --no-label Suppress inclusion of old and new file names as comment in output file --visble-label Include old and new filenames (or labels set with --label option) as visible output --flatten Replace \\input and \\include commands within body by the content of the files in their argument. If \\includeonly is present in the preamble, only those files are expanded into the document. However, no recursion is done, i.e. \\input and \\include commands within included sections are not expanded. The included files are assumed to be located in the same directories as the old and new master files, respectively, making it possible to organise files into old and new directories. --flatten is applied recursively, so inputted files can contain further \\input statements. --help -h Show this help text. --ignore-warnings Suppress warnings about inconsistencies in length between input and parsed strings and missing characters. --verbose -V Output various status information to stderr during processing. Default is to work silently. --version Show version number. For further information, consult http://latexdiff.berlios.de EOF } =head1 NAME latexdiff - determine and markup differences between two latex files =head1 SYNOPSIS B [ B ] F F > F =head1 DESCRIPTION Briefly, I is a utility program to aid in the management of revisions of latex documents. It compares two valid latex files, here called C and C, finds significant differences between them (i.e., ignoring the number of white spaces and position of line breaks), and adds special commands to highlight the differences. Where visual highlighting is not possible, e.g. for changes in the formatting, the differences are nevertheless marked up in the source. The program treats the preamble differently from the main document. Differences between the preambles are found using line-based differencing (similarly to the Unix diff command, but ignoring white spaces). A comment, "S>>" is appended to each added line, i.e. a line present in C but not in C. Discarded lines are deactivated by prepending "S>>". Changed blocks are preceded by comment lines giving information about line numbers in the original files. Where there are insignificant differences, the resulting file C will be similar to C. At the end of the preamble, the definitions for I markup commands are inserted. In differencing the main body of the text, I attempts to satisfy the following guidelines (in order of priority): =over 3 =item 1 If both C and C are valid LaTeX, then the resulting C should also be valid LateX. (NB If a few plain TeX commands are used within C or C then C is not guaranteed to work but usually will). =item 2 Significant differences are determined on the level of individual words. All significant differences, including differences between comments should be clearly marked in the resulting source code C. =item 3 If a changed passage contains text or text-producing commands, then running C through LateX should produce output where added and discarded passages are highlighted. =item 4 Where there are insignificant differences, e.g. in the positioning of line breaks, C should follow the formatting of C =back For differencing the same algorithm as I is used but words instead of lines are compared. An attempt is made to recognize blocks which are completely changed such that they can be marked up as a unit. Comments are differenced line by line but the number of spaces within comments is ignored. Commands including all their arguments are generally compared as one unit, i.e., no mark-up is inserted into the arguments of commands. However, for a selected number of commands (for example, C<\caption> and all sectioning commands) the last argument is known to be text. This text is split into words and differenced just as ordinary text (use options to show and change the list of text commands, see below). As the algorithm has no detailed knowledge of LaTeX, it assumes all pairs of curly braces immediately following a command (i.e. a sequence of letters beginning with a backslash) are arguments for that command. As a restriction to condition 1 above it is thus necessary to surround all arguments with curly braces, and to not insert extraneous spaces. For example, write \section{\textem{This is an emphasized section title}} and not \section {\textem{This is an emphasized section title}} or \section\textem{This is an emphasized section title} even though all varieties are the same to LaTeX (but see B<--allow-spaces> option which allows the second variety). For environments whose content does not conform to standard LaTeX or where graphical markup does not make sense all markup commands can be removed by setting the PICTUREENV configuration variable, set by default to C and C environments; see B<--config> option). The latter environment (C) can be used to protect parts of the latex file where the markup results in illegal markup. You have to surround the offending passage in both the old and new file by C<\begin{DIFnomarkup}> and C<\end{DIFnomarkup}>. You must define the environment in the preambles of both old and new documents. I prefer to define it as a null-environment, C<\newenvironment{DIFnomarkup}{}{}> but the choice is yours. Any markup within the environment will be removed, and generally everything within the environment will just be taken from the new file. It is also possible to difference files which do not have a preamble. In this case, the file is processed in the main document mode, but the definitions of the markup commands are not inserted. All markup commands inserted by I begin with "C<\DIF>". Added blocks containing words, commands or comments which are in C but not in C are marked by C<\DIFaddbegin> and C<\DIFaddend>. Discarded blocks are marked by C<\DIFdelbegin> and C<\DIFdelend>. Within added blocks all text is highlighted with C<\DIFadd> like this: C<\DIFadd{Added text block}> Selected `safe' commands can be contained in these text blocks as well (use options to show and change the list of safe commands, see below). All other commands as well as braces "{" and "}" are never put within the scope of C<\DIFadd>. Added comments are marked by prepending "S >>". Within deleted blocks text is highlighted with C<\DIFdel>. Deleted comments are marked by prepending "S >>". Non-safe command and curly braces within deleted blocks are commented out with "S >>". =head1 OPTIONS =head2 Preamble The following options determine the visual markup style by adding the appropriate command definitions to the preamble. See the end of this section for a description of available styles. =over 4 =item B<--type=markupstyle> or B<-t markupstyle> Add code to preamble for selected markup style. This option defines C<\DIFadd> and C<\DIFdel> commands. Available styles: C [ Default: C ] =item B<--subtype=markstyle> or B<-s markstyle> Add code to preamble for selected style for bracketing commands (e.g. to mark changes in margin). This option defines C<\DIFaddbegin>, C<\DIFaddend>, C<\DIFdelbegin> and C<\DIFdelend> commands. Available styles: C [ Default: C ] =item B<--floattype=markstyle> or B<-f markstyle> Add code to preamble for selected style which replace standard marking and markup commands within floats (e.g., marginal remarks cause an error within floats so marginal marking can be disabled thus). This option defines all C<\DIF...FL> commands. Available styles: C [ Default: C ] =item B<--encoding=enc> or B<-e enc> Specify encoding of old.tex and new.tex. Typical encodings are C, C, C, C. A list of available encodings can be obtained by executing Cencodings( ":all" )) ;' > [Default encoding is utf8 unless the first few lines of the preamble contain an invocation C<\usepackage[..]{inputenc}> in which case the encoding chosen by this command is asssumed. Note that ASCII (standard latex) is a subset of utf8] =item B<--preamble=file> or B<-p file> Insert file at end of preamble instead of generating preamble. The preamble must define the following commands C<\DIFaddbegin, \DIFaddend, \DIFadd{..}, \DIFdelbegin,\DIFdelend,\DIFdel{..},> and varieties for use within floats C<\DIFaddbeginFL, \DIFaddendFL, \DIFaddFL{..}, \DIFdelbeginFL, \DIFdelendFL, \DIFdelFL{..}> (If this option is set B<-t>, B<-s>, and B<-f> options are ignored.) =item B<--packages=pkg1,pkg2,..> Tell latexdiff that .tex file is processed with the packages in list loaded. This is normally not necessary if the .tex file includes the preamble, as the preamble is automatically scanned for C<\usepackage> commands. Use of the B<--packages> option disables automatic scanning, so if for any reason package specific parsing needs to be switched off, use B<--packages=none>. The following packages trigger special behaviour: =over 8 =item C Configuration variable amsmath is set to C (Default: C) =item C Ensure that C<\begin{figure}> and C<\end{figure}> always appear by themselves on a line. =item C Change name of C<\DIFadd> and C<\DIFdel> commands to C<\DIFaddtex> and C<\DIFdeltex> and define new C<\DIFadd> and C<\DIFdel> commands, which provide a wrapper for these commands, using them for the text but not for the link defining command (where any markup would cause errors). =back [ Default: scan the preamble for C<\\usepackage> commands to determine loaded packages.] =item B<--show-preamble> Print generated or included preamble commands to stdout. =back =head2 Configuration =over 4 =item B<--exclude-safecmd=exclude-file> or B<-A exclude-file> or B<--exclude-safecmd="cmd1,cmd2,..."> =item B<--replace-safecmd=replace-file> =item B<--append-safecmd=append-file> or B<-a append-file> or B<--append-safecmd="cmd1,cmd2,..."> Exclude from, replace or append to the list of regular expressions (RegEx) matching commands which are safe to use within the scope of a C<\DIFadd> or C<\DIFdel> command. The file must contain one Perl-RegEx per line (Comment lines beginning with # or % are ignored). Note that the RegEx needs to match the whole of the token, i.e., /^regex$/ is implied and that the initial "\" of the command is not included. The B<--exclude-safecmd> and B<--append-safecmd> options can be combined with the -B<--replace-safecmd> option and can be used repeatedly to add cumulatively to the lists. B<--exclude-safecmd> and B<--append-safecmd> can also take a comma separated list as input. If a comma for one of the regex is required, escape it thus "\,". In most cases it will be necessary to protect the comma-separated list from the shell by putting it in quotation marks. =item B<--exclude-textcmd=exclude-file> or B<-X exclude-file> or B<--exclude-textcmd="cmd1,cmd2,..."> =item B<--replace-textcmd=replace-file> =item B<--append-textcmd=append-file> or B<-x append-file> or B<--append-textcmd="cmd1,cmd2,..."> Exclude from, replace or append to the list of regular expressions matching commands whose last argument is text. See entry for B<--exclude-safecmd> directly above for further details. =item B<--replace-context1cmd=replace-file> =item B<--append-context1cmd=append-file> or =item B<--append-context1cmd="cmd1,cmd2,..."> Replace or append to the list of regex matching commands whose last argument is text but which require a particular context to work, e.g. \caption will only work within a figure or table. These commands behave like text commands, except when they occur in a deleted section, when they are disabled, but their argument is shown as deleted text. =item B<--replace-context2cmd=replace-file> =item B<--append-context2cmd=append-file> or =item B<--append-context2cmd="cmd1,cmd2,..."> As corresponding commands for context1. The only difference is that context2 commands are completely disabled in deleted sections, including their arguments. =item B<--config var1=val1,var2=val2,...> or B<-c var1=val1,..> =item B<-c configfile> 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 (integer) C (RegEx) C (RegEx) C (RegEx) C (String) C (RegEx) C (String) C (RegEx) C (RegEx) =item B<--show-safecmd> Print list of RegEx matching and excluding safe commands. =item B<--show-textcmd> Print list of RegEx matching and excluding commands with text argument. =item B<--show-config> Show values of configuration variables. =item B<--show-all> Combine all --show commands. NB For all --show commands, no C or C file needs to be specified, and no differencing takes place. =back =head2 Other configuration options: =over 4 =item B<--allow-spaces> Allow spaces between bracketed or braced arguments to commands. Note that this option might have undesirable side effects (unrelated scope might get lumpeded with preceding commands) so should only be used if the default produces erroneous results. (Default requires arguments to directly follow each other without intervening spaces). =item B<--math-markup=level> Determine granularity of markup in displayed math environments: Possible values for level are (both numerical and text labels are acceptable): C or C<0>: suppress markup for math environments. Deleted equations will not appear in diff file. This mode can be used if all the other modes cause invalid latex code. C or C<1>: Differencing on the level of whole equations. Even trivial changes to equations cause the whole equation to be marked changed. This mode can be used if processing in coarse or fine mode results in invalid latex code. C or C<2>: Detect changes within equations marked up with a coarse granularity; changes in equation type (e.g.displaymath to equation) appear as a change to the complete equation. This mode is recommended for situations where the content and order of some equations are still being changed. [Default] C or C<3>: Detect small change in equations and mark up at fine granularity. This mode is most suitable, if only minor changes to equations are expected, e.g. correction of typos. =item B<--disable-citation-markup> Suppress citation markup in styles using ulem (UNDERLINE, FONTSTRIKE, CULINECHBAR) =item B<--enable-citation-markup> Protect citation commands in changed sections with \\mbox command [i.e. use default behaviour for ulem package for other packages] =back =head2 Miscellaneous =over 4 =item B<--verbose> or B<-V> Output various status information to stderr during processing. Default is to work silently. =item B<--driver=type> Choose driver for changebar package (only relevant for styles using changebar: CCHANGEBAR CFONTCHBAR CULINECHBAR CHANGEBAR). Possible drivers are listed in changebar manual, e.g. pdftex,dvips,dvitops [Default: dvips] =item B<--ignore-warnings> Suppress warnings about inconsistencies in length between input and parsed strings and missing characters. These warning messages are often related to non-standard latex or latex constructions with a syntax unknown to C but the resulting difference argument is often fully functional anyway, particularly if the non-standard latex only occurs in parts of the text which have not changed. =item B<--label=label> or B<-L label> Sets the labels used to describe the old and new files. The first use of this option sets the label describing the old file and the second use of the option sets the label for the new file, i.e. set both labels like this C<-L labelold -L labelnew>. [Default: use the filename and modification dates for the label] =item B<--no-label> Suppress inclusion of old and new file names as comment in output file =item B<--visble-label> Include old and new filenames (or labels set with --label option) as visible output. =item B<--flatten> Replace C<\input> and C<\include> commands within body by the content of the files in their argument. If C<\includeonly> is present in the preamble, only those files are expanded into the document. However, no recursion is done, i.e. C<\input> and C<\include> commands within included sections are not expanded. The included files are assumed to be located in the same directories as the old and new master files, respectively, making it possible to organise files into old and new directories. --flatten is applied recursively, so inputted files can contain further C<\input> statements. Use of this option might result in prohibitive processing times for larger documents, and the resulting difference document no longer reflects the structure of the input documents. =item B<--help> or B<-h> Show help text =item B<--version> Show version number =back =head2 Predefined styles =head2 Major types The major type determine the markup of plain text and some selected latex commands outside floats by defining the markup commands C<\DIFadd{...}> and C<\DIFdel{...}> . =over 10 =item C Added text is wavy-underlined and blue, discarded text is struck out and red (Requires color and ulem packages). Overstriking does not work in displayed math equations such that deleted parts of equation are underlined, not struck out (this is a shortcoming inherent to the ulem package). =item C Added text is blue and set in sans-serif, and a red footnote is created for each discarded piece of text. (Requires color package) =item C Like C but without the use of color. =item C Added text is blue and set in sans-serif, and discarded text is red and very small size. =item C Added tex is set in sans-serif, discarded text small and struck out =item C Added text is blue, and discarded text is red. Additionally, the changed text is marked with a bar in the margin (Requires color and changebar packages). =item C Like C but with additional changebars (Requires color and changebar packages). =item C Like C but with additional changebars (Requires color, ulem and changebar packages). =item C No mark up of text, but mark margins with changebars (Requires changebar package). =item C No visible markup (but generic markup commands will still be inserted. =back =head2 Subtypes The subtype defines the commands that are inserted at the begin and end of added or discarded blocks, irrespectively of whether these blocks contain text or commands (Defined commands: C<\DIFaddbegin, \DIFaddend, \DIFdelbegin, \DIFdelend>) =over 10 =item C No additional markup (Recommended choice) =item C Mark beginning and end of changed blocks with symbols in the margin nearby (using the standard C<\marginpar> command - note that this sometimes moves somewhat from the intended position. =item C An alternative way of marking added passages in blue, and deleted ones in red. (It is recommeneded to use instead the main types to effect colored markup, although in some cases coloring with dvipscol can be more complete, for example with citation commands). =item C An alternative way of marking added passages in blue, and deleted ones in red. Note that C only works with the dvips converter, e.g. not pdflatex. (it is recommeneded to use instead the main types to effect colored markup, although in some cases coloring with dvipscol can be more complete). =back =head2 Float Types Some of the markup used in the main text might cause problems when used within floats (e.g. figures or tables). For this reason alternative versions of all markup commands are used within floats. The float type defines these alternative commands. =over 10 =item C Use identical markup for text as in the main body, but set all commands marking the begin and end of changed blocks to null-commands. You have to choose this float type if your subtype is C as C<\marginpar> does not work properly within floats. =item C Mark additions the same way as in the main text. Deleted environments are marked by angular brackets \[ and \] and the deleted text is set in scriptscript size. This float type should always be used with the C and C markup types as the \footnote command does not work properly in floating environments. =item C Make no difference between the main text and floats. =back =head2 Configuration Variables =over 10 =item C 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 to the preceding added and discarded parts. [ Default: 3 ] =item C Environments whose name matches the regular expression in C are considered floats. Within these environments, the I markup commands are replaced by their FL variaties. [ Default: S >] =item C Within environments whose name matches the regular expression in C all latexdiff markup is removed (in pathologic cases this might lead to inconsistent markup but this situation should be rare). [ Default: S >] =item C,C If both \begin and \end for a math environment (environment name matching C or \[ and \]) are within the same deleted block, they are replaced by a \begin and \end commands for C rather than being commented out. [ Default: C=S >, C=S >] =item C,C as C,C but for equation arrays [ Default: C=S >, C=S >] =item C If a match to C 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: C=S > =item C If a command in a deleted block which is also in the textcmd list matches C then an additional command C<\addtocounter{>FC<}{-1}>, where F 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=C<(?:footnote|part|section|subsection> ... C<|subsubsection|paragraph|subparagraph)> ] =back =head1 COMMON PROBLEMS =over 10 =item Citations result in overfull boxes There is an incompatibility between the C package, which C uses for underlining and striking out in the UNDERLINE style, the default style. In order to be able to mark up citations properly, they are placed with an C<\mbox> command in post-processing. As mboxes cannot be broken across lines, this procedure frequently results in overfull boxes, possibly obscuring the content as it extends beyond the right margin. If this is a problem, you have two possibilities: 1. Use C or C subtype markup (option C<-s COLOR>): If this markup is chosen, then changed citations are no longer marked up with the wavy line (additions) or struck out (deletions), but are still highlighted in the appropriate color. 2. Choose option C<--disable-citation-markup> which turns off the marking up of citations: deleted citations are no longer shown, and added ctations are shown without markup. (This was the default behaviour of latexdiff at versions 0.6 and older) =item Changes in complicated mathematical equations result in latex processing errors Try options C<--math-markup=whole>. If even that fails, you can turn off mark up for equations with C<--math-markup=off>. =back =head1 BUGS Option allow-spaces not implemented entirely consistently. It breaks the rules that number and type of white space does not matter, as different numbers of inter-argument spaces are treated as significant. Please submit bug reports on the latexdiff project page I, send them to user discussion list C (prior subscription to list required, also on project webpage) or send them to I. Include the serial number of I (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 latex, please send me those files, ideally edited to only contain the offending passage as long as that still reproduces the problem. If your file relies on non-standard class files, you must include those. I will not look at examples where I have trouble to latex the original files. =head1 SEE ALSO L, L =head1 PORTABILITY I does not make use of external commands and thus should run on any platform supporting Perl 5.6 or higher. If files with encodings other than ASCII or UTF-8 are processed, Perl 5.8 or higher is required. The standard version of I requires installation of the Perl package C (available from I - I) but a stand-alone version, I, which has this package inlined, is available, too. I requires the I command to be present. =head1 AUTHOR Version 1.0.2 Copyright (C) 2004-2012 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 Contributors of fixes and additions: V. Kuhlmann, J. Paisley, N. Becker, T. Doerges, K. Huebner, T. Connors, Sebastian Gouezel and many others. Thanks to the many people who send in bug reports, feature suggestions, and other feedback. =cut __END__ %%BEGIN SAFE COMMANDS % Regex matching commands which can safely be in the % argument of a \DIFadd or \DIFdel command (leave out the \) arabic dashbox emph fbox framebox hspace math.* makebox mbox pageref ref symbol raisebox rule text.* shortstack usebox dag ddag copyright pounds S P oe OE ae AE aa AA o O l L frac ss sqrt ldots cdots vdots ddots alpha beta gamma delta epsilon varepsilon zeta eta theta vartheta iota kappa lambda mu nu xi pi varpi rho varrho sigma varsigma tau upsilon phi varphi chi psi omega Gamma Delta Theta Lambda Xi Pi Sigma Upsilon Phi Psi Omega ps mp times div ast star circ bullet cdot cap cup uplus sqcap vee wedge setminus wr diamond (?:big)?triangle.* lhd rhd unlhd unrhd oplus ominus otimes oslash odot bigcirc d?dagger amalg leq prec preceq ll (?:sq)?su[bp]set(?:eq)? in vdash geq succ(?:eq)? gg ni dashv equiv sim(?:eq)? asymp approx cong neq doteq propto models perp mid parallel bowtie Join smile frown .*arrow (?:long)?mapsto .*harpoon.* leadsto aleph hbar imath jmath ell wp Re Im mho prime emptyset nabla surd top bot angle forall exists neg flat natural sharp backslash partial infty Box Diamond triangle clubsuit diamondsuit heartsuit spadesuit sum prod coprod int oint big(?:sq)?c[au]p bigvee bigwedge bigodot bigotimes bigoplus biguplus (?:arc)?(?:cos|sin|tan|cot)h? csc arg deg det dim exp gcd hom inf ker lg lim liminf limsup ln log max min Pr sec sup (SUPER|SUB)SCRIPTNB (SUPER|SUB)SCRIPT %%END SAFE COMMANDS %%BEGIN TEXT COMMANDS % Regex matching commands with a text argument (leave out the \) addcontents.* cc closing chapter dashbox emph encl fbox framebox footnote footnotetext framebox part (sub){0,2}section\*? (sub)?paragraph\*? makebox mbox opening parbox raisebox savebox sbox shortstack signature text.* value underline sqrt (SUPER|SUB)SCRIPT %%END TEXT COMMANDS %%BEGIN CONTEXT1 COMMANDS % Regex matching commands with a text argument (leave out the \), which will fail out of context, but whose argument should be printed as plain text caption %%END CONTEXT1 COMMANDS %%BEGIN CONTEXT2 COMMANDS % Regex matching commands with a text argument (leave out the \), which will fail out of context, but whose argument should be printed as plain text title author date institute %%END CONTEXT2 COMMANDS %% TYPES (Commands for highlighting changed blocks) %DIF UNDERLINE PREAMBLE \RequirePackage[normalem]{ulem} \RequirePackage{color}\definecolor{RED}{rgb}{1,0,0}\definecolor{BLUE}{rgb}{0,0,1} \providecommand{\DIFadd}[1]{{\protect\color{blue}\uwave{#1}}} \providecommand{\DIFdel}[1]{{\protect\color{red}\sout{#1}}} %DIF END UNDERLINE PREAMBLE %DIF CTRADITIONAL PREAMBLE \RequirePackage{color}\definecolor{RED}{rgb}{1,0,0}\definecolor{BLUE}{rgb}{0,0,1} \RequirePackage[stable]{footmisc} \providecommand{\DIFadd}[1]{{\protect\color{blue} \sf #1}} \providecommand{\DIFdel}[1]{{\protect\color{red} [..\footnote{removed: #1} ]}} %DIF END CTRADITIONAL PREAMBLE %DIF TRADITIONAL PREAMBLE \RequirePackage[stable]{footmisc} \providecommand{\DIFadd}[1]{{\sf #1}} \providecommand{\DIFdel}[1]{{[..\footnote{removed: #1} ]}} %DIF END TRADITIONAL PREAMBLE %DIF CFONT PREAMBLE \RequirePackage{color}\definecolor{RED}{rgb}{1,0,0}\definecolor{BLUE}{rgb}{0,0,1} \providecommand{\DIFadd}[1]{{\protect\color{blue} \sf #1}} \providecommand{\DIFdel}[1]{{\protect\color{red} \scriptsize #1}} %DIF END CFONT PREAMBLE %DIF FONTSTRIKE PREAMBLE \RequirePackage[normalem]{ulem} \providecommand{\DIFadd}[1]{{\sf #1}} \providecommand{\DIFdel}[1]{{\footnotesize \sout{#1}}} %DIF END FONTSTRIKE PREAMBLE %DIF CCHANGEBAR PREAMBLE \RequirePackage[dvips]{changebar} \RequirePackage{color}\definecolor{RED}{rgb}{1,0,0}\definecolor{BLUE}{rgb}{0,0,1} \providecommand{\DIFadd}[1]{\protect\cbstart{\protect\color{blue}#1}\protect\cbend} \providecommand{\DIFdel}[1]{\protect\cbdelete{\protect\color{red}#1}\protect\cbdelete} %DIF END CCHANGEBAR PREAMBLE %DIF CFONTCHBAR PREAMBLE \RequirePackage[dvips]{changebar} \RequirePackage{color}\definecolor{RED}{rgb}{1,0,0}\definecolor{BLUE}{rgb}{0,0,1} \providecommand{\DIFadd}[1]{\protect\cbstart{\protect\color{blue}\sf #1}\protect\cbend} \providecommand{\DIFdel}[1]{\protect\cbdelete{\protect\color{red}\scriptsize #1}\protect\cbdelete} %DIF END CFONTCHBAR PREAMBLE %DIF CULINECHBAR PREAMBLE \RequirePackage[normalem]{ulem} \RequirePackage[dvips]{changebar} \RequirePackage{color} \providecommand{\DIFadd}[1]{\protect\cbstart{\protect\color{blue}\uwave{#1}}\protect\cbend} \providecommand{\DIFdel}[1]{\protect\cbdelete{\protect\color{red}\sout{#1}}\protect\cbdelete} %DIF END CULINECHBAR PREAMBLE %DIF CHANGEBAR PREAMBLE \RequirePackage[dvips]{changebar} \providecommand{\DIFadd}[1]{\protect\cbstart{#1}\protect\cbend} \providecommand{\DIFdel}[1]{\protect\cbdelete} %DIF END CHANGEBAR PREAMBLE %DIF INVISIBLE PREAMBLE \providecommand{\DIFadd}[1]{#1} \providecommand{\DIFdel}[1]{} %DIF END INVISIBLE PREAMBLE %% SUBTYPES (Markers for beginning and end of changed blocks) %DIF SAFE PREAMBLE \providecommand{\DIFaddbegin}{} \providecommand{\DIFaddend}{} \providecommand{\DIFdelbegin}{} \providecommand{\DIFdelend}{} %DIF END SAFE PREAMBLE %DIF MARGIN PREAMBLE \providecommand{\DIFaddbegin}{\protect\marginpar{a[}} \providecommand{\DIFaddend}{\protect\marginpar{]}} \providecommand{\DIFdelbegin}{\protect\marginpar{d[}} \providecommand{\DIFdelend}{\protect\marginpar{]}} %DIF END BRACKET PREAMBLE %DIF DVIPSCOL PREAMBLE %Note: only works with dvips converter \RequirePackage{color} \RequirePackage{dvipscol} \providecommand{\DIFaddbegin}{\protect\nogroupcolor{blue}} \providecommand{\DIFaddend}{\protect\nogroupcolor{black}} \providecommand{\DIFdelbegin}{\protect\nogroupcolor{red}} \providecommand{\DIFdelend}{\protect\nogroupcolor{black}} %DIF END DVIPSCOL PREAMBLE %DIF COLOR PREAMBLE \RequirePackage{color} \providecommand{\DIFaddbegin}{\protect\color{blue}} \providecommand{\DIFaddend}{\protect\color{black}} \providecommand{\DIFdelbegin}{\protect\color{red}} \providecommand{\DIFdelend}{\protect\color{black}} %DIF END COLOR PREAMBLE %% FLOAT TYPES %DIF FLOATSAFE PREAMBLE \providecommand{\DIFaddFL}[1]{\DIFadd{#1}} \providecommand{\DIFdelFL}[1]{\DIFdel{#1}} \providecommand{\DIFaddbeginFL}{} \providecommand{\DIFaddendFL}{} \providecommand{\DIFdelbeginFL}{} \providecommand{\DIFdelendFL}{} %DIF END FLOATSAFE PREAMBLE %DIF IDENTICAL PREAMBLE \providecommand{\DIFaddFL}[1]{\DIFadd{#1}} \providecommand{\DIFdelFL}[1]{\DIFdel{#1}} \providecommand{\DIFaddbeginFL}{\DIFaddbegin} \providecommand{\DIFaddendFL}{\DIFaddend} \providecommand{\DIFdelbeginFL}{\DIFdelbegin} \providecommand{\DIFdelendFL}{\DIFdelend} %DIF END IDENTICAL PREAMBLE %DIF TRADITIONALSAFE PREAMBLE % procidecommand color to make this work for TRADITIONAL and CTRADITIONAL \providecommand{\color}[1]{} \providecommand{\DIFaddFL}[1]{\DIFadd{#1}} \providecommand{\DIFdel}[1]{{\protect\color{red}[..{\scriptsize {removed: #1}} ]}} \providecommand{\DIFaddbeginFL}{} \providecommand{\DIFaddendFL}{} \providecommand{\DIFdelbeginFL}{} \providecommand{\DIFdelendFL}{} %DIF END FLOATSAFE PREAMBLE %% SPECIAL PACKAGE PREAMBLE COMMANDS % Standard \DIFadd and \DIFdel are redefined as \DIFaddtex and \DIFdeltex % when hyperref package is included. %DIF HYPERREF PREAMBLE \providecommand{\DIFadd}[1]{\texorpdfstring{\DIFaddtex{#1}}{#1}} \providecommand{\DIFdel}[1]{\texorpdfstring{\DIFdeltex{#1}}{}} %DIF END HYPERREF PACKAGE latexdiff-1.0.2/latexrevise.10000644000076400007640000002201612063450736016002 0ustar tilmanntilmann.\" Automatically generated by Pod::Man 2.23 (Pod::Simple 3.14) .\" .\" Standard preamble: .\" ======================================================================== .de Sp \" Vertical space (when we can't use .PP) .if t .sp .5v .if n .sp .. .de Vb \" Begin verbatim text .ft CW .nf .ne \\$1 .. .de Ve \" End verbatim text .ft R .fi .. .\" Set up some character translations and predefined strings. \*(-- will .\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left .\" double quote, and \*(R" will give a right double quote. \*(C+ will .\" give a nicer C++. Capital omega is used to do unbreakable dashes and .\" therefore won't be available. \*(C` and \*(C' expand to `' in nroff, .\" nothing in troff, for use with C<>. .tr \(*W- .ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p' .ie n \{\ . ds -- \(*W- . ds PI pi . if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch . if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\" diablo 12 pitch . ds L" "" . ds R" "" . ds C` "" . ds C' "" 'br\} .el\{\ . ds -- \|\(em\| . ds PI \(*p . ds L" `` . ds R" '' 'br\} .\" .\" Escape single quotes in literal strings from groff's Unicode transform. .ie \n(.g .ds Aq \(aq .el .ds Aq ' .\" .\" If the F register is turned on, we'll generate index entries on stderr for .\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index .\" entries marked with X<> in POD. Of course, you'll have to process the .\" output yourself in some meaningful fashion. .ie \nF \{\ . de IX . tm Index:\\$1\t\\n%\t"\\$2" .. . nr % 0 . rr F .\} .el \{\ . de IX .. .\} .\" .\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2). .\" Fear. Run. Save yourself. No user-serviceable parts. . \" fudge factors for nroff and troff .if n \{\ . ds #H 0 . ds #V .8m . ds #F .3m . ds #[ \f1 . ds #] \fP .\} .if t \{\ . ds #H ((1u-(\\\\n(.fu%2u))*.13m) . ds #V .6m . ds #F 0 . ds #[ \& . ds #] \& .\} . \" simple accents for nroff and troff .if n \{\ . ds ' \& . ds ` \& . ds ^ \& . ds , \& . ds ~ ~ . ds / .\} .if t \{\ . ds ' \\k:\h'-(\\n(.wu*8/10-\*(#H)'\'\h"|\\n:u" . ds ` \\k:\h'-(\\n(.wu*8/10-\*(#H)'\`\h'|\\n:u' . ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'^\h'|\\n:u' . ds , \\k:\h'-(\\n(.wu*8/10)',\h'|\\n:u' . ds ~ \\k:\h'-(\\n(.wu-\*(#H-.1m)'~\h'|\\n:u' . ds / \\k:\h'-(\\n(.wu*8/10-\*(#H)'\z\(sl\h'|\\n:u' .\} . \" troff and (daisy-wheel) nroff accents .ds : \\k:\h'-(\\n(.wu*8/10-\*(#H+.1m+\*(#F)'\v'-\*(#V'\z.\h'.2m+\*(#F'.\h'|\\n:u'\v'\*(#V' .ds 8 \h'\*(#H'\(*b\h'-\*(#H' .ds o \\k:\h'-(\\n(.wu+\w'\(de'u-\*(#H)/2u'\v'-.3n'\*(#[\z\(de\v'.3n'\h'|\\n:u'\*(#] .ds d- \h'\*(#H'\(pd\h'-\w'~'u'\v'-.25m'\f2\(hy\fP\v'.25m'\h'-\*(#H' .ds D- D\\k:\h'-\w'D'u'\v'-.11m'\z\(hy\v'.11m'\h'|\\n:u' .ds th \*(#[\v'.3m'\s+1I\s-1\v'-.3m'\h'-(\w'I'u*2/3)'\s-1o\s+1\*(#] .ds Th \*(#[\s+2I\s-2\h'-\w'I'u*3/5'\v'-.3m'o\v'.3m'\*(#] .ds ae a\h'-(\w'a'u*4/10)'e .ds Ae A\h'-(\w'A'u*4/10)'E . \" corrections for vroff .if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u' .if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u' . \" for low resolution devices (crt and lpr) .if \n(.H>23 .if \n(.V>19 \ \{\ . ds : e . ds 8 ss . ds o a . ds d- d\h'-1'\(ga . ds D- D\h'-1'\(hy . ds th \o'bp' . ds Th \o'LP' . ds ae ae . ds Ae AE .\} .rm #[ #] #H #V #F C .\" ======================================================================== .\" .IX Title "LATEXREVISE 1" .TH LATEXREVISE 1 "2012-12-16" "perl v5.12.4" " " .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l .nh .SH "NAME" latexrevise \- selectively remove markup and text from latexdiff output .SH "SYNOPSIS" .IX Header "SYNOPSIS" \&\fBlatexrevise\fR [ \fB\s-1OPTIONS\s0\fR ] [ \fIdiff.tex\fR ] > \fIrevised.tex\fR .SH "DESCRIPTION" .IX Header "DESCRIPTION" \&\fIlatexrevise\fR reads a file \f(CW\*(C`diff.tex\*(C'\fR (output of \fIlatexdiff\fR), and remove the markup commands. If no filename is given the input is read from standard input. The command can be used in \fI\s-1ACCEPT\s0\fR, \fI\s-1DECLINE\s0\fR, or \fI\s-1SIMPLIFY\s0\fR mode, or can be used to remove user-defined latex commands from the input (see \fB\-c\fR, \fB\-e\fR, \fB\-m\fR, and \fB\-n\fR below). In \fI\s-1ACCEPT\s0\fR mode, all appended text fragments (or preamble lines) are kept, and all discarded text fragments (or preamble lines) are deleted. In \fI\s-1DECLINE\s0\fR mode, all discarded text fragments are kept, and all appended text fragments are deleted. If you wish to keep some changes, edit the diff.tex file in advance, and manually remove those tokens which would otherwise be deleted. Note that \fIlatexrevise\fR only pays attention to the \f(CW\*(C`\eDIFaddbegin\*(C'\fR, \&\f(CW\*(C`\eDIFaddend\*(C'\fR, \f(CW\*(C`\eDIFdelbegin\*(C'\fR, and \f(CW\*(C`\eDIFdelend\*(C'\fR tokens and corresponding \s-1FL\s0 varieties. All \f(CW\*(C`\eDIFadd\*(C'\fR and \f(CW\*(C`\eDIFdel\*(C'\fR commands (but not their contents) are simply deleted. The commands added by latexdiff to the preamble are also removed. In \fI\s-1SIMPLIFY\s0\fR mode, \f(CW\*(C`\eDIFaddbegin, \eDIFaddend, \eDIFdelbegin, \eDIFdelend\*(C'\fR tokens and their corresponding \f(CW\*(C`FL\*(C'\fR varieties are kept but all other markup (e.g. \f(CW\*(C`DIFadd\*(C'\fR and <\eDIFdel>) is removed. The result will not in general be valid latex-code but it will be easier to read and edit in preparation for a subsequent run in \fI\s-1ACCEPT\s0\fR or \fI\s-1DECLINE\s0\fR mode. In \fI\s-1SIMPLIFY\s0\fR mode the preamble is left unmodified. .SH "OPTIONS" .IX Header "OPTIONS" .IP "\fB\-a\fR or \fB\-\-accept\fR" 4 .IX Item "-a or --accept" Run in \fI\s-1ACCEPT\s0\fR mode (delete all blocks marked by \f(CW\*(C`\eDIFdelbegin\*(C'\fR and \f(CW\*(C`\eDIFdelend\*(C'\fR). .IP "\fB\-d\fR or \fB\-\-decline\fR" 4 .IX Item "-d or --decline" Run in \fI\s-1DECLINE\s0\fR mode (delete all blocks marked by \f(CW\*(C`\eDIFaddbegin\*(C'\fR and \f(CW\*(C`\eDIFaddend\*(C'\fR). .IP "\fB\-s\fR or \fB\-\-simplify\fR" 4 .IX Item "-s or --simplify" Run in \fI\s-1SIMPLIFY\s0\fR mode (Keep all \f(CW\*(C`\eDIFaddbegin\*(C'\fR, \f(CW\*(C`\eDIFaddend\*(C'\fR, \&\f(CW\*(C`\eDIFdelbegin\*(C'\fR, \f(CW\*(C`\eDIFdelend\*(C'\fR tokens, but remove all other latexdiff markup from body). .PP Note that the three mode options are mutually exclusive. If no mode option is given, \&\fIlatexrevise\fR simply removes user annotations and markup according to the following four options. .IP "\fB\-c cmd\fR or \fB\-\-comment=cmd\fR" 4 .IX Item "-c cmd or --comment=cmd" Remove \f(CW\*(C`\ecmd{...}\*(C'\fR sequences. \f(CW\*(C`cmd\*(C'\fR is supposed to mark some explicit anotations which should be removed from the file before release. .IP "\fB\-e envir\fR or \fB\-\-comment\-environment=envir\fR" 4 .IX Item "-e envir or --comment-environment=envir" Remove explicit annotation environments from the text, i.e. remove .Sp .Vb 3 \& \ebegin{envir} \& ... \& \eend{envir} .Ve .Sp blocks. .IP "\fB\-m cmd\fR or \fB\-\-markup=cmd\fR" 4 .IX Item "-m cmd or --markup=cmd" Remove the markup command \f(CW\*(C`\ecmd\*(C'\fR but leave its argument, i.e. turn \f(CW\*(C`\ecmd{abc}\*(C'\fR into \f(CW\*(C`abc\*(C'\fR. .IP "\fB\-n envir\fR or \fB\-\-markup\-environment=envir\fR" 4 .IX Item "-n envir or --markup-environment=envir" Similarly, remove \f(CW\*(C`\ebegin{envir}\*(C'\fR and \f(CW\*(C`\eend{envir}\*(C'\fR commands but leave content of the environment in the text. .IP "\fB\-V\fR or \fB\-\-verbose\fR" 4 .IX Item "-V or --verbose" Verbose output .IP "\fB\-q\fR or \fB\-\-no\-warnings\fR" 4 .IX Item "-q or --no-warnings" Do not warn users about \f(CW\*(C`\eDIDadd{..}\*(C'\fR or \f(CW\*(C`\eDIFdel{..}\*(C'\fR statements which should have been removed already. .SH "BUGS" .IX Header "BUGS" The current version is a beta version which has not yet been extensively tested, but worked fine locally. Please submit bug reports through the latexdiff project page \fIhttp://developer.berlios.de/projects/latexdiff/\fR or send to \fItilmann@gfz\-potsdam.de\fR. Include the serial number of \fIlatexrevise\fR (from comments at the top of the source). If you come across latexdiff output which is not processed correctly by \fIlatexrevise\fR please include the problem file as well as the old and new files on which it is based, ideally edited to only contain the offending passage as long as that still reproduces the problem. .PP Note that \fIlatexrevise\fR gets confused by commented \f(CW\*(C`\ebegin{document}\*(C'\fR or \&\f(CW\*(C`\eend{document}\*(C'\fR statements .SH "SEE ALSO" .IX Header "SEE ALSO" latexdiff .SH "PORTABILITY" .IX Header "PORTABILITY" \&\fIlatexrevise\fR does not make use of external commands and thus should run on any platform supporting \s-1PERL\s0 v5 or higher. .SH "AUTHOR" .IX Header "AUTHOR" Copyright (C) 2004 Frederik Tilmann .PP This program is free software; you can redistribute it and/or modify it under the terms of the \s-1GNU\s0 General Public License Version 3 latexdiff-1.0.2/latexdiff-fast0000755000076400007640000043746112063450736016232 0ustar tilmanntilmann#!/usr/bin/env perl ##!/usr/bin/perl -w # latexdiff - differences two latex files on the word level # and produces a latex file with the differences marked up. # # Copyright (C) 2004-12 F J Tilmann (tilmann@gfz-potsdam.de, ftilmann@users.berlios.de) # # Project webpages: http://latexdiff.berlios.de/ # CTAN page: http://www.ctan.org/tex-archive/support/latexdiff # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation, either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # You should have received a copy of the GNU General Public License # along with this program. If not, see . # # Detailed usage information at the end of the file # # Version 1.0.1 - treat \big,\bigg etc. equivalently to \left and # \right - include starred version in MATHENV - apply # - flatten recursively and --flatten expansion is now # aware of comments (thanks to Tim Connors for patch) # - Change to post-processing for more reliability for # deleted math environments # - On linux systems, recognise and remove DOS style newlines # - Provide markup for some special preamble commands (\title, # \author,\date, # - configurable by setting context2cmd # - for styles using ulem package, remove \emph and \text.. from list of # safe commands in order to allow linebreaks within the # highlighted sections. # - for ulem style, now show citations by enclosing them in \mbox commands. # This unfortunately implies linebreaks within citations no longer function, # so this functionality can be turned off (Option --disable-citation-markup). # With --enable-citation-markup, the mbox markup is forced for other styles) # - new substyle COLOR. This is particularly useful for marking up citations # and some special post-processing is implemented to retain cite # commands in deleted blocks. # - four different levels of math-markup # - Option --driver for choosing driver for modes employing changebar package # - accept \\* as valid command (and other commands of form \.*). Also accept # \ (backslashed newline) # - some typo fixes, include commands defined in preamble as safe commands # (Sebastian Gouezel) # - include compared filenames as comments as line 2 and 3 of # the preamble (can be modified with option --label, and suppressed with # --no-label), option --visible-label to show files in generated pdf or dvi # at the beginning of main document # # Version 0.5 A number of minor improvements based on feedback # Deleted blocks are now shown before added blocks # Package specific processing # # Version 0.43 unreleased typo in list of styles at the end # Add protect to all \cbstart, \cbend commands # More robust substitution of deleted math commands # # Version 0.42 November 06 Bug fixes only # # Version 0.4 March 06 option for fast differencing using UNIX diff command, several minor bug fixes (\par bug, improved highlighting of textcmds) # # Version 0.3 August 05 improved parsing of displayed math, --allow-spaces # option, several minor bug fixes # # Version 0.25 October 04 Fix bug with deleted equations, add math mode commands to safecmd, add | to allowed interpunctuation signs # Version 0.2 September 04 extension to utf-8 and variable encodings # Version 0.1 August 04 First public release # Inserted block for differenceing # use Algorithm::Diff qw(traverse_sequences); # in standard version # The following BEGIN block contains a verbatim copy of # Ned Konz' Algorithm::Diff package version 1.15 except # that subroutine _longestCommonSubsequence has been replace by # a routine which internally uses the UNIX diff command for # the differencing rather than the Perl routines if the # length of the sequences exceeds some threshold. # Also, all POD documentation has been stripped out. # # (the distribution on which this modification is based is available # from http://search.cpan.org/~nedkonz/Algorithm-Diff-1.15 # the most recent version can be found via http://search.cpan.org/search?module=Algorithm::Diff ) # Please note that the LICENCSE for Algorithm::Diff : # "Copyright (c) 2000-2002 Ned Konz. All rights reserved. # This program is free software; # you can redistribute it and/or modify it under the same terms # as Perl itself." # The fast-differencing version of latexdiff is provided as a convenience # for latex users under Unix-like systems which have a 'diff' command. # If you believe # the inlining of Algorithm::Diff violates its license please contact # me and I will modify the latexdiff distribution accordingly. # Frederik Tilmann (tilmann@esc.cam.ac.uk) # Jonathan Paisley is acknowledged for the idea of using the system diff # command to achieve shorter running times BEGIN { package Algorithm::Diff; use strict; use vars qw($VERSION @EXPORT_OK @ISA @EXPORT); use integer; # see below in _replaceNextLargerWith() for mod to make # if you don't use this require Exporter; @ISA = qw(Exporter); @EXPORT = qw(); @EXPORT_OK = qw(LCS diff traverse_sequences traverse_balanced sdiff); $VERSION = sprintf('%d.%02d fast', (q$Revision: 1.15 $ =~ /\d+/g)); # Global parameters use File::Temp qw/tempfile/; # if larger number of elements in longestCommonSubsequence smaller than # this number, then use internal algorithm, otherwise use UNIX diff use constant THRESHOLD => 100 ; # Detect whether diff --minimal option is available # if yes we use it use constant MINIMAL => ( system('diff','--minimal','/dev/null','/dev/null') >> 8 ==0 ? "--minimal" : "" ) ; # McIlroy-Hunt diff algorithm # Adapted from the Smalltalk code of Mario I. Wolczko, # by Ned Konz, perl@bike-nomad.com # Create a hash that maps each element of $aCollection to the set of positions # it occupies in $aCollection, restricted to the elements within the range of # indexes specified by $start and $end. # The fourth parameter is a subroutine reference that will be called to # generate a string to use as a key. # Additional parameters, if any, will be passed to this subroutine. # # my $hashRef = _withPositionsOfInInterval( \@array, $start, $end, $keyGen ); sub _withPositionsOfInInterval { my $aCollection = shift; # array ref my $start = shift; my $end = shift; my $keyGen = shift; my %d; my $index; for ( $index = $start ; $index <= $end ; $index++ ) { my $element = $aCollection->[$index]; my $key = &$keyGen( $element, @_ ); if ( exists( $d{$key} ) ) { unshift ( @{ $d{$key} }, $index ); } else { $d{$key} = [$index]; } } return wantarray ? %d : \%d; } # Find the place at which aValue would normally be inserted into the array. If # that place is already occupied by aValue, do nothing, and return undef. If # the place does not exist (i.e., it is off the end of the array), add it to # the end, otherwise replace the element at that point with aValue. # It is assumed that the array's values are numeric. # This is where the bulk (75%) of the time is spent in this module, so try to # make it fast! sub _replaceNextLargerWith { my ( $array, $aValue, $high ) = @_; $high ||= $#$array; # off the end? if ( $high == -1 || $aValue > $array->[-1] ) { push ( @$array, $aValue ); return $high + 1; } # binary search for insertion point... my $low = 0; my $index; my $found; while ( $low <= $high ) { $index = ( $high + $low ) / 2; # $index = int(( $high + $low ) / 2); # without 'use integer' $found = $array->[$index]; if ( $aValue == $found ) { return undef; } elsif ( $aValue > $found ) { $low = $index + 1; } else { $high = $index - 1; } } # now insertion point is in $low. $array->[$low] = $aValue; # overwrite next larger return $low; } # This method computes the longest common subsequence in $a and $b. # Result is array or ref, whose contents is such that # $a->[ $i ] == $b->[ $result[ $i ] ] # foreach $i in ( 0 .. $#result ) if $result[ $i ] is defined. # An additional argument may be passed; this is a hash or key generating # function that should return a string that uniquely identifies the given # element. It should be the case that if the key is the same, the elements # will compare the same. If this parameter is undef or missing, the key # will be the element as a string. # By default, comparisons will use "eq" and elements will be turned into keys # using the default stringizing operator '""'. # Additional parameters, if any, will be passed to the key generation routine. sub _longestCommonSubsequence { my $a = shift; # array ref my $b = shift; # array ref my $keyGen = shift; # code ref my $compare; # code ref # set up code refs # Note that these are optimized. if ( !defined($keyGen) ) # optimize for strings { $keyGen = sub { $_[0] }; $compare = sub { my ( $a, $b ) = @_; $a eq $b }; } else { $compare = sub { my $a = shift; my $b = shift; &$keyGen( $a, @_ ) eq &$keyGen( $b, @_ ); }; } my ( $aStart, $aFinish, $bStart, $bFinish, $matchVector ) = ( 0, $#$a, 0, $#$b, [] ); # Check whether to use internal routine (small number of elements) # or use it as a wrapper for UNIX diff if ( ( $#$a > $#$b ? $#$a : $#$b) < THRESHOLD ) { ### print STDERR "DEBUG: regular longestCommonSubsequence\n"; # First we prune off any common elements at the beginning while ( $aStart <= $aFinish and $bStart <= $bFinish and &$compare( $a->[$aStart], $b->[$bStart], @_ ) ) { $matchVector->[ $aStart++ ] = $bStart++; } # now the end while ( $aStart <= $aFinish and $bStart <= $bFinish and &$compare( $a->[$aFinish], $b->[$bFinish], @_ ) ) { $matchVector->[ $aFinish-- ] = $bFinish--; } # Now compute the equivalence classes of positions of elements my $bMatches = _withPositionsOfInInterval( $b, $bStart, $bFinish, $keyGen, @_ ); my $thresh = []; my $links = []; my ( $i, $ai, $j, $k ); for ( $i = $aStart ; $i <= $aFinish ; $i++ ) { $ai = &$keyGen( $a->[$i], @_ ); if ( exists( $bMatches->{$ai} ) ) { $k = 0; for $j ( @{ $bMatches->{$ai} } ) { # optimization: most of the time this will be true if ( $k and $thresh->[$k] > $j and $thresh->[ $k - 1 ] < $j ) { $thresh->[$k] = $j; } else { $k = _replaceNextLargerWith( $thresh, $j, $k ); } # oddly, it's faster to always test this (CPU cache?). if ( defined($k) ) { $links->[$k] = [ ( $k ? $links->[ $k - 1 ] : undef ), $i, $j ]; } } } } if (@$thresh) { for ( my $link = $links->[$#$thresh] ; $link ; $link = $link->[0] ) { $matchVector->[ $link->[1] ] = $link->[2]; } } } else { my ($fha,$fhb,$fna,$fnb,$ele,$key); my ($alines,$blines,$alb,$alf,$blb,$blf); my ($minimal)=MINIMAL; # large number of elements, use system diff ### print STDERR "DEBUG: fast (diff) longestCommonSubsequence\n"; ($fha,$fna)=tempfile("DiffA-XXXX") or die "_longestCommonSubsequence: Cannot open tempfile for sequence A"; ($fhb,$fnb)=tempfile("DiffB-XXXX") or die "_longestCommonSubsequence: Cannot open tempfile for sequence B"; # prepare sequence A foreach $ele ( @$a ) { $key=&$keyGen( $ele, @_ ); $key =~ s/\\/\\\\/g ; $key =~ s/\n/\\n/sg ; print $fha "$key\n" ; } close($fha); # prepare sequence B foreach $ele ( @$b ) { $key=&$keyGen( $ele, @_ ); $key =~ s/\\/\\\\/g ; $key =~ s/\n/\\n/sg ; print $fhb "$key\n" ; } close($fhb); open(DIFFPIPE, "diff $minimal $fna $fnb |") or die "_longestCommonSubsequence: Cannot launch diff process. $!" ; # The diff line numbering begins with 1, but Perl subscripts start with 0 # We follow the diff numbering but substract 1 when assigning to matchVector $aStart++; $bStart++ ; $aFinish++ ; $bFinish++ ; while( ) { if ( ($alines,$blines) = ( m/^(\d*(?:,\d*)?)?c(\d*(?:,\d*)?)?$/ ) ) { ($alb,$alf)=split(/,/,$alines); ($blb,$blf)=split(/,/,$blines); $alf=$alb unless defined($alf); $blf=$blb unless defined($blf); while($aStart < $alb ) { $matchVector->[ -1 + $aStart++ ] = -1 + $bStart++ ; } # check for consistency $bStart==$blb or die "_longestCommonSubsequence: Fatal error in interpreting diff output: Inconsistency in changed sequence"; $aStart=$alf+1; $bStart=$blf+1; } elsif ( ($alb,$blines) = ( m/^(\d*)a(\d*(?:,\d*)?)$/ ) ) { ($blb,$blf)=split(/,/,$blines); $blf=$blb unless defined($blf); while ( $bStart < $blb ) { $matchVector->[ -1 + $aStart++ ] = -1 + $bStart++ ; } $aStart==$alb+1 or die "_longestCommonSubsequence: Fatal error in interpreting diff output: Inconsistency in appended sequence near elements $aStart and $bStart"; $bStart=$blf+1; } elsif ( ($alines,$blb) = ( m/^(\d*(?:,\d*)?)d(\d*)$/ ) ) { ($alb,$alf)=split(/,/,$alines); $alf=$alb unless defined($alf); while ( $aStart < $alb ) { $matchVector->[ -1 + $aStart++ ] = -1 + $bStart++ ; } $bStart==$blb+1 or die "_longestCommonSubsequence: Fatal error in interpreting diff output: Inconsistency in deleted sequence near elements $aStart and $bStart"; $aStart=$alf+1; } elsif ( m/^Binary files/ ) { # if diff reports it is a binary file force --text mode. I do not like # to always use this option because it is probably only available in GNU diff open(DIFFPIPE, "diff --text $fna $fnb |") or die "Cannot launch diff process. $!" ; } # Default: just skip line } while ($aStart <= $aFinish ) { $matchVector->[ -1 + $aStart++ ] = -1 + $bStart++ ; } $bStart==$bFinish+1 or die "_longestCommonSubsequence: Fatal error in interpreting diff output: Inconsistency at end"; close DIFFPIPE; # check whether a system error has occurred or return status is greater than or equal to 5 if ( $! || ($? >> 8) > 5) { print STDERR "diff process failed with exit code ", ($? >> 8), " $!\n"; die; } unlink $fna,$fnb ; } return wantarray ? @$matchVector : $matchVector; } sub traverse_sequences { my $a = shift; # array ref my $b = shift; # array ref my $callbacks = shift || {}; my $keyGen = shift; my $matchCallback = $callbacks->{'MATCH'} || sub { }; my $discardACallback = $callbacks->{'DISCARD_A'} || sub { }; my $finishedACallback = $callbacks->{'A_FINISHED'}; my $discardBCallback = $callbacks->{'DISCARD_B'} || sub { }; my $finishedBCallback = $callbacks->{'B_FINISHED'}; my $matchVector = _longestCommonSubsequence( $a, $b, $keyGen, @_ ); # Process all the lines in @$matchVector my $lastA = $#$a; my $lastB = $#$b; my $bi = 0; my $ai; for ( $ai = 0 ; $ai <= $#$matchVector ; $ai++ ) { my $bLine = $matchVector->[$ai]; if ( defined($bLine) ) # matched { &$discardBCallback( $ai, $bi++, @_ ) while $bi < $bLine; &$matchCallback( $ai, $bi++, @_ ); } else { &$discardACallback( $ai, $bi, @_ ); } } # The last entry (if any) processed was a match. # $ai and $bi point just past the last matching lines in their sequences. while ( $ai <= $lastA or $bi <= $lastB ) { # last A? if ( $ai == $lastA + 1 and $bi <= $lastB ) { if ( defined($finishedACallback) ) { &$finishedACallback( $lastA, @_ ); $finishedACallback = undef; } else { &$discardBCallback( $ai, $bi++, @_ ) while $bi <= $lastB; } } # last B? if ( $bi == $lastB + 1 and $ai <= $lastA ) { if ( defined($finishedBCallback) ) { &$finishedBCallback( $lastB, @_ ); $finishedBCallback = undef; } else { &$discardACallback( $ai++, $bi, @_ ) while $ai <= $lastA; } } &$discardACallback( $ai++, $bi, @_ ) if $ai <= $lastA; &$discardBCallback( $ai, $bi++, @_ ) if $bi <= $lastB; } return 1; } sub traverse_balanced { my $a = shift; # array ref my $b = shift; # array ref my $callbacks = shift || {}; my $keyGen = shift; my $matchCallback = $callbacks->{'MATCH'} || sub { }; my $discardACallback = $callbacks->{'DISCARD_A'} || sub { }; my $discardBCallback = $callbacks->{'DISCARD_B'} || sub { }; my $changeCallback = $callbacks->{'CHANGE'}; my $matchVector = _longestCommonSubsequence( $a, $b, $keyGen, @_ ); # Process all the lines in match vector my $lastA = $#$a; my $lastB = $#$b; my $bi = 0; my $ai = 0; my $ma = -1; my $mb; while (1) { # Find next match indices $ma and $mb do { $ma++ } while ( $ma <= $#$matchVector && !defined $matchVector->[$ma] ); last if $ma > $#$matchVector; # end of matchVector? $mb = $matchVector->[$ma]; # Proceed with discard a/b or change events until # next match while ( $ai < $ma || $bi < $mb ) { if ( $ai < $ma && $bi < $mb ) { # Change if ( defined $changeCallback ) { &$changeCallback( $ai++, $bi++, @_ ); } else { &$discardACallback( $ai++, $bi, @_ ); &$discardBCallback( $ai, $bi++, @_ ); } } elsif ( $ai < $ma ) { &$discardACallback( $ai++, $bi, @_ ); } else { # $bi < $mb &$discardBCallback( $ai, $bi++, @_ ); } } # Match &$matchCallback( $ai++, $bi++, @_ ); } while ( $ai <= $lastA || $bi <= $lastB ) { if ( $ai <= $lastA && $bi <= $lastB ) { # Change if ( defined $changeCallback ) { &$changeCallback( $ai++, $bi++, @_ ); } else { &$discardACallback( $ai++, $bi, @_ ); &$discardBCallback( $ai, $bi++, @_ ); } } elsif ( $ai <= $lastA ) { &$discardACallback( $ai++, $bi, @_ ); } else { # $bi <= $lastB &$discardBCallback( $ai, $bi++, @_ ); } } return 1; } sub LCS { my $a = shift; # array ref my $matchVector = _longestCommonSubsequence( $a, @_ ); my @retval; my $i; for ( $i = 0 ; $i <= $#$matchVector ; $i++ ) { if ( defined( $matchVector->[$i] ) ) { push ( @retval, $a->[$i] ); } } return wantarray ? @retval : \@retval; } sub diff { my $a = shift; # array ref my $b = shift; # array ref my $retval = []; my $hunk = []; my $discard = sub { push ( @$hunk, [ '-', $_[0], $a->[ $_[0] ] ] ) }; my $add = sub { push ( @$hunk, [ '+', $_[1], $b->[ $_[1] ] ] ) }; my $match = sub { push ( @$retval, $hunk ) if scalar(@$hunk); $hunk = [] }; traverse_sequences( $a, $b, { MATCH => $match, DISCARD_A => $discard, DISCARD_B => $add }, @_ ); &$match(); return wantarray ? @$retval : $retval; } sub sdiff { my $a = shift; # array ref my $b = shift; # array ref my $retval = []; my $discard = sub { push ( @$retval, [ '-', $a->[ $_[0] ], "" ] ) }; my $add = sub { push ( @$retval, [ '+', "", $b->[ $_[1] ] ] ) }; my $change = sub { push ( @$retval, [ 'c', $a->[ $_[0] ], $b->[ $_[1] ] ] ); }; my $match = sub { push ( @$retval, [ 'u', $a->[ $_[0] ], $b->[ $_[1] ] ] ); }; traverse_balanced( $a, $b, { MATCH => $match, DISCARD_A => $discard, DISCARD_B => $add, CHANGE => $change, }, @_ ); return wantarray ? @$retval : $retval; } 1; } import Algorithm::Diff qw(traverse_sequences); # End of inserted block for stand-alone version use Getopt::Long ; use strict ; use warnings; use utf8 ; my ($algodiffversion)=split(/ /,$Algorithm::Diff::VERSION); my ($versionstring)=< 0, WHOLE => 1, COARSE => 2, FINE => 3 }; my (@configlist,@labels, @appendsafelist,@excludesafelist, @appendtextlist,@excludetextlist, @appendcontext1list,@appendcontext2list, @packagelist); my ($assign,@config); # Hash where keys corresponds to the names of all included packages (including the documentclass as another package # the optional arguments to the package are the values of the hash elements my ($pkg,%packages); # Defaults $type='UNDERLINE'; $subtype='SAFE'; $floattype='FLOATSAFE'; $mathmarkup=COARSE; $verbose=0; # output debug and intermediate files, set to 0 in final distribution $debug=0; # define character properties sub IsNonAsciiPunct { return <<'END' # Unicode punctuation but excluding ASCII punctuation +utf8::IsPunct -utf8::IsASCII END } sub IsNonAsciiS { return <<'END' # Unicode symbol but excluding ASCII +utf8::IsS -utf8::IsASCII END } my %verbhash; Getopt::Long::Configure('bundling'); GetOptions('type|t=s' => \$type, 'subtype|s=s' => \$subtype, 'floattype|f=s' => \$floattype, 'config|c=s' => \@configlist, 'preamble|p=s' => \$preamblefile, 'encoding|e=s' => \$encoding, 'label|L=s' => \@labels, 'no-label' => \$nolabel, 'visible-label' => \$visiblelabel, 'exclude-safecmd|A=s' => \@excludesafelist, 'replace-safecmd=s' => \$replacesafe, 'append-safecmd|a=s' => \@appendsafelist, 'exclude-textcmd|X=s' => \@excludetextlist, 'replace-textcmd=s' => \$replacetext, 'append-textcmd|x=s' => \@appendtextlist, 'replace-context1cmd=s' => \$replacecontext1, 'append-context1cmd=s' => \@appendcontext1list, 'replace-context2cmd=s' => \$replacecontext2, 'append-context2cmd=s' => \@appendcontext2list, 'show-preamble' => \$showpreamble, 'show-safecmd' => \$showsafe, 'show-textcmd' => \$showtext, 'show-config' => \$showconfig, 'show-all' => \$showall, 'packages=s' => \@packagelist, 'allow-spaces' => \$allowspaces, 'math-markup=s' => \$mathmarkup, 'enable-citation-markup' => \$enablecitmark, 'disable-citation-markup' => \$disablecitmark, 'verbose|V' => \$verbose, 'ignore-warnings' => \$ignorewarnings, 'driver=s'=> \$driver, 'flatten' => \$flatten, 'version' => \$version, 'help|h|H' => \$help); if ( $help ) { usage() ; } if ( $version ) { die $versionstring ; } print STDERR $versionstring if $verbose; if (defined($showall)){ $showpreamble=$showsafe=$showtext=$showconfig=1; } if (defined($mathmarkup)) { $mathmarkup=~tr/a-z/A-Z/; if ( $mathmarkup eq 'OFF' ){ $mathmarkup=OFF; } elsif ( $mathmarkup eq 'WHOLE' ){ $mathmarkup=WHOLE; } elsif ( $mathmarkup eq 'COARSE' ){ $mathmarkup=COARSE; } elsif ( $mathmarkup eq 'FINE' ){ $mathmarkup=FINE; } elsif ( $mathmarkup !~ m/^[0123]$/ ) { die "Illegal value: ($mathmarkup) for option--math-markup. Possible values: OFF,WHOLE,COARSE,FINE,0- "; } # else use numerical value } # setting extra preamble commands if (defined($preamblefile)) { $latexdiffpreamble=join "\n",(extrapream($preamblefile),""); } else { $latexdiffpreamble=join "\n",(extrapream($type,$subtype,$floattype),""); } if ( defined($driver) ) { # for changebar only $latexdiffpreamble=~s/\[dvips\]/[$driver]/sg; } # setting up @SAFECMDLIST and @SAFECMDEXCL if (defined($replacesafe)) { init_regex_arr_ext(\@SAFECMDLIST,$replacesafe); } else { init_regex_arr_data(\@SAFECMDLIST, "SAFE COMMANDS"); } foreach $appendsafe ( @appendsafelist ) { init_regex_arr_ext(\@SAFECMDLIST, $appendsafe); } foreach $excludesafe ( @excludesafelist ) { init_regex_arr_ext(\@SAFECMDEXCL, $excludesafe); } # Special: treat all cite commands as safe except in UNDERLINE and FONTSTRIKE mode # (there is a conflict between citation and ulem package, see # package documentation) # Use post-processing if ( uc($type) ne "UNDERLINE" && uc($type) ne "FONTSTRIKE" && uc($type) ne "CULINECHBAR" ) { push (@SAFECMDLIST, qr/^cite.*$/); } else { ### Experimental: disable text and emph commands push (@SAFECMDLIST, qr/^cite.*$/) unless $disablecitmark; push(@SAFECMDEXCL, qr/^emph$/, qr/^text..$/); # replace \cite{..} by \mbox{\cite{..}} in added or deleted blocks in post-processing if ( uc($subtype) eq "COLOR" or uc($subtype) eq "DVIPSCOL" ) { # remove \cite command again from list of safe commands pop @SAFECMDLIST; # deleted cite commands $CITE2CMD='(?:cite\w*|nocite)' unless $disablecitmark ; # \cite-type commands which should be reinstated in deleted blocks } else { $CITECMD='(?:cite\w*|nocite)' unless $disablecitmark ; # \cite commands which need to be protected within an mbox in UNDERLINE and other modes using ulem } } $CITECMD='(?:cite\w*|nocite)' if $enablecitmark ; # as above for explicit selection # setting up @TEXTCMDLIST and @TEXTCMDEXCL if (defined($replacetext)) { init_regex_arr_ext(\@TEXTCMDLIST,$replacetext); } else { init_regex_arr_data(\@TEXTCMDLIST, "TEXT COMMANDS"); } foreach $appendtext ( @appendtextlist ) { init_regex_arr_ext(\@TEXTCMDLIST, $appendtext); } foreach $excludetext ( @excludetextlist ) { init_regex_arr_ext(\@TEXTCMDEXCL, $excludetext); } # setting up @CONTEXT1CMDLIST ( @CONTEXT1CMDEXCL exist but is always empty ) if (defined($replacecontext1)) { init_regex_arr_ext(\@CONTEXT1CMDLIST,$replacecontext1); } else { init_regex_arr_data(\@CONTEXT1CMDLIST, "CONTEXT1 COMMANDS"); } foreach $appendcontext1 ( @appendcontext1list ) { init_regex_arr_ext(\@CONTEXT1CMDLIST, $appendcontext1); } # setting up @CONTEXT2CMDLIST ( @CONTEXT2CMDEXCL exist but is always empty ) if (defined($replacecontext2)) { init_regex_arr_ext(\@CONTEXT2CMDLIST,$replacecontext2); } else { init_regex_arr_data(\@CONTEXT2CMDLIST, "CONTEXT2 COMMANDS"); } foreach $appendcontext2 ( @appendcontext2list ) { init_regex_arr_ext(\@CONTEXT2CMDLIST, $appendcontext2); } # setting configuration variables @config=(); foreach $config ( @configlist ) { if (-f $config ) { open(FILE,$config) or die ("Couldn't open configuration file $config: $!"); while () { chomp; next if /^\s*#/ || /^\s*%/ || /^\s*$/ ; push (@config,$_); } close(FILE); } else { # foreach ( split(",",$config) ) { # push @config,$_; # } push @config,split(",",$config) } } foreach $assign ( @config ) { $assign=~ m/\s*(\w*)\s*=\s*(\S*)\s*$/ or die "Illegal assignment $assign in configuration list (must be variable=value)"; if ( $1 eq "MINWORDSBLOCK" ) { $MINWORDSBLOCK = $2; } elsif ( $1 eq "FLOATENV" ) { $FLOATENV = $2 ; } elsif ( $1 eq "PICTUREENV" ) { $PICTUREENV = $2 ; } elsif ( $1 eq "MATHENV" ) { $MATHENV = $2 ; } elsif ( $1 eq "MATHREPL" ) { $MATHREPL = $2 ; } elsif ( $1 eq "MATHARRENV" ) { $MATHARRENV = $2 ; } elsif ( $1 eq "MATHARRREPL" ) { $MATHARRREPL = $2 ; } elsif ( $1 eq "ARRENV" ) { $ARRENV = $2 ; } elsif ( $1 eq "COUNTERCMD" ) { $COUNTERCMD = $2 ; } else { die "Unknown variable $1 in assignment.";} } if ( $mathmarkup == COARSE || $mathmarkup == WHOLE ) { push(@MATHTEXTCMDLIST,qr/^MATHBLOCK(?:$MATHENV|$MATHARRENV|SQUAREBRACKET)$/); } foreach $pkg ( @packagelist ) { map { $packages{$_}="" } split(/,/,$pkg) ; } if ($showpreamble) { print "\nPreamble commands:\n"; print $latexdiffpreamble ; } if ($showsafe) { print "\nCommands safe within scope of $ADDOPEN $ADDCLOSE and $DELOPEN $DELCLOSE (unless excluded):\n"; print_regex_arr(@SAFECMDLIST); print "\nCommands not safe within scope of $ADDOPEN $ADDCLOSE and $DELOPEN $DELCLOSE :\n"; print_regex_arr(@SAFECMDEXCL); } if ($showtext) { print "\nCommands with last argument textual (unless excluded) and safe in every context:\n"; print_regex_arr(@TEXTCMDLIST); print "\nContext1 commands (last argument textual, command will be disabled in deleted passages, last argument will be shown as plain text):\n"; print_regex_arr(@CONTEXT1CMDLIST); print "\nContext2 commands (last argument textual, command and its argument will be disabled in deleted passages):\n"; print_regex_arr(@CONTEXT2CMDLIST); print "\nExclude list of Commands with last argument not textual (overrides patterns above):\n"; print_regex_arr(@TEXTCMDEXCL); } if ($showconfig) { print "Configuration variables:\n"; print "MINWORDSBLOCK=$MINWORDSBLOCK\n"; print "FLOATENV=$FLOATENV\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"; } if ($showconfig || $showtext || $showsafe || $showpreamble) { exit 0; } if ( @ARGV != 2 ) { print STDERR "2 and only 2 non-option arguments required. Write latexdiff -h to get help\n"; exit(2); } # Are extra spaces between command arguments permissible? my $extraspace; if ($allowspaces) { $extraspace='\s*'; } else { $extraspace=''; } # append context lists to text lists (as text property is implied) push @TEXTCMDLIST, @CONTEXT1CMDLIST; push @TEXTCMDLIST, @CONTEXT2CMDLIST; push @TEXTCMDLIST, @MATHTEXTCMDLIST if $mathmarkup==COARSE; # internal additions to SAFECMDLIST push(@SAFECMDLIST, qr/^QLEFTBRACE$/, qr/^QRIGHTBRACE$/); # Patterns. These are used by some of the subroutines, too # I can only define them down here because value of extraspace depends on an option my $pat0 = '(?:[^{}])*'; my $pat1 = '(?:[^{}]|\{'.$pat0.'\})*'; my $pat2 = '(?:[^{}]|\{'.$pat1.'\})*'; my $pat3 = '(?:[^{}]|\{'.$pat2.'\})*'; my $pat4 = '(?:[^{}]|\{'.$pat3.'\})*'; my $pat5 = '(?:[^{}]|\{'.$pat4.'\})*'; my $pat6 = '(?:[^{}]|\{'.$pat5.'\})*'; my $brat0 = '(?:[^\[\]]|\\\[|\\\])*'; my $quotemarks = '(?:\'\')|(?:\`\`)'; my $punct='[0.,\/\'\`:;\"\?\(\)\[\]!~\p{IsNonAsciiPunct}\p{IsNonAsciiS}]'; my $number='-?\d*\.\d*'; my $mathpunct='[+=<>\-\|]'; my $and = '&'; my $coords= '[\-.,\s\d]*'; # word: sequence of letters or accents followed by letter my $word='(?:[-\w\d*]|\\\\[\"\'\`~^][A-Za-z\*])+'; my $cmdleftright='\\\\(?:left|right|[Bb]igg?[lrm]?|middle)\s*(?:[()\[\]|]|\\\\(?:[|{}]|\w+))'; my $cmdoptseq='\\\\[\w\d\*]+'.$extraspace.'(?:(?:\['.$brat0.'\]|\{'. $pat6 . '\}|\(' . $coords .'\))'.$extraspace.')*'; my $backslashnl='\\\\\n'; my $oneletcmd='\\\\.\*?(?:\['.$brat0.'\]|\{'. $pat6 . '\})*'; my $math='\$(?:[^$]|\\\$)*?\$|\\\\[(].*?\\\\[)]'; ## the current maths command cannot cope with newline within the math expression my $comment='%.*?\n'; my $pat=qr/(?:\A\s*)?(?:${and}|${quotemarks}|${number}|${word}|$cmdleftright|${cmdoptseq}|${math}|${backslashnl}|${oneletcmd}|${comment}|${punct}|${mathpunct}|\{|\})\s*/ ; # now we are done setting up and can start working my ($oldfile, $newfile) = @ARGV; # check for existence of input files if ( ! -e $oldfile ) { die "Input file $oldfile does not exist."; } if ( ! -e $newfile ) { die "Input file $newfile does not exist."; } # set the labels to be included into the file my ($oldtime,$newtime,$oldlabel,$newlabel); if (defined($labels[0])) { $oldlabel=$labels[0] ; } else { $oldtime=localtime((stat($oldfile))[9]); $oldlabel="$oldfile " . " "x(length($newfile)-length($oldfile)) . $oldtime; } if (defined($labels[1])) { $newlabel=$labels[1] ; } else { $newtime=localtime((stat($newfile))[9]); $newlabel="$newfile " . " "x(length($oldfile)-length($newfile)) . $newtime; } $encoding=guess_encoding($newfile) unless defined($encoding); $encoding = "utf8" if $encoding =~ m/^utf8/i ; if (lc($encoding) eq "utf8" ) { binmode(STDOUT, ":utf8"); binmode(STDERR, ":utf8"); } $old=read_file_with_encoding($oldfile,$encoding); $new=read_file_with_encoding($newfile,$encoding); # reset time exetime(1); ($oldpreamble,$oldbody,$oldpost)=splitdoc($old,'\\\\begin\{document\}','\\\\end\{document\}'); ($newpreamble,$newbody,$newpost)=splitdoc($new,'\\\\begin\{document\}','\\\\end\{document\}'); if ($flatten) { $oldbody=flatten($oldbody,$oldpreamble,$oldfile,$encoding); $newbody=flatten($newbody,$newpreamble,$newfile,$encoding); } my @auxlines; if ( length $oldpreamble && length $newpreamble ) { # pre-process preamble by looking for commands used in \maketitle (title, author, date etc commands) # and marking up content with latexdiff markup @auxlines=preprocess_preamble($oldpreamble,$newpreamble); @oldpreamble = split /\n/, $oldpreamble; @newpreamble = split /\n/, $newpreamble; # If a command is defined in the preamble of the new file, and only uses safe commands, then it can be considered to be safe) (contribution S. Gouezel) # Base this assessment on the new preamble add_safe_commands($newpreamble); %packages=list_packages(@newpreamble) unless %packages; if (defined $packages{"hyperref"} ) { print STDERR "hyperref package detected.\n" if $verbose ; $latexdiffpreamble =~ s/\{\\DIFadd\}/{\\DIFaddtex}/g; $latexdiffpreamble =~ s/\{\\DIFdel\}/{\\DIFdeltex}/g; $latexdiffpreamble .= join "\n",(extrapream("HYPERREF"),""); } print STDERR "Differencing preamble.\n" if $verbose; # insert dummy first line such that line count begins with line 1 (rather than perl's line 0) - just so that line numbers inserted by linediff are correct unshift @newpreamble,''; unshift @oldpreamble,''; @diffpreamble = linediff(\@oldpreamble, \@newpreamble); # remove dummy line again shift @diffpreamble; # add filenames, modification time and latexdiff mark defined($nolabel) or splice @diffpreamble,1,0, "%DIF LATEXDIFF DIFFERENCE FILE", ,"%DIF DEL $oldlabel", "%DIF ADD $newlabel"; if ( @auxlines ) { push @diffpreamble,"%DIF DELETED TITLE COMMANDS FOR MARKUP"; push @diffpreamble,join("\n",@auxlines); } push @diffpreamble,$latexdiffpreamble; push @diffpreamble,'\begin{document}'; } elsif ( !length $oldpreamble && !length $newpreamble ) { @diffpreamble=(); } else { print STDERR "Either both texts must have preamble or neither text must have the preamble.\n"; exit(2); } if (defined $packages{"amsmath"} or defined $packages{"amsart"} or defined $packages{"amsbook"} ) { print STDERR "amsmath package detected.\n" if $verbose ; $MATHARRREPL='align*'; } print STDERR "Preprocessing body. " if $verbose; my ($oldleadin,$newleadin)=preprocess($oldbody,$newbody); # run difference algorithm @diffbody=bodydiff($oldbody, $newbody); $diffbo=join("",@diffbody); if ( $debug ) { open(RAWDIFF,">","latexdiff.debug.bodydiff"); print RAWDIFF $diffbo; close(RAWDIFF); } print STDERR "(",exetime()," s)\n","Postprocessing body. \n " if $verbose; postprocess($diffbo); $diffall =join("\n",@diffpreamble) ; # add visible labels if (defined($visiblelabel)) { # Give information right after \begin{document} (or at the beginning of the text for files without preamble ### if \date command is used, add information to \date argument, otherwise give right after \begin{document} ### $diffall=~s/(\\date$extraspace(?:\[$brat0\])?$extraspace)\{($pat6)\}/$1\{$2 \\ LATEXDIFF comparison \\ Old: $oldlabel \\ New: $newlabel \}/ or $diffbo = "\\begin{verbatim}LATEXDIFF comparison\nOld: $oldlabel\nNew: $newlabel\\end{verbatim}\n$diffbo" ; } $diffall .= "$newleadin$diffbo" ; $diffall .= "\\end{document}$newpost" if length $newpreamble ; if ( lc($encoding) ne "utf8" && lc($encoding) ne "ascii" ) { print STDERR "Encoding output file to $encoding\n" if $verbose; $diffall=Encode::encode($encoding,$diffall); binmode STDOUT; } print $diffall; print STDERR "(",exetime()," s)\n","Done.\n" if $verbose; ## guess_encoding(filename) ## reads the first 20 lines of filename and looks for call of inputenc package ## if found, return the option of this package (encoding), otherwise return ascii sub guess_encoding { my ($filename)=@_; my ($i,$enc); open (FH, $filename) or die("Couldn't open $filename: $!"); $i=0; while () { next if /^\s*%/; # skip comment lines if (m/\\usepackage\[(\w*?)\]\{inputenc\}/) { close(FH); return($1); } last if (++$i > 20 ); # scan at most 20 non-comment lines } close(FH); return("ascii"); } sub read_file_with_encoding { my ($output); my ($filename, $encoding) = @_; if (lc($encoding) eq "utf8" ) { open (FILE, "<:utf8",$filename) or die("Couldn't open $filename: $!"); local $/ ; # locally set record operator to undefined, ie. enable whole-file mode $output=; } elsif ( lc($encoding) eq "ascii") { open (FILE, $filename) or die("Couldn't open $filename: $!"); local $/ ; # locally set record operator to undefined, ie. enable whole-file mode $output=; } else { require Encode; open (FILE, "<",$filename) or die("Couldn't open $filename: $!"); local $/ ; # locally set record operator to undefined, ie. enable whole-file mode $output=; print STDERR "Converting $filename from $encoding to utf8\n" if $verbose; $output=Encode::decode($encoding,$output); } close FILE; if ($^O eq "linux" ) { $output =~ s/\r\n/\n/g ; } return $output; } # %packages=list_packages(@preamble) # scans the arguments for \documentclass and \usepackage statements and constructs a hash # whose keys are the included packages, and whose values are the associated optional arguments sub list_packages { my (@preamble)=@_; my %packages=(); foreach $line ( @preamble ) { # get rid of comments $line=~s/(?catfile($dirname,$fname), "\n" if $debug; # content of file becomes replacement value (use recursion), add \newpage if the command was include ###$replacement=read_file_with_encoding(File::Spec->catfile($dirname,$fname), $encoding) or die "Couldn't find file ",File::Spec->catfile($dirname,$fname),": $!"; $replacement=flatten(read_file_with_encoding(File::Spec->catfile($dirname,$fname), $encoding), $preamble,$filename,$encoding) or die "Couldn't find file ",File::Spec->catfile($dirname,$fname),": $!"; # \include always starts a new page; use explicit \newpage command to simulate this $begline=(defined($1)? $1 : "") ; $newpage=(defined($3)? " \\newpage " : "") ; "$begline$newpage$replacement$newpage"; }/exgm; return($text); } # print_regex_arr(@arr) # prints regex array without x-ism expansion put in by pearl to stdout sub print_regex_arr { my $dumstring; $dumstring = join(" ",@_); # PERL generates string (?-xism:^ref$) for quoted refex ^ref$ $dumstring =~ s/\(\?-xism:\^(.*?)\$\)/$1/g; # remove string and ^,$ marks before output print $dumstring,"\n"; } # @lines=extrapream($type) # reads line from appendix (end of file after __END__ token) sub extrapream { my $type; my @retval=("%DIF PREAMBLE EXTENSION ADDED BY LATEXDIFF") ; my ($copy); while (@_) { $copy=0; $type=shift ; if ( -f $type ) { open (FILE,$type) or die "Cannot open preamble file $type: $!"; print STDERR "Reading preamble file $type\n" if $verbose ; while () { chomp ; if ( $_ =~ m/%DIF PREAMBLE/ ) { push (@retval,"$_"); } else { push (@retval,"$_ %DIF PREAMBLE"); } } } else { # not (-f $type) $type=uc($type); # upcase argument print STDERR "Preamble Internal Type $type\n" if $verbose; while () { if ( m/^%DIF $type/ ) { $copy=1; } elsif ( m/^%DIF END $type/ ) { last; } chomp; push (@retval,"$_ %DIF PREAMBLE") if $copy; } if ( $copy == 0 ) { print STDERR "\nPreamble style $type not implemented.\n"; print STDERR "Write latexdiff -h to get help with available styles\n"; exit(2); } seek DATA,0,0; # rewind DATA handle to file begin } } push (@retval,"%DIF END PREAMBLE EXTENSION ADDED BY LATEXDIFF") ; return @retval; } # ($part1,$part2,$part3)=splitdoc($text,$word1,$word2) # splits $text into 3 parts at $word1 and $word2. # if neither $word1 nor $word2 exist, $part1 and $part3 are empty, $part2 is $text # If only $word1 or $word2 exist but not the other, output an error message. # NB this version avoids $` and $' for performance reason although it only makes a tiny difference # (in one test gain a tenth of a second for a 30s run) sub splitdoc { my ($text,$word1,$word2)=@_; my ($part1,$part2,$part3)=("","",""); my ($rest,$pos); if ( $text =~ m/(^[^%]*)($word1)/mg ) { $pos=pos $text; $part1=substr($text,0,$pos-length($2)); $rest=substr($text,$pos); if ( $rest =~ m/(^[^%]*)($word2)/mg ) { $pos=pos $rest; $part2=substr($rest,0,$pos-length($2)); $part3=substr($rest,$pos); } else { die "$word1 and $word2 not in the correct order or not present as a pair." ; } } else { $part2=$text; die "$word2 present but not $word1." if ( $text =~ m/(^[^%]*)$word2/ms ); } return ($part1,$part2,$part3); } # bodydiff($old,$new) sub bodydiff { my ($oldwords, $newwords) = @_; my @retwords; print STDERR "(",exetime()," s)\n","Splitting into latex tokens \n" if $verbose; print STDERR "Parsing $oldfile \n" if $verbose; my @oldwords = splitlatex($oldwords); print STDERR "Parsing $newfile \n" if $verbose; my @newwords = splitlatex($newwords); if ( $debug ) { open(TOKENOLD,">","latexdiff.debug.tokenold"); print TOKENOLD join("***\n",@oldwords); close(TOKENOLD); open(TOKENNEW,">","latexdiff.debug.tokennew"); print TOKENNEW join("***\n",@newwords); close(TOKENNEW); } print STDERR "(",exetime()," s)\n","Pass 1: Expanding text commands and merging isolated identities with changed blocks " if $verbose; pass1(\@oldwords, \@newwords); print STDERR "(",exetime()," s)\n","Pass 2: inserting DIF tokens and mark up. " if $verbose; if ( $debug ) { open(TOKENOLD,">","latexdiff.debug.tokenold2.tex"); print TOKENOLD join("***\n",@oldwords); close(TOKENOLD); open(TOKENNEW,">","latexdiff.debug.tokennew2.tex"); print TOKENNEW join("***\n",@newwords); close(TOKENNEW); } @retwords=pass2(\@oldwords, \@newwords); return(@retwords); } # @words=splitlatex($string) # split string according to latex rules # Each element of words is either # a word (including trailing spaces and punctuation) # a latex command sub splitlatex { my ($string) = @_ ; # if input is empty, return empty list length($string)>0 or return (); my @retval=($string =~ m/$pat/osg); if (length($string) != length(join("",@retval))) { print STDERR "\nWARNING: Inconsistency in length of input string and parsed string:\n This often indicates faulty or non-standard latex code.\n In many cases you can ignore this and the following warning messages.\n Note that character numbers in the following are counted beginning after \\begin{document} and are only approximate." unless $ignorewarnings; print STDERR "DEBUG Original length ",length($string)," Parsed length ",length(join("",@retval)),"\n" if $debug; print STDERR "DEBUG Input string: |$string|\n" if (length($string)<500) && $debug; print STDERR "DEBUG Token parsing: |",join("+",@retval),"|\n" if (length($string)<500) && $debug ; @retval=(); # slow way only do this if other m//sg method fails my $last = 0; while ( $string =~ m/$pat/osg ) { my $match=$&; if ($last + length $& != pos $string ) { my $pos=pos($string); my $offset=30<$last ? 30 : $last; my $dum=substr($string,$last-$offset,$pos-$last+2*$offset); my $dum1=$dum; my $cnt=$#retval; my $i; $dum1 =~ s/\n/ /g; unless ($ignorewarnings) { print STDERR "\n$dum1\n"; print STDERR " " x 30,"^" x ($pos-$last)," " x 30,"\n"; print STDERR "Missing characters near word " . (scalar @retval) . " character index: " . $last . "-" . pos($string) . " Length: " . length($match) . " Match: |$match| (expected match marked above).\n"; } # put in missing characters `by hand' push (@retval, substr($dum,$offset,$pos-$last-length($match))); # Note: there seems to be a bug in substr with utf8 that made the following line output substr which were too long, # using dum instead appears to work # push (@retval, substr($string,$last, pos($string)-$last-length($match))); } push (@retval, $match); $last=pos $string; } } return @retval; } # pass1( \@seq1,\@seq2) # Look for differences between seq1 and seq2. # Where an common-subsequence block is flanked by deleted or appended blocks, # and is shorter than $MINWORDSBLOCK words it is appended # to the last deleted or appended word. If the block contains tokens other than words # or punctuation it is not merged. # Deleted or appended block consisting of words and safe commands only are # also merged, to prevent break-up in pass2 (after previous isolated words have been removed) # If there are commands with textual arguments (e.g. \caption) both in corresponding # appended and deleted blocks split them such that the command and opening bracket # are one token, then the rest is split up following standard rules, and the closing # bracket is a separate token, ie. turn # "\caption{This is a textual argument}" into # ("\caption{","This ","is ","a ","textual ","argument","}") # No return value. Destructively changes sequences sub pass1 { my $seq1 = shift ; my $seq2 = shift ; my $len1 = scalar @$seq1; my $len2 = scalar @$seq2; my $wpat=qr/^(?:[a-zA-Z.,'`:;?()!]*)[\s~]*$/; #' my ($last1,$last2)=(-1,-1) ; my $cnt=0; my $block=[]; my $addblock=[]; my $delblock=[]; my $todo=[]; my $instruction=[]; my $i; my (@delmid,@addmid,@dummy); my ($addcmds,$delcmds,$matchindex); my ($addtextblocks,$deltextblocks); my ($addtokcnt,$deltokcnt,$mattokcnt)=(0,0,0); my ($addblkcnt,$delblkcnt,$matblkcnt)=(0,0,0); my $adddiscard = sub { if ($cnt > 0 ) { $matblkcnt++; # just after an unchanged block # print STDERR "Unchanged block $cnt, $last1,$last2 \n"; if ($cnt < $MINWORDSBLOCK && $cnt==scalar ( grep { /^$wpat/ || ( /^\\([\w\d\*]+)((?:\[$brat0\]|\{$pat6\})*)/o && iscmd($1,\@SAFECMDLIST,\@SAFECMDEXCL) && scalar(@dummy=split(" ",$2))<3 ) } @$block) ) { # merge identical blocks shorter than $MINWORDSBLOCK # and only containing ordinary words # with preceding different word # We cannot carry out this merging immediately as this # would change the index numbers of seq1 and seq2 and confuse # the algorithm, instead we store in @$todo where we have to merge push(@$todo, [ $last1,$last2,$cnt,@$block ]); } $block = []; $cnt=0; $last1=-1; $last2=-1; } }; my $discard=sub { $deltokcnt++; &$adddiscard; #($_[0],$_[1]); push(@$delblock,[ $seq1->[$_[0]],$_[0] ]); $last1=$_[0] }; my $add = sub { $addtokcnt++; &$adddiscard; #($_[0],$_[1]); push(@$addblock,[ $seq2->[$_[1]],$_[1] ]); $last2=$_[1] }; my $match = sub { $mattokcnt++; if ($cnt==0) { # first word of matching sequence after changed sequence or at beginning of word sequence $deltextblocks = extracttextblocks($delblock); $delblkcnt++ if scalar @$delblock; $addtextblocks = extracttextblocks($addblock); $addblkcnt++ if scalar @$addblock; $delcmds = extractcommands($delblock); $addcmds = extractcommands($addblock); # keygen(third argument of _longestCommonSubsequence) implies to sort on command (0th elements of $addcmd elements) # the calling format for longestCommonSubsequence has changed between versions of # Algorithm::Diff so we need to check which one we are using if ( $algodiffversion > 1.15 ) { ### Algorithm::Diff 1.19 $matchindex=Algorithm::Diff::_longestCommonSubsequence($delcmds,$addcmds, 0, sub { $_[0]->[0] } ); } else { ### Algorithm::Diff 1.15 $matchindex=Algorithm::Diff::_longestCommonSubsequence($delcmds,$addcmds, sub { $_[0]->[0] } ); } for ($i=0 ; $i<=$#$matchindex ; $i++) { if (defined($matchindex->[$i])){ $j=$matchindex->[$i]; @delmid=splitlatex($delcmds->[$i][3]); @addmid=splitlatex($addcmds->[$j][3]); while (scalar(@$deltextblocks) && $deltextblocks->[0][0]<$delcmds->[$i][1]) { my ($index,$block,$cnt)=@{ shift(@$deltextblocks) }; push(@$todo, [$index,-1,$cnt,@$block]); } push(@$todo, [ $delcmds->[$i][1],-1,-1,$delcmds->[$i][2],@delmid,$delcmds->[$i][4]]); while (scalar(@$addtextblocks) && $addtextblocks->[0][0]<$addcmds->[$j][1]) { my ($index,$block,$cnt)=@{ shift(@$addtextblocks) }; push(@$todo, [-1,$index,$cnt,@$block]); } push(@$todo, [ -1,$addcmds->[$j][1],-1,$addcmds->[$j][2],@addmid,$addcmds->[$j][4]]); } } # mop up remaining textblocks while (scalar(@$deltextblocks)) { my ($index,$block,$cnt)=@{ shift(@$deltextblocks) } ; push(@$todo, [$index,-1,$cnt,@$block]); } while (scalar(@$addtextblocks)) { my ($index,$block,$cnt)=@{ shift(@$addtextblocks) }; push(@$todo, [-1,$index,$cnt,@$block]); } $addblock=[]; $delblock=[]; } push(@$block,$seq2->[$_[1]]); $cnt++ }; my $keyfunc = sub { join(" ",split(" ",shift())) }; traverse_sequences($seq1,$seq2, { MATCH=>$match, DISCARD_A=>$discard, DISCARD_B=>$add }, $keyfunc ); # now carry out the merging/splitting. Refer to elements relative from # the end (with negative indices) as these offsets don't change before the instruction is executed # cnt>0: merged small unchanged groups with previous changed blocks # cnt==-1: split textual commands into components foreach $instruction ( @$todo) { ($last1,$last2,$cnt,@$block)=@$instruction ; if ($cnt>=0) { splice(@$seq1,$last1-$len1,1+$cnt,join("",$seq1->[$last1-$len1],@$block)) if $last1>=0; splice(@$seq2,$last2-$len2,1+$cnt,join("",$seq2->[$last2-$len2],@$block)) if $last2>=0; } else { splice(@$seq1,$last1-$len1,1,@$block) if $last1>=0; splice(@$seq2,$last2-$len2,1,@$block) if $last2>=0; } } if ($verbose) { print STDERR "\n"; print STDERR " $mattokcnt matching tokens in $matblkcnt blocks.\n"; print STDERR " $deltokcnt discarded tokens in $delblkcnt blocks.\n"; print STDERR " $addtokcnt appended tokens in $addblkcnt blocks.\n"; } } # extracttextblocks(\@blockindex) # $blockindex has the following format # [ [ token1, index1 ], [token2, index2],.. ] # where index refers to the index in the original old or new word sequence # Returns: reference to an array of the form # [[ $index, $textblock, $cnt ], .. # where $index index of block to be merged # $textblock contains all the words to be merged with the word at $index (but does not contain this word) # $cnt is length of block # # requires: iscmd # sub extracttextblocks { my $block=shift; my ($i,$token,$index); my $textblock=[]; my $last=-1; my $wpat=qr/^(?:[a-zA-Z.,'`:;?()!]*)[\s~]*$/; #' my $retval=[]; for ($i=0;$i< scalar @$block;$i++) { ($token,$index)=@{ $block->[$i] }; # store pure text blocks if ($token =~ /$wpat/ || ( $token =~/^\\([\w\d\*]+)((?:${extraspace}\[$brat0\]${extraspace}|${extraspace}\{$pat6\})*)/o && iscmd($1,\@SAFECMDLIST,\@SAFECMDEXCL) && !iscmd($1,\@TEXTCMDLIST,\@TEXTCMDEXCL))) { # we have text or a command which can be treated as text if ($last<0) { # new pure-text block $last=$index; } else { # add to pure-text block push(@$textblock, $token); } } else { # it is not text if (scalar(@$textblock)) { push(@$retval,[ $last, $textblock, scalar(@$textblock) ]); } $textblock=[]; $last=-1; } } # finish processing a possibly unfinished block before returning if (scalar(@$textblock)) { push(@$retval,[ $last, $textblock, scalar(@$textblock) ]); } return($retval) } # extractcommands( \@blockindex ) # $blockindex has the following format # [ [ token1, index1 ], [token2, index2],.. ] # where index refers to the index in the original old or new word sequence # Returns: reference to an array of the form # [ [ "\cmd1", index, "\cmd1[optarg]{arg1}{", "arg2" ,"} " ],.. # where index is just taken from input array # command must have a textual argument as last argument # # requires: iscmd # sub extractcommands { my $block=shift; my ($i,$token,$index,$cmd,$open,$mid,$closing); my $retval=[]; for ($i=0;$i< scalar @$block;$i++) { ($token,$index)=@{ $block->[$i] }; # check if token is an alphanumeric command sequence with at least one non-optional argument # \cmd[...]{...}{last argument} # Capturing in the following results in these associations # $1: \cmd[...]{...}{ # $2: \cmd # $3: last argument # $4: } + trailing spaces if ( ( $token =~ m/^(\\([\w\d\*]+)(?:${extraspace}\[$brat0\]|${extraspace}\{$pat6\})*${extraspace}\{)($pat6)(\}\s*)$/so ) && iscmd($2,\@TEXTCMDLIST,\@TEXTCMDEXCL) ) { # push(@$retval,[ $2,$index,$1,$3,$4 ]); ($cmd,$open,$mid,$closing) = ($2,$1,$3,$4) ; $closing =~ s/\}/\\RIGHTBRACE/ ; push(@$retval,[ $cmd,$index,$open,$mid,$closing ]); } } return $retval; } # iscmd($cmd,\@regexarray,\@regexexcl) checks # return 1 if $cmd matches any of the patterns in the # array $@regexarray, and none of the patterns in \@regexexcl, otherwise return 0 sub iscmd { my ($cmd,$regexar,$regexexcl)=@_; my ($ret)=0; foreach $pat ( @$regexar ) { if ( $cmd =~ m/^${pat}$/ ) { $ret=1 ; last; } } return 0 unless $ret; foreach $pat ( @$regexexcl ) { return 0 if ( $cmd =~ m/^${pat}$/ ); } return 1; } # pass2( \@seq1,\@seq2) # Look for differences between seq1 and seq2. # Mark begin and end of deleted and appended sequences with tags $DELOPEN and $DELCLOSE # and $ADDOPEN and $ADDCLOSE, respectively, however exclude { } & and all comands, unless # they match an element of the whitelist (SAFECMD) # For words in TEXTCMD but not in SAFECMD, enclose interior with $ADDOPEN and $ADDCLOSE brackets # Deleted comment lines are marked with %DIF < # Added comment lines are marked with %DIF > sub pass2 { my $seq1 = shift ; my $seq2 = shift ; my ($addtokcnt,$deltokcnt,$mattokcnt)=(0,0,0); my ($addblkcnt,$delblkcnt,$matblkcnt)=(0,0,0); my $retval = []; my $delhunk = []; my $addhunk = []; my $discard = sub { $deltokcnt++; push ( @$delhunk, $seq1->[$_[0]]) }; my $add = sub { $addtokcnt++; push ( @$addhunk, $seq2->[$_[1]]) }; my $match = sub { $mattokcnt++; if ( scalar @$delhunk ) { $delblkcnt++; # mark up changes, but comment out commands push @$retval,marktags($DELMARKOPEN,$DELMARKCLOSE,$DELOPEN,$DELCLOSE,$DELCMDOPEN,$DELCMDCLOSE,$DELCOMMENT,$delhunk); $delhunk = []; } if ( scalar @$addhunk ) { $addblkcnt++; # we mark up changes, but simply quote commands push @$retval,marktags($ADDMARKOPEN,$ADDMARKCLOSE,$ADDOPEN,$ADDCLOSE,"","",$ADDCOMMENT,$addhunk); $addhunk = []; } push(@$retval,$seq2->[$_[1]]) }; my $keyfunc = sub { join(" ",split(" ",shift())) }; traverse_sequences($seq1,$seq2, { MATCH=>$match, DISCARD_A=>$discard, DISCARD_B=>$add }, $keyfunc ); # clear up unprocessed hunks push @$retval,marktags($DELMARKOPEN,$DELMARKCLOSE,$DELOPEN,$DELCLOSE,$DELCMDOPEN,$DELCMDCLOSE,$DELCOMMENT,$delhunk) if scalar @$delhunk; push @$retval,marktags($ADDMARKOPEN,$ADDMARKCLOSE,$ADDOPEN,$ADDCLOSE,"","",$ADDCOMMENT,$addhunk) if scalar @$addhunk; if ($verbose) { print STDERR "\n"; print STDERR " $mattokcnt matching tokens. \n"; print STDERR " $deltokcnt discarded tokens in $delblkcnt blocks.\n"; print STDERR " $addtokcnt appended tokens in $addblkcnt blocks.\n"; } return(@$retval); } # marktags($openmark,$closemark,$open,$close,$opencmd,$closecmd,$comment,\@block) # returns ($openmark,$open,$block,$close,$closemark) if @block only contains no commands (except white-listed ones), # braces, ampersands, or comments # mark comments with $comment # exclude all other exceptions from scope of open, close like this # ($openmark, $open,...,$close, $opencmd,command, command,$closecmd, $open, ..., $close, $closemark) # If $opencmd begins with "%" marktags assumes it is operating on a deleted block, otherwise on an added block sub marktags { my ($openmark,$closemark,$open,$close,$opencmd,$closecmd,$comment,$block)=@_; my $word; my (@argtext); my $retval=[]; my $noncomment=0; my $cmd=-1; # -1 at beginning 0: last token written is a ordinary word # 1: last token written is a command # for keeping track whether we are just in a command sequence or in a word sequence my $cmdcomment= ($opencmd =~ m/^%/); # Flag to indicate whether opencmd is a comment (i.e. if we intend to simply comment out changed commands) my ($command,$commandword,$closingbracket) ; # temporary variables needed below to remember sub-pattern matches # split this block to flatten out sequences joined in pass1 @$block=splitlatex(join "",@$block); foreach (@$block) { $word=$_; if ( $word =~ s/^%/%$comment/ ) { # a comment if ($cmd==1) { push (@$retval,$closecmd) ; $cmd=-1; } push (@$retval,$word); next; } if (! $noncomment) { push (@$retval,$openmark); $noncomment=1; } # negative lookahead pattern (?!) in second clause is put in to avoid mathcing \( .. \) patterns # also note that second pattern will match \\ # Note: the second pattern should really be $word =~ /^\\(?!\()(\\|[\w*@]+)/, ie * replaced by + # and then all commands \" \' etc declared safe. But as I don't have a complete list of one letter # commands, and nobody has complained so far, I will eave this as is if ( $word =~ /^[&{}\[\]]/ || ( $word =~ /^\\(?!\()(\\|[\w*@]*)/ && !iscmd($1,\@SAFECMDLIST,\@SAFECMDEXCL)) ) { # word is a command or other significant token (not in SAFECMDLIST) ## same conditions as in subroutine extractcommand: # check if token is an alphanumeric command sequence with at least one non-optional argument # \cmd[...]{...}{last argument} # Capturing in the following results in these associations # $1: \cmd[...]{...}{ # $2: cmd # $3: last argument # $4: } + trailing spaces ### pre-0.3 if ( ( $token =~ m/^(\\([\w\d\*]+)(?:\[$brat0\]|\{$pat6\})*\{)($pat6)(\}\s*)$/so ) if ( ( $word =~ m/^(\\([\w\d\*]+)(?:${extraspace}\[$brat0\]|${extraspace}\{$pat6\})*${extraspace}\{)($pat6)(\}\s*)$/so ) && (iscmd($2,\@TEXTCMDLIST,\@TEXTCMDEXCL)|| iscmd($2,\@MATHTEXTCMDLIST,\@MATHTEXTCMDEXCL)) && ( !$cmdcomment || !iscmd($2,\@CONTEXT2CMDLIST, \@CONTEXT2CMDEXCL) ) ) { # Condition 1: word is a command? - if yes, $1,$2,.. will be set as above # Condition 2: word is a text command - we mark up the interior of the word. There is a separate check for MATHTEXTCMDLIST # because for $mathmarkup=WHOLE, the commands should not be split in pass1 (ie. math mode commands are not in # TEXTCMDLIST, but the interior of MATHTEXT commands should be highlighted in both deleted and added blocks # Condition 3: But if we are in a deleted block ($cmdcomment=1) and # $2 (the command) is in context2, just treat it as an ordinary command (i.e. comment it open with $opencmd) # Because we do not want to disable this command # here we do not use $opencmd and $closecmd($opencmd is empty) if ($cmd==1) { push (@$retval,$closecmd) ; } elsif ($cmd==0) { push (@$retval,$close) ; } $command=$1; $commandword=$2; $closingbracket=$4; @argtext=splitlatex($3); # split textual argument into tokens # and mark it up (but we do not need openmark and closemark) # insert command with initial arguments, marked-up final argument, and closing bracket if ( $cmdcomment && iscmd($commandword,\@CONTEXT1CMDLIST, \@CONTEXT1CMDEXCL) ) { # context1cmd in a deleted environment; delete command itself but keep last argument, marked up push (@$retval,$opencmd); $command =~ s/\n/\n${opencmd}/sg ; # repeat opencmd at the beginning of each line # argument, note that the additional comment character is included # to suppress linebreak after opening parentheses, which is important # for latexrevise push (@$retval,$command,"%\n{$AUXCMD\n",marktags("","",$open,$close,$opencmd,$closecmd,$comment,\@argtext),$closingbracket); } elsif ( iscmd($commandword,,\@MATHTEXTCMDLIST, \@MATHTEXTCMDEXCL) ) { # MATHBLOCK pseudo command: consider all commands safe, except & and \\ # Keep these commands even in deleted blocks, hence set $opencmd and $closecmd (5th and 6th argument of marktags) to # "" local @SAFECMDLIST=(".*"); local @SAFECMDEXCL=('\\','\\\\'); push(@$retval,$command,marktags("","",$open,$close,"","",$comment,\@argtext)#@argtext ,$closingbracket); } else { # normal textcmd or context1cmd in an added block push (@$retval,$command,marktags("","",$open,$close,$opencmd,$closecmd,$comment,\@argtext),$closingbracket); } push (@$retval,$AUXCMD,"\n") if $cmdcomment ; $cmd=-1 ; } else { # ordinary command push (@$retval,$opencmd) if $cmd==-1 ; push (@$retval,$close,$opencmd) if $cmd==0 ; $word =~ s/\n/\n${opencmd}/sg if $cmdcomment ; # if opencmd is a comment, repeat this at the beginning of every line push (@$retval,$word); $cmd=1; } } else { # just an ordinary word or word in SAFECMD push (@$retval,$open) if $cmd==-1 ; push (@$retval,$closecmd,$open) if $cmd==1 ; push (@$retval,$word); $cmd=0; } } push (@$retval,$close) if $cmd==0; push (@$retval,$closecmd) if $cmd==1; push (@$retval,$closemark) if ($noncomment); return @$retval; } # preprocess($string, ..) # carry out the following pre-processing steps for all arguments: # 1. Remove leading white-space # Change \{ to \LEFTBRACE and \} to \RIGHTBRACE # #. change begin and end commands within comments to BEGINDIF, ENDDIF # so they don't disturb the pattern matching (if there are several \begin or \end in one line # 2. mark all first empty line (in block of several) with \PAR tokens # 3. Convert all '\%' into '\PERCENTAGE ' to make parsing regular expressions easier # 4. Convert all \verb|some verbatim text| commands (where | can be an arbitrary character) # into \verb{hash} # 5. Convert \begin{verbatim} some verbatim text \end{verbatim} into \verbatim{hash} # 6. Convert _n into \SUBSCRIPTNB{n} and _{nnn} into \SUBSCRIPT{nn} # 7. Convert ^n into \SUPERSCRIPTNB{n} and ^{nnn} into \SUPERSCRIPT{nn} # 8. a. Convert $$ $$ into \begin{DOLLARDOLLAR} \end{DOLLARDOLLAR} # b. Convert \[ \] into \begin{SQUAREBRACKET} \end{SQUAREBRACKET} # 9. Convert all picture environmentent (\begin{PICTUREENV} .. \end{PICTUREENV} \PICTUREBLOCKenv # For --block-math-markup option -convert all \begin{MATH} .. \end{MATH} # into \MATHBLOCKmath{...} commands, where MATH/math is any valid math environment # 10. Add final token STOP to the very end. This is put in because the algorithm works better if the last token is identical. This is removed again in postprocessing. # # NB: step 6 and 7 is likely to convert some "_" inappropriately, e.g. in file # names or labels but it does not matter because they are converted back in the postprocessing step # Returns: leading white space removed in step 1 sub preprocess { my @leadin=() ; for (@_) { s/^(\s*)//s; push(@leadin,$1); # Change \{ to \QLEFTBRACE and \} to \QRIGHTBRACE s/(?{$hstr}) && $string ne $hash->{$hstr}) { warn "Repeated hash value for verbatim mode in spite of different content."; $hstr="-$hstr"; } $hash->{$hstr}=$string; return($hstr); } #string=fromhash(\%hash,$fromstring) # restores string value stored in hash #string=fromhash(\%hash,$fromstring,$prependstring) # additionally begins each line with prependstring sub fromhash { my ($hash,$hstr)=($_[0],$_[1]); my $retstr=$hash->{$hstr}; if ( $#_ >= 2) { $retstr =~ s/^/$_[2]/mg; } return $retstr; } # postprocess($string, ..) # carry out the following post-processing steps for all arguments: # * Remove STOP token from the end # * Replace \RIGHTBRACE by } # * change citation commands within comments to protect from processing (using marker CITEDIF) # 1. Check all deleted blocks: # a.where a deleted block contains a matching \begin and # \end environment (these will be disabled by a %DIFDELCMD statements), for selected environments enable # these commands again (such that for example displayed math in a deleted equation # is properly within math mode. For math mode environments replace numbered equation # environments with their display only variety (so that equation numbers in new file and # diff file are identical). Where the correct type of math environment cannot be determined # use a place holder MATHMODE # b.where one of the commands matching $COUNTERCMD is used as a DIFAUXCMD, add a statement # subtracting one from the respective counter to keep numbering consistent with new file # Replace all MATHMODE environment commands by the correct environment to achieve matching # pairs # c. Convert MATHBLOCKmath commands to their uncounted numbers (e.g. convert equation -> displaymath # (environments defined in $MATHENV will be replaced by $MATHREPL, and environments in $MATHARRENV # will be replaced by $MATHARRREPL # d. If in-line math mode contains array environment, enclose the whole environment in \mbox'es # d. place \cite commands in mbox'es (for UNDERLINE style) # # For added blocks: # c. If in-line math mode contains array environment, enclose the whole environment in \mbox'es # d. place \cite commands in mbox'es (for UNDERLINE style) # # 2. If --block-math-markup option set: Convert \MATHBLOCKmath{..} commands back to environments # # Convert all PICTUREblock{..} commands back to the appropriate environments # 3. Convert DIFadd, DIFdel, DIFFaddbegin , ... into FL varieties # within floats (currently recognised float environments: plate,table,figure # plus starred varieties). # 4. Remove empty %DIFDELCMD < lines # 4. Convert \begin{SQUAREBRACKET} \end{SQUAREBRACKET} into \[ \] # Convert \begin{DOLLARDOLLAR} \end{DOLLARDOLLAR} into $$ $$ # 5. Convert \SUPERSCRIPTNB{n} into ^n and \SUPERSCRIPT{nn} into ^{nnn} # 6. Convert \SUBSCRIPTNB{n} into _n and \SUBCRIPT{nn} into _{nnn} # 7. Expand hashes of verb and verbatim environments # 8. Convert '\PERCENTAGE ' back into '\%' # 9.. remove all \PAR tokens # 10. package specific processing: endfloat: make sure \begin{figure} and \end{figure} are always # on a line by themselves, similarly for table environment # 4, undo renaming of the \begin and \end in comments # Change \QLEFTBRACE, \QRIGHTBRACE to \{,\} # # Note have to manually synchronize substitution commands below and # DIF.. command names in the header sub postprocess { my ($begin,$len,$cnt,$float,$delblock,$addblock); # second level blocks my ($begin2,$cnt2,$len2,$eqarrayblock,$mathblock); for (@_) { # change $'s in comments to something harmless 1 while s/(%.*)\$/$1DOLLARDIF/mg ; # Remove final STOP token s/ STOP$//; # Replace \RIGHTBRACE by } s/\\RIGHTBRACE/}/g; # change citation commands within comments to protect from processing if ($CITECMD){ 1 while s/(%.*)\\($CITECMD)/$1\\CITEDIF$2/m ; } # Check all deleted blocks: where a deleted block contains a matching \begin and # \end environment (these will be disabled by a %DIFDELCMD statements), enable # these commands again (such that for example displayed math in a deleted equation # is properly within math mode. For math mode environments replace numbered equation # environments with their display only variety (so that equation numbers in new file and # diff file are identical while ( m/\\DIFdelbegin.*?\\DIFdelend/sg ) { $cnt=0; $len=length($&); $begin=pos($_) - $len; $delblock=$&; ### (.*?[^\n]?)\n? construct is necessary to avoid empty lines in math mode, which result in ### an error # displayed math environments if ($mathmarkup == FINE ) { $delblock=~ s/(\%DIFDELCMD < \s*\\begin\{((?:$MATHENV)|SQUAREBRACKET)\}.*?(?:$DELCMDCLOSE|\n))(.*?[^\n]?)\n?(\%DIFDELCMD < \s*\\end\{\2\})/\\begin{$MATHREPL}$AUXCMD\n$1$3\n\\end{$MATHREPL}$AUXCMD\n$4/sg; # also transform the opposite pair \end{displaymath} .. \begin{displaymath} but we have to be careful not to interfere with the results of the transformation in the line directly above ### pre-0.42 obsolete version which did not work on eqnarray test $delblock=~ s/(? displaymath # (environments defined in $MATHENV will be replaced by $MATHREPL, and environments in $MATHARRENV # will be replaced by $MATHARRREPL $delblock=~ s/\\MATHBLOCK($MATHENV)\{($pat6)\}/\\MATHBLOCK$MATHREPL\{$2\}/sg; $delblock=~ s/\\MATHBLOCK($MATHARRENV)\{($pat6)\}/\\MATHBLOCK$MATHARRREPL\{$2\}/sg; } # b.where one of the commands matching $COUNTERCMD is used as a DIFAUXCMD, add a statement # subtracting one from the respective counter to keep numbering consistent with new file $delblock=~ s/\\($COUNTERCMD)((?:${extraspace}\[$brat0\]${extraspace}|${extraspace}\{$pat6\})*\s*${AUXCMD}\n)/\\$1$2\\addtocounter{$1}{-1}${AUXCMD}\n/sg ; # c. If in-line math mode contains array environment, enclose the whole environment in \mbox'es while ( $delblock =~ m/($math)(\s*)/sg ) { $cnt2=0; $len2=length($&); $begin2=pos($delblock) - $len2; $mathblock="%\n\\mbox{$AUXCMD\n$1\n}$AUXCMD\n"; next unless $mathblock =~ m/\{$ARRENV\}/ ; substr($delblock,$begin2,$len2)=$mathblock; pos($delblock) = $begin2 + length($mathblock); } if ($CITE2CMD) { $delblock=~s/($DELCMDOPEN\s*\\($CITE2CMD)(.*)$DELCMDCLOSE)/ # Replacement code {my ($aux,$all); $aux=$all=$1; $aux=~s#\n?($DELCMDOPEN|$DELCMDCLOSE)##g; $all."$aux$AUXCMD\n";}/sge; } # or protect \cite commands with \mbox if ($CITECMD) { $delblock=~s/(\\($CITECMD)${extraspace}(?:\[$brat0\]${extraspace}){0,2}\{$pat6\})(\s*)/\\mbox{$AUXCMD\n$1\n}$AUXCMD\n/msg ; } # splice in modified delblock substr($_,$begin,$len)=$delblock; pos = $begin + length($delblock); } # make the array modification in added blocks while ( m/\\DIFaddbegin.*?\\DIFaddend/sg ) { $cnt=0; $len=length($&); $begin=pos($_) - $len; $addblock=$&; while ( $addblock =~ m/($math)(\s*)/sg ) { $cnt2=0; $len2=length($&); $begin2=pos($addblock) - $len2; $mathblock="%\n\\mbox{$AUXCMD\n$1\n}$AUXCMD\n"; next unless $mathblock =~ m/\{$ARRENV\}/ ; substr($addblock,$begin2,$len2)=$mathblock; pos($addblock) = $begin2 + length($mathblock); } if ($CITECMD) { my $addblockbefore=$addblock; $addblock=~ s/(\\($CITECMD)${extraspace}(?:\[$brat0\]${extraspace}){0,2}\{$pat2\})(\s*)/\\mbox{$AUXCMD\n$1\n}$AUXCMD\n/msg ; } # splice in modified addblock substr($_,$begin,$len)=$addblock; pos = $begin + length($addblock); } ### old place for BEGINDIF, ENDDIF replacement # change begin and end commands within comments such that they # don't disturb the pattern matching (if there are several \begin or \end in one line # this substitution is insufficient but that appears unlikely) # This needs to be repeated here to also get rid of DIFdelcmd-protected environments s/(%.*)\\begin\{(.*)$/$1\\BEGINDIF\{$2/mg ; s/(%.*)\\end\{(.*)$/$1\\ENDDIF\{$2/mg ; # Replace MATHMODE environments from step 1a above by the correct Math environment # The next line is complicated. The negative look-ahead insertion makes sure that no \end{$MATHENV} (or other mathematical # environments) are between the \begin{$MATHENV} and \end{MATHMODE} commands. This is necessary as the minimal matching # is not globally minimal but only 'locally' (matching is beginning from the left side of the string) if ( $mathmarkup == FINE ) { 1 while s/\\begin{((?:$MATHENV)|(?:$MATHARRENV)|SQUAREBRACKET)}((?:.(?!(?:\\end{(?:(?:$MATHENV)|(?:$MATHARRENV)|SQUAREBRACKET)}|\\begin{MATHMODE})))*?)\\end{MATHMODE}/\\begin{$1}$2\\end{$1}/s; 1 while s/\\begin{MATHMODE}((?:.(?!\\end{MATHMODE}))*?)\\end{((?:$MATHENV)|(?:$MATHARRENV)|SQUAREBRACKET)}/\\begin{$2}$1\\end{$2}/s; # convert remaining \begin{MATHMODE} \end{MATHMODE} (and not containing & or \\ )into MATHREPL environments s/\\begin{MATHMODE}((?:(.(?!(?[1])) { $optargnew=$newhash{$cmd}->[1]; } else { $optargnew=""; } if ( defined($oldhash{$cmd}->[1])) { $optargold=$oldhash{$cmd}->[1]; } else { $optargold=""; } if ( defined($oldhash{$cmd}) ) { $argold=$oldhash{$cmd}->[2]; } else { $argold=""; } $argnew=$newhash{$cmd}->[2]; $argdiff="{" . join("",bodydiff($argold,$argnew)) ."}"; if ( length $optargnew ) { $optargdiff="[".join("",bodydiff($optargold,$optargnew))."]" ; $optargdiff =~ s/\\DIFaddbegin /\\DIFaddbeginFL /g; $optargdiff =~ s/\\DIFaddend /\\DIFaddendFL /g; $optargdiff =~ s/\\DIFadd\{/\\DIFaddFL{/g; $optargdiff =~ s/\\DIFdelbegin /\\DIFdelbeginFL /g; $optargdiff =~ s/\\DIFdelend /\\DIFdelendFL /g; $optargdiff =~ s/\\DIFdel\{/\\DIFdelFL{/g; } else { $optargdiff=""; } ### print STDERR "DEBUG s/\\Q$newhash{$cmd}->[0]\\E/\\$cmd$optargdiff$argdiff/s\n"; # Note: \Q and \E force literal interpretation of what it between them but allow # variable interpolation, such that e.g. \title matches just that and not TAB-itle $$newpreambleref=~s/\Q$newhash{$cmd}->[0]\E/\\$cmd$optargdiff$argdiff/s; # replace this in old preamble if necessary if ( defined($oldhash{$cmd}->[0])) { $$oldpreambleref=~s/\Q$oldhash{$cmd}->[0]\E/\\$cmd$optargdiff$argdiff/s ; } ### print STDERR "DEBUG NEW PRE ".$$newpreambleref."\n"; } foreach $cmd ( keys %oldhash ) { # if this has already been dealt with above can just skip next if defined($newhash{$cmd}) ; if ( defined($oldhash{$cmd}->[1])) { $optargold=$oldhash{$cmd}->[1]; $optargdiff="[".join("",bodydiff($optargold,""))."]" ; $optargdiff =~ s/\\DIFdelbegin /\\DIFdelbeginFL /g; $optargdiff =~ s/\\DIFdelend /\\DIFdelendFL /g; $optargdiff =~ s/\\DIFdel\{/\\DIFdelFL{/g; } else { $optargdiff=""; } $argdiff="{" . join("",bodydiff($argold,"")) ."}"; $auxline = "\\$cmd$optargdiff$argdiff"; $auxline =~s/$/$AUXCMD/sg; push @auxlines,$auxline; } # add auxcmd comment to highlight added lines return(@auxlines); } # @diffs=linediff(\@seq1, \@seq2) # mark up lines like this #%DIF mm-mmdnn #%< old deleted line(s) #%DIF ------- #%DIF mmann-nn #new appended line %< #%DIF ------- # Future extension: mark change explicitly # Assumes: traverse_sequence traverses deletions before insertions in changed sequences # all line numbers relative to line 0 (first line of real file) sub linediff { my $seq1 = shift ; my $seq2 = shift ; my $block = []; my $retseq = []; my @begin=('','',''); # dummy initialisation my $instring ; my $discard = sub { @begin=('d',$_[0],$_[1]) unless scalar @$block ; push(@$block, "%DIF < " . $seq1->[$_[0]]) }; my $add = sub { if (! scalar @$block) { @begin=('a',$_[0],$_[1]) ;} elsif ( $begin[0] eq 'd' ) { $begin[0]='c'; $begin[2]=$_[1]; push(@$block, "%DIF -------") } push(@$block, $seq2->[$_[1]] . " %DIF > " ) }; my $match = sub { if ( scalar @$block ) { if ( $begin[0] eq 'd' && $begin[1]!=$_[0]-1) { $instring = sprintf "%%DIF %d-%dd%d",$begin[1],$_[0]-1,$begin[2]; } elsif ( $begin[0] eq 'a' && $begin[2]!=$_[1]-1) { $instring = sprintf "%%DIF %da%d-%d",$begin[1],$begin[2],$_[1]-1; } elsif ( $begin[0] eq 'c' ) { $instring = sprintf "%%DIF %sc%s", ($begin[1]==$_[0]-1) ? "$begin[1]" : $begin[1]."-".($_[0]-1) , ($begin[2]==$_[1]-1) ? "$begin[2]" : $begin[2]."-".($_[1]-1) ; } else { $instring = sprintf "%%DIF %d%s%d",$begin[1],$begin[0],$begin[2]; } push @$retseq, $instring,@$block, "%DIF -------" ; $block = []; } push @$retseq, $seq2->[$_[1]] }; # key function: remove multiple spaces (such that insertion or deletion of redundant white space is not reported) my $keyfunc = sub { join(" ",split(" ",shift())) }; traverse_sequences($seq1,$seq2, { MATCH=>$match, DISCARD_A=>$discard, DISCARD_B=>$add }, $keyfunc ); push @$retseq, @$block if scalar @$block; return wantarray ? @$retseq : $retseq ; } # init_regex_arr_data(\@array,"TOKEN INIT") # scans DATA file handel for line "%% TOKEN INIT" line # then appends each line not beginning with % into array (as a quoted regex) sub init_regex_arr_data { my ($arr,$token)=@_; my ($copy); while () { if ( m/^%%BEGIN $token\s*$/ ) { $copy=1; } elsif ( m/^%%END $token\s*/ ) { last; } chomp; push (@$arr,qr/^$_$/) if ( $copy && !/^%/ ) ; } seek DATA,0,0; # rewind DATA handle to file begin } # init_regex_arr_ext(\@array,$arg) # fills array with regular expressions. # if arg is a file name, then read in list of regular expressions from that file # (one expression per line) # Otherwise treat arg as a comma separated list of regular expressions sub init_regex_arr_ext { my ($arr,$arg)=@_; my $regex; if ( -f $ arg ) { open(FILE,"$arg") or die ("Couldn't open $arg: $!"); while () { chomp; next if /^\s*#/ || /^\s*%/ || /^\s*$/ ; push (@$arr,qr/^$_$/); } close(FILE); } else { # assume it is a comma-separated list of reg-ex foreach $regex (split(qr/(?=1) { $reset=shift; } if ($reset) { $lasttime=times(); } else { $retval=times()-$lasttime; $lasttime=$lasttime+$retval; return($retval); } } sub usage { die <<"EOF"; Usage: $0 [options] old.tex new.tex > diff.tex Compares two latex files and writes tex code to stdout, which has the same format as new.tex but has all changes relative to old.tex marked up or commented. --type=markupstyle -t markupstyle Add code to preamble for selected markup style Available styles: UNDERLINE CTRADITIONAL TRADITIONAL CFONT FONTSTRIKE INVISIBLE CHANGEBAR CCHANGEBAR CULINECHBAR CFONTCBHBAR [ Default: UNDERLINE ] --subtype=markstyle -s markstyle Add code to preamble for selected style for bracketing commands (e.g. to mark changes in margin) Available styles: SAFE MARGINAL DVIPSCOL COLOR [ Default: SAFE ] --floattype=markstyle -f markstyle Add code to preamble for selected style which replace standard marking and markup commands within floats (e.g., marginal remarks cause an error within floats so marginal marking can be disabled thus) Available styles: FLOATSAFE IDENTICAL [ Default: FLOATSAFE ] --encoding=enc -e enc Specify encoding of old.tex and new.tex. Typical encodings are ascii, utf8, latin1, latin9. A list of available encodings can be obtained by executing perl -MEncode -e 'print join ("\\n",Encode->encodings( ":all" )) ;' [Default encoding is utf8 unless the first few lines of the preamble contain an invocation "\\usepackage[..]{inputenc} in which case the encoding chosen by this command is asssumed. Note that ASCII (standard latex) is a subset of utf8] --preamble=file -p file Insert file at end of preamble instead of auto-generating preamble. The preamble must define the following commands \\DIFaddbegin,\\DIFaddend,\\DIFadd{..}, \\DIFdelbegin,\\DIFdelend,\\DIFdel{..}, and varieties for use within floats \\DIFaddbeginFL,\\DIFaddendFL,\\DIFaddFL{..}, \\DIFdelbeginFL,\\DIFdelendFL,\\DIFdelFL{..} (If this option is set -t, -s, and -f options are ignored.) --exclude-safecmd=exclude-file --exclude-safecmd="cmd1,cmd2,..." -A exclude-file --replace-safecmd=replace-file --append-safecmd=append-file --append-safecmd="cmd1,cmd2,..." -a append-file Exclude from, replace or append to the list of regex matching commands which are safe to use within the scope of a \\DIFadd or \\DIFdel command. The file must contain one Perl-RegEx per line (Comment lines beginning with # or % are ignored). A literal comma within the comma-separated list must be escaped thus "\\,", Note that the RegEx needs to match the whole of the token, i.e., /^regex\$/ is implied and that the initial "\\" of the command is not included. The --exclude-safecmd and --append-safecmd options can be combined with the --replace-safecmd option and can be used repeatedly to add cumulatively to the lists. --exclude-textcmd=exclude-file --exclude-textcmd="cmd1,cmd2,..." -X exclude-file --replace-textcmd=replace-file --append-textcmd=append-file --append-textcmd="cmd1,cmd2,..." -x append-file Exclude from, replace or append to the list of regex matching commands whose last argument is text. See entry for --exclude-safecmd directly above for further details. --replace-context1cmd=replace-file --append-context1cmd=append-file --append-context1cmd="cmd1,cmd2,..." Replace or append to the list of regex matching commands whose last argument is text but which require a particular context to work, e.g. \\caption will only work within a figure or table. These commands behave like text commands, except when they occur in a deleted section, when they are disabled, but their argument is shown as deleted text. --replace-context2cmd=replace-file --append-context2cmd=append-file --append-context2cmd="cmd1,cmd2,..." As corresponding commands for context1. The only difference is that context2 commands are completely disabled in deleted sections, including their arguments. --config var1=val1,var2=val2,... -c var1=val1,.. Set configuration variables. -c configfile Available variables: MINWORDSBLOCK (integer) FLOATENV (RegEx) PICTUREENV (RegEx) MATHENV (RegEx) MATHREPL (String) MATHARRENV (RegEx) MATHARRREPL (String) ARRENV (RegEx) COUNTERCMD (RegEx) This option can be repeated. --packages=pkg1,pkg2,.. Tell latexdiff that .tex file is processed with the packages in list loaded. This is normally not necessary if the .tex file includes the preamble, as the preamble is automatically scanned for \\usepackage commands. Use of the --packages option disables automatic scanning, so if for any reason package specific parsing needs to be switched off, use --packages=none. The following packages trigger special behaviour: endfloat hyperref amsmath [ Default: scan the preamble for \\usepackage commands to determine loaded packages.] --show-preamble Print generated or included preamble commands to stdout. --show-safecmd Print list of regex matching and excluding safe commands. --show-textcmd Print list of regex matching and excluding commands with text argument. --show-config Show values of configuration variables --show-all Show all of the above NB For all --show commands, no old.tex or new.tex file needs to be given, and no differencing takes place. Other configuration options: --allow-spaces Allow spaces between bracketed or braced arguments to commands [Default requires arguments to directly follow each other without intervening spaces] --math-markup=level Determine granularity of markup in displayed math environments: Possible values for level are (both numerical and text labels are acceptable): off or 0: suppress markup for math environments. Deleted equations will not appear in diff file. This mode can be used if all the other modes cause invalid latex code. whole or 1: Differencing on the level of whole equations. Even trivial changes to equations cause the whole equation to be marked changed. This mode can be used if processing in coarse or fine mode results in invalid latex code. coarse or 2: Detect changes within equations marked up with a coarse granularity; changes in equation type (e.g.displaymath to equation) appear as a change to the complete equation. This mode is recommended for situations where the content and order of some equations are still being changed. [Default] fine or 3: Detect small change in equations and mark up and fine granularity. This mode is most suitable, if only minor changes to equations are expected, e.g. correction of typos. --disable-citation-markup Suppress citation markup in styles using ulem (UNDERLINE, FONTSTRIKE, CULINECHBAR) --enable-citation-markup Protect citation commands in changed sections with \\mbox command [i.e. use default behaviour for ulem package for other packages] Miscelleneous options --label=label -L label Sets the labels used to describe the old and new files. The first use of this option sets the label describing the old file and the second use of the option sets the label for the new file. [Default: use the filename and modification dates for the label] --no-label Suppress inclusion of old and new file names as comment in output file --visble-label Include old and new filenames (or labels set with --label option) as visible output --flatten Replace \\input and \\include commands within body by the content of the files in their argument. If \\includeonly is present in the preamble, only those files are expanded into the document. However, no recursion is done, i.e. \\input and \\include commands within included sections are not expanded. The included files are assumed to be located in the same directories as the old and new master files, respectively, making it possible to organise files into old and new directories. --flatten is applied recursively, so inputted files can contain further \\input statements. --help -h Show this help text. --ignore-warnings Suppress warnings about inconsistencies in length between input and parsed strings and missing characters. --verbose -V Output various status information to stderr during processing. Default is to work silently. --version Show version number. For further information, consult http://latexdiff.berlios.de EOF } =head1 NAME latexdiff - determine and markup differences between two latex files =head1 SYNOPSIS B [ B ] F F > F =head1 DESCRIPTION Briefly, I is a utility program to aid in the management of revisions of latex documents. It compares two valid latex files, here called C and C, finds significant differences between them (i.e., ignoring the number of white spaces and position of line breaks), and adds special commands to highlight the differences. Where visual highlighting is not possible, e.g. for changes in the formatting, the differences are nevertheless marked up in the source. The program treats the preamble differently from the main document. Differences between the preambles are found using line-based differencing (similarly to the Unix diff command, but ignoring white spaces). A comment, "S>>" is appended to each added line, i.e. a line present in C but not in C. Discarded lines are deactivated by prepending "S>>". Changed blocks are preceded by comment lines giving information about line numbers in the original files. Where there are insignificant differences, the resulting file C will be similar to C. At the end of the preamble, the definitions for I markup commands are inserted. In differencing the main body of the text, I attempts to satisfy the following guidelines (in order of priority): =over 3 =item 1 If both C and C are valid LaTeX, then the resulting C should also be valid LateX. (NB If a few plain TeX commands are used within C or C then C is not guaranteed to work but usually will). =item 2 Significant differences are determined on the level of individual words. All significant differences, including differences between comments should be clearly marked in the resulting source code C. =item 3 If a changed passage contains text or text-producing commands, then running C through LateX should produce output where added and discarded passages are highlighted. =item 4 Where there are insignificant differences, e.g. in the positioning of line breaks, C should follow the formatting of C =back For differencing the same algorithm as I is used but words instead of lines are compared. An attempt is made to recognize blocks which are completely changed such that they can be marked up as a unit. Comments are differenced line by line but the number of spaces within comments is ignored. Commands including all their arguments are generally compared as one unit, i.e., no mark-up is inserted into the arguments of commands. However, for a selected number of commands (for example, C<\caption> and all sectioning commands) the last argument is known to be text. This text is split into words and differenced just as ordinary text (use options to show and change the list of text commands, see below). As the algorithm has no detailed knowledge of LaTeX, it assumes all pairs of curly braces immediately following a command (i.e. a sequence of letters beginning with a backslash) are arguments for that command. As a restriction to condition 1 above it is thus necessary to surround all arguments with curly braces, and to not insert extraneous spaces. For example, write \section{\textem{This is an emphasized section title}} and not \section {\textem{This is an emphasized section title}} or \section\textem{This is an emphasized section title} even though all varieties are the same to LaTeX (but see B<--allow-spaces> option which allows the second variety). For environments whose content does not conform to standard LaTeX or where graphical markup does not make sense all markup commands can be removed by setting the PICTUREENV configuration variable, set by default to C and C environments; see B<--config> option). The latter environment (C) can be used to protect parts of the latex file where the markup results in illegal markup. You have to surround the offending passage in both the old and new file by C<\begin{DIFnomarkup}> and C<\end{DIFnomarkup}>. You must define the environment in the preambles of both old and new documents. I prefer to define it as a null-environment, C<\newenvironment{DIFnomarkup}{}{}> but the choice is yours. Any markup within the environment will be removed, and generally everything within the environment will just be taken from the new file. It is also possible to difference files which do not have a preamble. In this case, the file is processed in the main document mode, but the definitions of the markup commands are not inserted. All markup commands inserted by I begin with "C<\DIF>". Added blocks containing words, commands or comments which are in C but not in C are marked by C<\DIFaddbegin> and C<\DIFaddend>. Discarded blocks are marked by C<\DIFdelbegin> and C<\DIFdelend>. Within added blocks all text is highlighted with C<\DIFadd> like this: C<\DIFadd{Added text block}> Selected `safe' commands can be contained in these text blocks as well (use options to show and change the list of safe commands, see below). All other commands as well as braces "{" and "}" are never put within the scope of C<\DIFadd>. Added comments are marked by prepending "S >>". Within deleted blocks text is highlighted with C<\DIFdel>. Deleted comments are marked by prepending "S >>". Non-safe command and curly braces within deleted blocks are commented out with "S >>". =head1 OPTIONS =head2 Preamble The following options determine the visual markup style by adding the appropriate command definitions to the preamble. See the end of this section for a description of available styles. =over 4 =item B<--type=markupstyle> or B<-t markupstyle> Add code to preamble for selected markup style. This option defines C<\DIFadd> and C<\DIFdel> commands. Available styles: C [ Default: C ] =item B<--subtype=markstyle> or B<-s markstyle> Add code to preamble for selected style for bracketing commands (e.g. to mark changes in margin). This option defines C<\DIFaddbegin>, C<\DIFaddend>, C<\DIFdelbegin> and C<\DIFdelend> commands. Available styles: C [ Default: C ] =item B<--floattype=markstyle> or B<-f markstyle> Add code to preamble for selected style which replace standard marking and markup commands within floats (e.g., marginal remarks cause an error within floats so marginal marking can be disabled thus). This option defines all C<\DIF...FL> commands. Available styles: C [ Default: C ] =item B<--encoding=enc> or B<-e enc> Specify encoding of old.tex and new.tex. Typical encodings are C, C, C, C. A list of available encodings can be obtained by executing Cencodings( ":all" )) ;' > [Default encoding is utf8 unless the first few lines of the preamble contain an invocation C<\usepackage[..]{inputenc}> in which case the encoding chosen by this command is asssumed. Note that ASCII (standard latex) is a subset of utf8] =item B<--preamble=file> or B<-p file> Insert file at end of preamble instead of generating preamble. The preamble must define the following commands C<\DIFaddbegin, \DIFaddend, \DIFadd{..}, \DIFdelbegin,\DIFdelend,\DIFdel{..},> and varieties for use within floats C<\DIFaddbeginFL, \DIFaddendFL, \DIFaddFL{..}, \DIFdelbeginFL, \DIFdelendFL, \DIFdelFL{..}> (If this option is set B<-t>, B<-s>, and B<-f> options are ignored.) =item B<--packages=pkg1,pkg2,..> Tell latexdiff that .tex file is processed with the packages in list loaded. This is normally not necessary if the .tex file includes the preamble, as the preamble is automatically scanned for C<\usepackage> commands. Use of the B<--packages> option disables automatic scanning, so if for any reason package specific parsing needs to be switched off, use B<--packages=none>. The following packages trigger special behaviour: =over 8 =item C Configuration variable amsmath is set to C (Default: C) =item C Ensure that C<\begin{figure}> and C<\end{figure}> always appear by themselves on a line. =item C Change name of C<\DIFadd> and C<\DIFdel> commands to C<\DIFaddtex> and C<\DIFdeltex> and define new C<\DIFadd> and C<\DIFdel> commands, which provide a wrapper for these commands, using them for the text but not for the link defining command (where any markup would cause errors). =back [ Default: scan the preamble for C<\\usepackage> commands to determine loaded packages.] =item B<--show-preamble> Print generated or included preamble commands to stdout. =back =head2 Configuration =over 4 =item B<--exclude-safecmd=exclude-file> or B<-A exclude-file> or B<--exclude-safecmd="cmd1,cmd2,..."> =item B<--replace-safecmd=replace-file> =item B<--append-safecmd=append-file> or B<-a append-file> or B<--append-safecmd="cmd1,cmd2,..."> Exclude from, replace or append to the list of regular expressions (RegEx) matching commands which are safe to use within the scope of a C<\DIFadd> or C<\DIFdel> command. The file must contain one Perl-RegEx per line (Comment lines beginning with # or % are ignored). Note that the RegEx needs to match the whole of the token, i.e., /^regex$/ is implied and that the initial "\" of the command is not included. The B<--exclude-safecmd> and B<--append-safecmd> options can be combined with the -B<--replace-safecmd> option and can be used repeatedly to add cumulatively to the lists. B<--exclude-safecmd> and B<--append-safecmd> can also take a comma separated list as input. If a comma for one of the regex is required, escape it thus "\,". In most cases it will be necessary to protect the comma-separated list from the shell by putting it in quotation marks. =item B<--exclude-textcmd=exclude-file> or B<-X exclude-file> or B<--exclude-textcmd="cmd1,cmd2,..."> =item B<--replace-textcmd=replace-file> =item B<--append-textcmd=append-file> or B<-x append-file> or B<--append-textcmd="cmd1,cmd2,..."> Exclude from, replace or append to the list of regular expressions matching commands whose last argument is text. See entry for B<--exclude-safecmd> directly above for further details. =item B<--replace-context1cmd=replace-file> =item B<--append-context1cmd=append-file> or =item B<--append-context1cmd="cmd1,cmd2,..."> Replace or append to the list of regex matching commands whose last argument is text but which require a particular context to work, e.g. \caption will only work within a figure or table. These commands behave like text commands, except when they occur in a deleted section, when they are disabled, but their argument is shown as deleted text. =item B<--replace-context2cmd=replace-file> =item B<--append-context2cmd=append-file> or =item B<--append-context2cmd="cmd1,cmd2,..."> As corresponding commands for context1. The only difference is that context2 commands are completely disabled in deleted sections, including their arguments. =item B<--config var1=val1,var2=val2,...> or B<-c var1=val1,..> =item B<-c configfile> 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 (integer) C (RegEx) C (RegEx) C (RegEx) C (String) C (RegEx) C (String) C (RegEx) C (RegEx) =item B<--show-safecmd> Print list of RegEx matching and excluding safe commands. =item B<--show-textcmd> Print list of RegEx matching and excluding commands with text argument. =item B<--show-config> Show values of configuration variables. =item B<--show-all> Combine all --show commands. NB For all --show commands, no C or C file needs to be specified, and no differencing takes place. =back =head2 Other configuration options: =over 4 =item B<--allow-spaces> Allow spaces between bracketed or braced arguments to commands. Note that this option might have undesirable side effects (unrelated scope might get lumpeded with preceding commands) so should only be used if the default produces erroneous results. (Default requires arguments to directly follow each other without intervening spaces). =item B<--math-markup=level> Determine granularity of markup in displayed math environments: Possible values for level are (both numerical and text labels are acceptable): C or C<0>: suppress markup for math environments. Deleted equations will not appear in diff file. This mode can be used if all the other modes cause invalid latex code. C or C<1>: Differencing on the level of whole equations. Even trivial changes to equations cause the whole equation to be marked changed. This mode can be used if processing in coarse or fine mode results in invalid latex code. C or C<2>: Detect changes within equations marked up with a coarse granularity; changes in equation type (e.g.displaymath to equation) appear as a change to the complete equation. This mode is recommended for situations where the content and order of some equations are still being changed. [Default] C or C<3>: Detect small change in equations and mark up at fine granularity. This mode is most suitable, if only minor changes to equations are expected, e.g. correction of typos. =item B<--disable-citation-markup> Suppress citation markup in styles using ulem (UNDERLINE, FONTSTRIKE, CULINECHBAR) =item B<--enable-citation-markup> Protect citation commands in changed sections with \\mbox command [i.e. use default behaviour for ulem package for other packages] =back =head2 Miscellaneous =over 4 =item B<--verbose> or B<-V> Output various status information to stderr during processing. Default is to work silently. =item B<--driver=type> Choose driver for changebar package (only relevant for styles using changebar: CCHANGEBAR CFONTCHBAR CULINECHBAR CHANGEBAR). Possible drivers are listed in changebar manual, e.g. pdftex,dvips,dvitops [Default: dvips] =item B<--ignore-warnings> Suppress warnings about inconsistencies in length between input and parsed strings and missing characters. These warning messages are often related to non-standard latex or latex constructions with a syntax unknown to C but the resulting difference argument is often fully functional anyway, particularly if the non-standard latex only occurs in parts of the text which have not changed. =item B<--label=label> or B<-L label> Sets the labels used to describe the old and new files. The first use of this option sets the label describing the old file and the second use of the option sets the label for the new file, i.e. set both labels like this C<-L labelold -L labelnew>. [Default: use the filename and modification dates for the label] =item B<--no-label> Suppress inclusion of old and new file names as comment in output file =item B<--visble-label> Include old and new filenames (or labels set with --label option) as visible output. =item B<--flatten> Replace C<\input> and C<\include> commands within body by the content of the files in their argument. If C<\includeonly> is present in the preamble, only those files are expanded into the document. However, no recursion is done, i.e. C<\input> and C<\include> commands within included sections are not expanded. The included files are assumed to be located in the same directories as the old and new master files, respectively, making it possible to organise files into old and new directories. --flatten is applied recursively, so inputted files can contain further C<\input> statements. Use of this option might result in prohibitive processing times for larger documents, and the resulting difference document no longer reflects the structure of the input documents. =item B<--help> or B<-h> Show help text =item B<--version> Show version number =back =head2 Predefined styles =head2 Major types The major type determine the markup of plain text and some selected latex commands outside floats by defining the markup commands C<\DIFadd{...}> and C<\DIFdel{...}> . =over 10 =item C Added text is wavy-underlined and blue, discarded text is struck out and red (Requires color and ulem packages). Overstriking does not work in displayed math equations such that deleted parts of equation are underlined, not struck out (this is a shortcoming inherent to the ulem package). =item C Added text is blue and set in sans-serif, and a red footnote is created for each discarded piece of text. (Requires color package) =item C Like C but without the use of color. =item C Added text is blue and set in sans-serif, and discarded text is red and very small size. =item C Added tex is set in sans-serif, discarded text small and struck out =item C Added text is blue, and discarded text is red. Additionally, the changed text is marked with a bar in the margin (Requires color and changebar packages). =item C Like C but with additional changebars (Requires color and changebar packages). =item C Like C but with additional changebars (Requires color, ulem and changebar packages). =item C No mark up of text, but mark margins with changebars (Requires changebar package). =item C No visible markup (but generic markup commands will still be inserted. =back =head2 Subtypes The subtype defines the commands that are inserted at the begin and end of added or discarded blocks, irrespectively of whether these blocks contain text or commands (Defined commands: C<\DIFaddbegin, \DIFaddend, \DIFdelbegin, \DIFdelend>) =over 10 =item C No additional markup (Recommended choice) =item C Mark beginning and end of changed blocks with symbols in the margin nearby (using the standard C<\marginpar> command - note that this sometimes moves somewhat from the intended position. =item C An alternative way of marking added passages in blue, and deleted ones in red. (It is recommeneded to use instead the main types to effect colored markup, although in some cases coloring with dvipscol can be more complete, for example with citation commands). =item C An alternative way of marking added passages in blue, and deleted ones in red. Note that C only works with the dvips converter, e.g. not pdflatex. (it is recommeneded to use instead the main types to effect colored markup, although in some cases coloring with dvipscol can be more complete). =back =head2 Float Types Some of the markup used in the main text might cause problems when used within floats (e.g. figures or tables). For this reason alternative versions of all markup commands are used within floats. The float type defines these alternative commands. =over 10 =item C Use identical markup for text as in the main body, but set all commands marking the begin and end of changed blocks to null-commands. You have to choose this float type if your subtype is C as C<\marginpar> does not work properly within floats. =item C Mark additions the same way as in the main text. Deleted environments are marked by angular brackets \[ and \] and the deleted text is set in scriptscript size. This float type should always be used with the C and C markup types as the \footnote command does not work properly in floating environments. =item C Make no difference between the main text and floats. =back =head2 Configuration Variables =over 10 =item C 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 to the preceding added and discarded parts. [ Default: 3 ] =item C Environments whose name matches the regular expression in C are considered floats. Within these environments, the I markup commands are replaced by their FL variaties. [ Default: S >] =item C Within environments whose name matches the regular expression in C all latexdiff markup is removed (in pathologic cases this might lead to inconsistent markup but this situation should be rare). [ Default: S >] =item C,C If both \begin and \end for a math environment (environment name matching C or \[ and \]) are within the same deleted block, they are replaced by a \begin and \end commands for C rather than being commented out. [ Default: C=S >, C=S >] =item C,C as C,C but for equation arrays [ Default: C=S >, C=S >] =item C If a match to C 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: C=S > =item C If a command in a deleted block which is also in the textcmd list matches C then an additional command C<\addtocounter{>FC<}{-1}>, where F 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=C<(?:footnote|part|section|subsection> ... C<|subsubsection|paragraph|subparagraph)> ] =back =head1 COMMON PROBLEMS =over 10 =item Citations result in overfull boxes There is an incompatibility between the C package, which C uses for underlining and striking out in the UNDERLINE style, the default style. In order to be able to mark up citations properly, they are placed with an C<\mbox> command in post-processing. As mboxes cannot be broken across lines, this procedure frequently results in overfull boxes, possibly obscuring the content as it extends beyond the right margin. If this is a problem, you have two possibilities: 1. Use C or C subtype markup (option C<-s COLOR>): If this markup is chosen, then changed citations are no longer marked up with the wavy line (additions) or struck out (deletions), but are still highlighted in the appropriate color. 2. Choose option C<--disable-citation-markup> which turns off the marking up of citations: deleted citations are no longer shown, and added ctations are shown without markup. (This was the default behaviour of latexdiff at versions 0.6 and older) =item Changes in complicated mathematical equations result in latex processing errors Try options C<--math-markup=whole>. If even that fails, you can turn off mark up for equations with C<--math-markup=off>. =back =head1 BUGS Option allow-spaces not implemented entirely consistently. It breaks the rules that number and type of white space does not matter, as different numbers of inter-argument spaces are treated as significant. Please submit bug reports on the latexdiff project page I, send them to user discussion list C (prior subscription to list required, also on project webpage) or send them to I. Include the serial number of I (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 latex, please send me those files, ideally edited to only contain the offending passage as long as that still reproduces the problem. If your file relies on non-standard class files, you must include those. I will not look at examples where I have trouble to latex the original files. =head1 SEE ALSO L, L =head1 PORTABILITY I does not make use of external commands and thus should run on any platform supporting Perl 5.6 or higher. If files with encodings other than ASCII or UTF-8 are processed, Perl 5.8 or higher is required. The standard version of I requires installation of the Perl package C (available from I - I) but a stand-alone version, I, which has this package inlined, is available, too. I requires the I command to be present. =head1 AUTHOR Version 1.0.2 Copyright (C) 2004-2012 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 Contributors of fixes and additions: V. Kuhlmann, J. Paisley, N. Becker, T. Doerges, K. Huebner, T. Connors, Sebastian Gouezel and many others. Thanks to the many people who send in bug reports, feature suggestions, and other feedback. =cut __END__ %%BEGIN SAFE COMMANDS % Regex matching commands which can safely be in the % argument of a \DIFadd or \DIFdel command (leave out the \) arabic dashbox emph fbox framebox hspace math.* makebox mbox pageref ref symbol raisebox rule text.* shortstack usebox dag ddag copyright pounds S P oe OE ae AE aa AA o O l L frac ss sqrt ldots cdots vdots ddots alpha beta gamma delta epsilon varepsilon zeta eta theta vartheta iota kappa lambda mu nu xi pi varpi rho varrho sigma varsigma tau upsilon phi varphi chi psi omega Gamma Delta Theta Lambda Xi Pi Sigma Upsilon Phi Psi Omega ps mp times div ast star circ bullet cdot cap cup uplus sqcap vee wedge setminus wr diamond (?:big)?triangle.* lhd rhd unlhd unrhd oplus ominus otimes oslash odot bigcirc d?dagger amalg leq prec preceq ll (?:sq)?su[bp]set(?:eq)? in vdash geq succ(?:eq)? gg ni dashv equiv sim(?:eq)? asymp approx cong neq doteq propto models perp mid parallel bowtie Join smile frown .*arrow (?:long)?mapsto .*harpoon.* leadsto aleph hbar imath jmath ell wp Re Im mho prime emptyset nabla surd top bot angle forall exists neg flat natural sharp backslash partial infty Box Diamond triangle clubsuit diamondsuit heartsuit spadesuit sum prod coprod int oint big(?:sq)?c[au]p bigvee bigwedge bigodot bigotimes bigoplus biguplus (?:arc)?(?:cos|sin|tan|cot)h? csc arg deg det dim exp gcd hom inf ker lg lim liminf limsup ln log max min Pr sec sup (SUPER|SUB)SCRIPTNB (SUPER|SUB)SCRIPT %%END SAFE COMMANDS %%BEGIN TEXT COMMANDS % Regex matching commands with a text argument (leave out the \) addcontents.* cc closing chapter dashbox emph encl fbox framebox footnote footnotetext framebox part (sub){0,2}section\*? (sub)?paragraph\*? makebox mbox opening parbox raisebox savebox sbox shortstack signature text.* value underline sqrt (SUPER|SUB)SCRIPT %%END TEXT COMMANDS %%BEGIN CONTEXT1 COMMANDS % Regex matching commands with a text argument (leave out the \), which will fail out of context, but whose argument should be printed as plain text caption %%END CONTEXT1 COMMANDS %%BEGIN CONTEXT2 COMMANDS % Regex matching commands with a text argument (leave out the \), which will fail out of context, but whose argument should be printed as plain text title author date institute %%END CONTEXT2 COMMANDS %% TYPES (Commands for highlighting changed blocks) %DIF UNDERLINE PREAMBLE \RequirePackage[normalem]{ulem} \RequirePackage{color}\definecolor{RED}{rgb}{1,0,0}\definecolor{BLUE}{rgb}{0,0,1} \providecommand{\DIFadd}[1]{{\protect\color{blue}\uwave{#1}}} \providecommand{\DIFdel}[1]{{\protect\color{red}\sout{#1}}} %DIF END UNDERLINE PREAMBLE %DIF CTRADITIONAL PREAMBLE \RequirePackage{color}\definecolor{RED}{rgb}{1,0,0}\definecolor{BLUE}{rgb}{0,0,1} \RequirePackage[stable]{footmisc} \providecommand{\DIFadd}[1]{{\protect\color{blue} \sf #1}} \providecommand{\DIFdel}[1]{{\protect\color{red} [..\footnote{removed: #1} ]}} %DIF END CTRADITIONAL PREAMBLE %DIF TRADITIONAL PREAMBLE \RequirePackage[stable]{footmisc} \providecommand{\DIFadd}[1]{{\sf #1}} \providecommand{\DIFdel}[1]{{[..\footnote{removed: #1} ]}} %DIF END TRADITIONAL PREAMBLE %DIF CFONT PREAMBLE \RequirePackage{color}\definecolor{RED}{rgb}{1,0,0}\definecolor{BLUE}{rgb}{0,0,1} \providecommand{\DIFadd}[1]{{\protect\color{blue} \sf #1}} \providecommand{\DIFdel}[1]{{\protect\color{red} \scriptsize #1}} %DIF END CFONT PREAMBLE %DIF FONTSTRIKE PREAMBLE \RequirePackage[normalem]{ulem} \providecommand{\DIFadd}[1]{{\sf #1}} \providecommand{\DIFdel}[1]{{\footnotesize \sout{#1}}} %DIF END FONTSTRIKE PREAMBLE %DIF CCHANGEBAR PREAMBLE \RequirePackage[dvips]{changebar} \RequirePackage{color}\definecolor{RED}{rgb}{1,0,0}\definecolor{BLUE}{rgb}{0,0,1} \providecommand{\DIFadd}[1]{\protect\cbstart{\protect\color{blue}#1}\protect\cbend} \providecommand{\DIFdel}[1]{\protect\cbdelete{\protect\color{red}#1}\protect\cbdelete} %DIF END CCHANGEBAR PREAMBLE %DIF CFONTCHBAR PREAMBLE \RequirePackage[dvips]{changebar} \RequirePackage{color}\definecolor{RED}{rgb}{1,0,0}\definecolor{BLUE}{rgb}{0,0,1} \providecommand{\DIFadd}[1]{\protect\cbstart{\protect\color{blue}\sf #1}\protect\cbend} \providecommand{\DIFdel}[1]{\protect\cbdelete{\protect\color{red}\scriptsize #1}\protect\cbdelete} %DIF END CFONTCHBAR PREAMBLE %DIF CULINECHBAR PREAMBLE \RequirePackage[normalem]{ulem} \RequirePackage[dvips]{changebar} \RequirePackage{color} \providecommand{\DIFadd}[1]{\protect\cbstart{\protect\color{blue}\uwave{#1}}\protect\cbend} \providecommand{\DIFdel}[1]{\protect\cbdelete{\protect\color{red}\sout{#1}}\protect\cbdelete} %DIF END CULINECHBAR PREAMBLE %DIF CHANGEBAR PREAMBLE \RequirePackage[dvips]{changebar} \providecommand{\DIFadd}[1]{\protect\cbstart{#1}\protect\cbend} \providecommand{\DIFdel}[1]{\protect\cbdelete} %DIF END CHANGEBAR PREAMBLE %DIF INVISIBLE PREAMBLE \providecommand{\DIFadd}[1]{#1} \providecommand{\DIFdel}[1]{} %DIF END INVISIBLE PREAMBLE %% SUBTYPES (Markers for beginning and end of changed blocks) %DIF SAFE PREAMBLE \providecommand{\DIFaddbegin}{} \providecommand{\DIFaddend}{} \providecommand{\DIFdelbegin}{} \providecommand{\DIFdelend}{} %DIF END SAFE PREAMBLE %DIF MARGIN PREAMBLE \providecommand{\DIFaddbegin}{\protect\marginpar{a[}} \providecommand{\DIFaddend}{\protect\marginpar{]}} \providecommand{\DIFdelbegin}{\protect\marginpar{d[}} \providecommand{\DIFdelend}{\protect\marginpar{]}} %DIF END BRACKET PREAMBLE %DIF DVIPSCOL PREAMBLE %Note: only works with dvips converter \RequirePackage{color} \RequirePackage{dvipscol} \providecommand{\DIFaddbegin}{\protect\nogroupcolor{blue}} \providecommand{\DIFaddend}{\protect\nogroupcolor{black}} \providecommand{\DIFdelbegin}{\protect\nogroupcolor{red}} \providecommand{\DIFdelend}{\protect\nogroupcolor{black}} %DIF END DVIPSCOL PREAMBLE %DIF COLOR PREAMBLE \RequirePackage{color} \providecommand{\DIFaddbegin}{\protect\color{blue}} \providecommand{\DIFaddend}{\protect\color{black}} \providecommand{\DIFdelbegin}{\protect\color{red}} \providecommand{\DIFdelend}{\protect\color{black}} %DIF END COLOR PREAMBLE %% FLOAT TYPES %DIF FLOATSAFE PREAMBLE \providecommand{\DIFaddFL}[1]{\DIFadd{#1}} \providecommand{\DIFdelFL}[1]{\DIFdel{#1}} \providecommand{\DIFaddbeginFL}{} \providecommand{\DIFaddendFL}{} \providecommand{\DIFdelbeginFL}{} \providecommand{\DIFdelendFL}{} %DIF END FLOATSAFE PREAMBLE %DIF IDENTICAL PREAMBLE \providecommand{\DIFaddFL}[1]{\DIFadd{#1}} \providecommand{\DIFdelFL}[1]{\DIFdel{#1}} \providecommand{\DIFaddbeginFL}{\DIFaddbegin} \providecommand{\DIFaddendFL}{\DIFaddend} \providecommand{\DIFdelbeginFL}{\DIFdelbegin} \providecommand{\DIFdelendFL}{\DIFdelend} %DIF END IDENTICAL PREAMBLE %DIF TRADITIONALSAFE PREAMBLE % procidecommand color to make this work for TRADITIONAL and CTRADITIONAL \providecommand{\color}[1]{} \providecommand{\DIFaddFL}[1]{\DIFadd{#1}} \providecommand{\DIFdel}[1]{{\protect\color{red}[..{\scriptsize {removed: #1}} ]}} \providecommand{\DIFaddbeginFL}{} \providecommand{\DIFaddendFL}{} \providecommand{\DIFdelbeginFL}{} \providecommand{\DIFdelendFL}{} %DIF END FLOATSAFE PREAMBLE %% SPECIAL PACKAGE PREAMBLE COMMANDS % Standard \DIFadd and \DIFdel are redefined as \DIFaddtex and \DIFdeltex % when hyperref package is included. %DIF HYPERREF PREAMBLE \providecommand{\DIFadd}[1]{\texorpdfstring{\DIFaddtex{#1}}{#1}} \providecommand{\DIFdel}[1]{\texorpdfstring{\DIFdeltex{#1}}{}} %DIF END HYPERREF PACKAGE latexdiff-1.0.2/example/0000755000076400007640000000000012063451231015006 5ustar tilmanntilmannlatexdiff-1.0.2/example/example-draft.tex0000644000076400007640000000251412063450740020267 0ustar tilmanntilmann\documentclass[12pt,a4paper]{article} \setlength{\topmargin}{-0.2in} \setlength{\textheight}{9.5in} \setlength{\oddsidemargin}{0.0in} \setlength{\textwidth}{6.5in} \title{latexdiff Example - Draft version} \author{F Tilmann} \begin{document} \maketitle \section*{Introduction} This is an extremely simple document that showcases some of latexdiff features. Type \begin{verbatim} latexdiff -t UNDERLINE example-draft.tex example-rev.tex > example-diff.tex \end{verbatim} to create the difference file. You can inspect this file directly. Then run either \begin{verbatim} pdflatex example-diff.tex xpdf example-diff.pdf \end{verbatim} or \begin{verbatim} latex example-diff.tex dvips -o example-diff.ps example-diff.dvi gv example-diff.ps \end{verbatim} to display the markup. \section*{Another section title} A paragraph with a line only in the draft document. More things could be said were it not for the constraints of time and space. More things could be said were it not for the constraints of time and space. And here is a tipo. Here is a table: \begin{tabular}{ll} Name & Description \\ \hline Gandalf & Grey \\ Saruman & White \end{tabular} And sometimes a whole paragraph gets completely rewritten. In this case latexdiff marks up the whole paragraph even if some words in it are identical. No change, no markup! \end{document} latexdiff-1.0.2/example/example-rev.tex0000644000076400007640000000260612063450740017765 0ustar tilmanntilmann\documentclass[12pt,a4paper]{article} \setlength{\topmargin}{-0.2in} \setlength{\textheight}{9.5in} \setlength{\oddsidemargin}{0.0in} \setlength{\textwidth}{6in} \title{latexdiff Example - Revised version} \author{F Tilmann} % Note how in the preamble visual markup is never used (even % if some preamble might eventually end up as visible text.) \begin{document} \maketitle \section*{Introduction} This is an extremely simple document that showcases some of the latexdiff features. Type \begin{verbatim} latexdiff -t UNDERLINE example-draft.tex example-rev.tex > example-diff.tex \end{verbatim} to create the difference file. You can inspect this file directly. Then run either \begin{verbatim} pdflatex example-diff.tex xpdf example-diff.pdf \end{verbatim} or \begin{verbatim} latex example-diff.tex dvips -o example-diff.ps example-diff.dvi gv example-diff.ps \end{verbatim} to display the markup. \section*{Yet another section title} More things could be said were it not for the constraints of time and space. A paragraph with a line only in the revised document. More things could be said were it not for the constraints of time and space. And here is a typo. Here is a table: \begin{tabular}{ll} Name & Description \\ \hline Gandalf & White \\ Saruman & Evil \end{tabular} And now for something completely different, with not a paragraph in sight. No change, no markup! \end{document} latexdiff-1.0.2/COPYING0000644000076400007640000007733212063450740014426 0ustar tilmanntilmann GNU GENERAL PUBLIC LICENSE Version 3, 29 June 2007 Copyright (C) 2007 Free Software Foundation, Inc. Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. Preamble The GNU General Public License is a free, copyleft license for software and other kinds of works. The licenses for most software and other practical works are designed to take away your freedom to share and change the works. By contrast, the GNU General Public License is intended to guarantee your freedom to share and change all versions of a program--to make sure it remains free software for all its users. We, the Free Software Foundation, use the GNU General Public License for most of our software; it applies also to any other work released this way by its authors. You can apply it to your programs, too. When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for them if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs, and that you know you can do these things. To protect your rights, we need to prevent others from denying you these rights or asking you to surrender the rights. Therefore, you have certain responsibilities if you distribute copies of the software, or if you modify it: responsibilities to respect the freedom of others. For example, if you distribute copies of such a program, whether gratis or for a fee, you must pass on to the recipients the same freedoms that you received. You must make sure that they, too, receive or can get the source code. And you must show them these terms so they know their rights. Developers that use the GNU GPL protect your rights with two steps: (1) assert copyright on the software, and (2) offer you this License giving you legal permission to copy, distribute and/or modify it. For the developers' and authors' protection, the GPL clearly explains that there is no warranty for this free software. For both users' and authors' sake, the GPL requires that modified versions be marked as changed, so that their problems will not be attributed erroneously to authors of previous versions. Some devices are designed to deny users access to install or run modified versions of the software inside them, although the manufacturer can do so. This is fundamentally incompatible with the aim of protecting users' freedom to change the software. The systematic pattern of such abuse occurs in the area of products for individuals to use, which is precisely where it is most unacceptable. Therefore, we have designed this version of the GPL to prohibit the practice for those products. If such problems arise substantially in other domains, we stand ready to extend this provision to those domains in future versions of the GPL, as needed to protect the freedom of users. Finally, every program is threatened constantly by software patents. States should not allow patents to restrict development and use of software on general-purpose computers, but in those that do, we wish to avoid the special danger that patents applied to a free program could make it effectively proprietary. To prevent this, the GPL assures that patents cannot be used to render the program non-free. The precise terms and conditions for copying, distribution and modification follow. TERMS AND CONDITIONS 0. Definitions. "This License" refers to version 3 of the GNU General Public License. "Copyright" also means copyright-like laws that apply to other kinds of works, such as semiconductor masks. "The Program" refers to any copyrightable work licensed under this License. Each licensee is addressed as "you". "Licensees" and "recipients" may be individuals or organizations. To "modify" a work means to copy from or adapt all or part of the work in a fashion requiring copyright permission, other than the making of an exact copy. The resulting work is called a "modified version" of the earlier work or a work "based on" the earlier work. A "covered work" means either the unmodified Program or a work based on the Program. To "propagate" a work means to do anything with it that, without permission, would make you directly or secondarily liable for infringement under applicable copyright law, except executing it on a computer or modifying a private copy. Propagation includes copying, distribution (with or without modification), making available to the public, and in some countries other activities as well. To "convey" a work means any kind of propagation that enables other parties to make or receive copies. Mere interaction with a user through a computer network, with no transfer of a copy, is not conveying. An interactive user interface displays "Appropriate Legal Notices" to the extent that it includes a convenient and prominently visible feature that (1) displays an appropriate copyright notice, and (2) tells the user that there is no warranty for the work (except to the extent that warranties are provided), that licensees may convey the work under this License, and how to view a copy of this License. If the interface presents a list of user commands or options, such as a menu, a prominent item in the list meets this criterion. 1. Source Code. The "source code" for a work means the preferred form of the work for making modifications to it. "Object code" means any non-source form of a work. A "Standard Interface" means an interface that either is an official standard defined by a recognized standards body, or, in the case of interfaces specified for a particular programming language, one that is widely used among developers working in that language. The "System Libraries" of an executable work include anything, other than the work as a whole, that (a) is included in the normal form of packaging a Major Component, but which is not part of that Major Component, and (b) serves only to enable use of the work with that Major Component, or to implement a Standard Interface for which an implementation is available to the public in source code form. A "Major Component", in this context, means a major essential component (kernel, window system, and so on) of the specific operating system (if any) on which the executable work runs, or a compiler used to produce the work, or an object code interpreter used to run it. The "Corresponding Source" for a work in object code form means all the source code needed to generate, install, and (for an executable work) run the object code and to modify the work, including scripts to control those activities. However, it does not include the work's System Libraries, or general-purpose tools or generally available free programs which are used unmodified in performing those activities but which are not part of the work. For example, Corresponding Source includes interface definition files associated with source files for the work, and the source code for shared libraries and dynamically linked subprograms that the work is specifically designed to require, such as by intimate data communication or control flow between those subprograms and other parts of the work. The Corresponding Source need not include anything that users can regenerate automatically from other parts of the Corresponding Source. The Corresponding Source for a work in source code form is that same work. 2. Basic Permissions. All rights granted under this License are granted for the term of copyright on the Program, and are irrevocable provided the stated conditions are met. This License explicitly affirms your unlimited permission to run the unmodified Program. The output from running a covered work is covered by this License only if the output, given its content, constitutes a covered work. This License acknowledges your rights of fair use or other equivalent, as provided by copyright law. You may make, run and propagate covered works that you do not convey, without conditions so long as your license otherwise remains in force. You may convey covered works to others for the sole purpose of having them make modifications exclusively for you, or provide you with facilities for running those works, provided that you comply with the terms of this License in conveying all material for which you do not control copyright. Those thus making or running the covered works for you must do so exclusively on your behalf, under your direction and control, on terms that prohibit them from making any copies of your copyrighted material outside their relationship with you. Conveying under any other circumstances is permitted solely under the conditions stated below. Sublicensing is not allowed; section 10 makes it unnecessary. 3. Protecting Users' Legal Rights From Anti-Circumvention Law. No covered work shall be deemed part of an effective technological measure under any applicable law fulfilling obligations under article 11 of the WIPO copyright treaty adopted on 20 December 1996, or similar laws prohibiting or restricting circumvention of such measures. When you convey a covered work, you waive any legal power to forbid circumvention of technological measures to the extent such circumvention is effected by exercising rights under this License with respect to the covered work, and you disclaim any intention to limit operation or modification of the work as a means of enforcing, against the work's users, your or third parties' legal rights to forbid circumvention of technological measures. 4. Conveying Verbatim Copies. You may convey verbatim copies of the Program's source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice; keep intact all notices stating that this License and any non-permissive terms added in accord with section 7 apply to the code; keep intact all notices of the absence of any warranty; and give all recipients a copy of this License along with the Program. You may charge any price or no price for each copy that you convey, and you may offer support or warranty protection for a fee. 5. Conveying Modified Source Versions. You may convey a work based on the Program, or the modifications to produce it from the Program, in the form of source code under the terms of section 4, provided that you also meet all of these conditions: a) The work must carry prominent notices stating that you modified it, and giving a relevant date. b) The work must carry prominent notices stating that it is released under this License and any conditions added under section 7. This requirement modifies the requirement in section 4 to "keep intact all notices". c) You must license the entire work, as a whole, under this License to anyone who comes into possession of a copy. This License will therefore apply, along with any applicable section 7 additional terms, to the whole of the work, and all its parts, regardless of how they are packaged. This License gives no permission to license the work in any other way, but it does not invalidate such permission if you have separately received it. d) If the work has interactive user interfaces, each must display Appropriate Legal Notices; however, if the Program has interactive interfaces that do not display Appropriate Legal Notices, your work need not make them do so. A compilation of a covered work with other separate and independent works, which are not by their nature extensions of the covered work, and which are not combined with it such as to form a larger program, in or on a volume of a storage or distribution medium, is called an "aggregate" if the compilation and its resulting copyright are not used to limit the access or legal rights of the compilation's users beyond what the individual works permit. Inclusion of a covered work in an aggregate does not cause this License to apply to the other parts of the aggregate. 6. Conveying Non-Source Forms. You may convey a covered work in object code form under the terms of sections 4 and 5, provided that you also convey the machine-readable Corresponding Source under the terms of this License, in one of these ways: a) Convey the object code in, or embodied in, a physical product (including a physical distribution medium), accompanied by the Corresponding Source fixed on a durable physical medium customarily used for software interchange. b) Convey the object code in, or embodied in, a physical product (including a physical distribution medium), accompanied by a written offer, valid for at least three years and valid for as long as you offer spare parts or customer support for that product model, to give anyone who possesses the object code either (1) a copy of the Corresponding Source for all the software in the product that is covered by this License, on a durable physical medium customarily used for software interchange, for a price no more than your reasonable cost of physically performing this conveying of source, or (2) access to copy the Corresponding Source from a network server at no charge. c) Convey individual copies of the object code with a copy of the written offer to provide the Corresponding Source. This alternative is allowed only occasionally and noncommercially, and only if you received the object code with such an offer, in accord with subsection 6b. d) Convey the object code by offering access from a designated place (gratis or for a charge), and offer equivalent access to the Corresponding Source in the same way through the same place at no further charge. You need not require recipients to copy the Corresponding Source along with the object code. If the place to copy the object code is a network server, the Corresponding Source may be on a different server (operated by you or a third party) that supports equivalent copying facilities, provided you maintain clear directions next to the object code saying where to find the Corresponding Source. Regardless of what server hosts the Corresponding Source, you remain obligated to ensure that it is available for as long as needed to satisfy these requirements. e) Convey the object code using peer-to-peer transmission, provided you inform other peers where the object code and Corresponding Source of the work are being offered to the general public at no charge under subsection 6d. A separable portion of the object code, whose source code is excluded from the Corresponding Source as a System Library, need not be included in conveying the object code work. A "User Product" is either (1) a "consumer product", which means any tangible personal property which is normally used for personal, family, or household purposes, or (2) anything designed or sold for incorporation into a dwelling. In determining whether a product is a consumer product, doubtful cases shall be resolved in favor of coverage. For a particular product received by a particular user, "normally used" refers to a typical or common use of that class of product, regardless of the status of the particular user or of the way in which the particular user actually uses, or expects or is expected to use, the product. A product is a consumer product regardless of whether the product has substantial commercial, industrial or non-consumer uses, unless such uses represent the only significant mode of use of the product. "Installation Information" for a User Product means any methods, procedures, authorization keys, or other information required to install and execute modified versions of a covered work in that User Product from a modified version of its Corresponding Source. The information must suffice to ensure that the continued functioning of the modified object code is in no case prevented or interfered with solely because modification has been made. If you convey an object code work under this section in, or with, or specifically for use in, a User Product, and the conveying occurs as part of a transaction in which the right of possession and use of the User Product is transferred to the recipient in perpetuity or for a fixed term (regardless of how the transaction is characterized), the Corresponding Source conveyed under this section must be accompanied by the Installation Information. But this requirement does not apply if neither you nor any third party retains the ability to install modified object code on the User Product (for example, the work has been installed in ROM). The requirement to provide Installation Information does not include a requirement to continue to provide support service, warranty, or updates for a work that has been modified or installed by the recipient, or for the User Product in which it has been modified or installed. Access to a network may be denied when the modification itself materially and adversely affects the operation of the network or violates the rules and protocols for communication across the network. Corresponding Source conveyed, and Installation Information provided, in accord with this section must be in a format that is publicly documented (and with an implementation available to the public in source code form), and must require no special password or key for unpacking, reading or copying. 7. Additional Terms. "Additional permissions" are terms that supplement the terms of this License by making exceptions from one or more of its conditions. Additional permissions that are applicable to the entire Program shall be treated as though they were included in this License, to the extent that they are valid under applicable law. If additional permissions apply only to part of the Program, that part may be used separately under those permissions, but the entire Program remains governed by this License without regard to the additional permissions. When you convey a copy of a covered work, you may at your option remove any additional permissions from that copy, or from any part of it. (Additional permissions may be written to require their own removal in certain cases when you modify the work.) You may place additional permissions on material, added by you to a covered work, for which you have or can give appropriate copyright permission. Notwithstanding any other provision of this License, for material you add to a covered work, you may (if authorized by the copyright holders of that material) supplement the terms of this License with terms: a) Disclaiming warranty or limiting liability differently from the terms of sections 15 and 16 of this License; or b) Requiring preservation of specified reasonable legal notices or author attributions in that material or in the Appropriate Legal Notices displayed by works containing it; or c) Prohibiting misrepresentation of the origin of that material, or requiring that modified versions of such material be marked in reasonable ways as different from the original version; or d) Limiting the use for publicity purposes of names of licensors or authors of the material; or e) Declining to grant rights under trademark law for use of some trade names, trademarks, or service marks; or f) Requiring indemnification of licensors and authors of that material by anyone who conveys the material (or modified versions of it) with contractual assumptions of liability to the recipient, for any liability that these contractual assumptions directly impose on those licensors and authors. All other non-permissive additional terms are considered "further restrictions" within the meaning of section 10. If the Program as you received it, or any part of it, contains a notice stating that it is governed by this License along with a term that is a further restriction, you may remove that term. If a license document contains a further restriction but permits relicensing or conveying under this License, you may add to a covered work material governed by the terms of that license document, provided that the further restriction does not survive such relicensing or conveying. If you add terms to a covered work in accord with this section, you must place, in the relevant source files, a statement of the additional terms that apply to those files, or a notice indicating where to find the applicable terms. Additional terms, permissive or non-permissive, may be stated in the form of a separately written license, or stated as exceptions; the above requirements apply either way. 8. Termination. You may not propagate or modify a covered work except as expressly provided under this License. Any attempt otherwise to propagate or modify it is void, and will automatically terminate your rights under this License (including any patent licenses granted under the third paragraph of section 11). However, if you cease all violation of this License, then your license from a particular copyright holder is reinstated (a) provisionally, unless and until the copyright holder explicitly and finally terminates your license, and (b) permanently, if the copyright holder fails to notify you of the violation by some reasonable means prior to 60 days after the cessation. Moreover, your license from a particular copyright holder is reinstated permanently if the copyright holder notifies you of the violation by some reasonable means, this is the first time you have received notice of violation of this License (for any work) from that copyright holder, and you cure the violation prior to 30 days after your receipt of the notice. Termination of your rights under this section does not terminate the licenses of parties who have received copies or rights from you under this License. If your rights have been terminated and not permanently reinstated, you do not qualify to receive new licenses for the same material under section 10. 9. Acceptance Not Required for Having Copies. You are not required to accept this License in order to receive or run a copy of the Program. Ancillary propagation of a covered work occurring solely as a consequence of using peer-to-peer transmission to receive a copy likewise does not require acceptance. However, nothing other than this License grants you permission to propagate or modify any covered work. These actions infringe copyright if you do not accept this License. Therefore, by modifying or propagating a covered work, you indicate your acceptance of this License to do so. 10. Automatic Licensing of Downstream Recipients. Each time you convey a covered work, the recipient automatically receives a license from the original licensors, to run, modify and propagate that work, subject to this License. You are not responsible for enforcing compliance by third parties with this License. An "entity transaction" is a transaction transferring control of an organization, or substantially all assets of one, or subdividing an organization, or merging organizations. If propagation of a covered work results from an entity transaction, each party to that transaction who receives a copy of the work also receives whatever licenses to the work the party's predecessor in interest had or could give under the previous paragraph, plus a right to possession of the Corresponding Source of the work from the predecessor in interest, if the predecessor has it or can get it with reasonable efforts. You may not impose any further restrictions on the exercise of the rights granted or affirmed under this License. For example, you may not impose a license fee, royalty, or other charge for exercise of rights granted under this License, and you may not initiate litigation (including a cross-claim or counterclaim in a lawsuit) alleging that any patent claim is infringed by making, using, selling, offering for sale, or importing the Program or any portion of it. 11. Patents. A "contributor" is a copyright holder who authorizes use under this License of the Program or a work on which the Program is based. The work thus licensed is called the contributor's "contributor version". A contributor's "essential patent claims" are all patent claims owned or controlled by the contributor, whether already acquired or hereafter acquired, that would be infringed by some manner, permitted by this License, of making, using, or selling its contributor version, but do not include claims that would be infringed only as a consequence of further modification of the contributor version. For purposes of this definition, "control" includes the right to grant patent sublicenses in a manner consistent with the requirements of this License. Each contributor grants you a non-exclusive, worldwide, royalty-free patent license under the contributor's essential patent claims, to make, use, sell, offer for sale, import and otherwise run, modify and propagate the contents of its contributor version. In the following three paragraphs, a "patent license" is any express agreement or commitment, however denominated, not to enforce a patent (such as an express permission to practice a patent or covenant not to sue for patent infringement). To "grant" such a patent license to a party means to make such an agreement or commitment not to enforce a patent against the party. If you convey a covered work, knowingly relying on a patent license, and the Corresponding Source of the work is not available for anyone to copy, free of charge and under the terms of this License, through a publicly available network server or other readily accessible means, then you must either (1) cause the Corresponding Source to be so available, or (2) arrange to deprive yourself of the benefit of the patent license for this particular work, or (3) arrange, in a manner consistent with the requirements of this License, to extend the patent license to downstream recipients. "Knowingly relying" means you have actual knowledge that, but for the patent license, your conveying the covered work in a country, or your recipient's use of the covered work in a country, would infringe one or more identifiable patents in that country that you have reason to believe are valid. If, pursuant to or in connection with a single transaction or arrangement, you convey, or propagate by procuring conveyance of, a covered work, and grant a patent license to some of the parties receiving the covered work authorizing them to use, propagate, modify or convey a specific copy of the covered work, then the patent license you grant is automatically extended to all recipients of the covered work and works based on it. A patent license is "discriminatory" if it does not include within the scope of its coverage, prohibits the exercise of, or is conditioned on the non-exercise of one or more of the rights that are specifically granted under this License. You may not convey a covered work if you are a party to an arrangement with a third party that is in the business of distributing software, under which you make payment to the third party based on the extent of your activity of conveying the work, and under which the third party grants, to any of the parties who would receive the covered work from you, a discriminatory patent license (a) in connection with copies of the covered work conveyed by you (or copies made from those copies), or (b) primarily for and in connection with specific products or compilations that contain the covered work, unless you entered into that arrangement, or that patent license was granted, prior to 28 March 2007. Nothing in this License shall be construed as excluding or limiting any implied license or other defenses to infringement that may otherwise be available to you under applicable patent law. 12. No Surrender of Others' Freedom. If conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot convey a covered work so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not convey it at all. For example, if you agree to terms that obligate you to collect a royalty for further conveying from those to whom you convey the Program, the only way you could satisfy both those terms and this License would be to refrain entirely from conveying the Program. 13. Use with the GNU Affero General Public License. Notwithstanding any other provision of this License, you have permission to link or combine any covered work with a work licensed under version 3 of the GNU Affero General Public License into a single combined work, and to convey the resulting work. The terms of this License will continue to apply to the part which is the covered work, but the special requirements of the GNU Affero General Public License, section 13, concerning interaction through a network will apply to the combination as such. 14. Revised Versions of this License. The Free Software Foundation may publish revised and/or new versions of the GNU General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. Each version is given a distinguishing version number. If the Program specifies that a certain numbered version of the GNU General Public License "or any later version" applies to it, you have the option of following the terms and conditions either of that numbered version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of the GNU General Public License, you may choose any version ever published by the Free Software Foundation. If the Program specifies that a proxy can decide which future versions of the GNU General Public License can be used, that proxy's public statement of acceptance of a version permanently authorizes you to choose that version for the Program. Later license versions may give you additional or different permissions. However, no additional obligations are imposed on any author or copyright holder as a result of your choosing to follow a later version. 15. Disclaimer of Warranty. THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. 16. Limitation of Liability. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. 17. Interpretation of Sections 15 and 16. If the disclaimer of warranty and limitation of liability provided above cannot be given local legal effect according to their terms, reviewing courts shall apply local law that most closely approximates an absolute waiver of all civil liability in connection with the Program, unless a warranty or assumption of liability accompanies a copy of the Program in return for a fee. END OF TERMS AND CONDITIONS latexdiff-1.0.2/latexdiff.10000644000076400007640000011113212063450736015413 0ustar tilmanntilmann.\" Automatically generated by Pod::Man 2.23 (Pod::Simple 3.14) .\" .\" Standard preamble: .\" ======================================================================== .de Sp \" Vertical space (when we can't use .PP) .if t .sp .5v .if n .sp .. .de Vb \" Begin verbatim text .ft CW .nf .ne \\$1 .. .de Ve \" End verbatim text .ft R .fi .. .\" Set up some character translations and predefined strings. \*(-- will .\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left .\" double quote, and \*(R" will give a right double quote. \*(C+ will .\" give a nicer C++. Capital omega is used to do unbreakable dashes and .\" therefore won't be available. \*(C` and \*(C' expand to `' in nroff, .\" nothing in troff, for use with C<>. .tr \(*W- .ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p' .ie n \{\ . ds -- \(*W- . ds PI pi . if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch . if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\" diablo 12 pitch . ds L" "" . ds R" "" . ds C` "" . ds C' "" 'br\} .el\{\ . ds -- \|\(em\| . ds PI \(*p . ds L" `` . ds R" '' 'br\} .\" .\" Escape single quotes in literal strings from groff's Unicode transform. .ie \n(.g .ds Aq \(aq .el .ds Aq ' .\" .\" If the F register is turned on, we'll generate index entries on stderr for .\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index .\" entries marked with X<> in POD. Of course, you'll have to process the .\" output yourself in some meaningful fashion. .ie \nF \{\ . de IX . tm Index:\\$1\t\\n%\t"\\$2" .. . nr % 0 . rr F .\} .el \{\ . de IX .. .\} .\" .\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2). .\" Fear. Run. Save yourself. No user-serviceable parts. . \" fudge factors for nroff and troff .if n \{\ . ds #H 0 . ds #V .8m . ds #F .3m . ds #[ \f1 . ds #] \fP .\} .if t \{\ . ds #H ((1u-(\\\\n(.fu%2u))*.13m) . ds #V .6m . ds #F 0 . ds #[ \& . ds #] \& .\} . \" simple accents for nroff and troff .if n \{\ . ds ' \& . ds ` \& . ds ^ \& . ds , \& . ds ~ ~ . ds / .\} .if t \{\ . ds ' \\k:\h'-(\\n(.wu*8/10-\*(#H)'\'\h"|\\n:u" . ds ` \\k:\h'-(\\n(.wu*8/10-\*(#H)'\`\h'|\\n:u' . ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'^\h'|\\n:u' . ds , \\k:\h'-(\\n(.wu*8/10)',\h'|\\n:u' . ds ~ \\k:\h'-(\\n(.wu-\*(#H-.1m)'~\h'|\\n:u' . ds / \\k:\h'-(\\n(.wu*8/10-\*(#H)'\z\(sl\h'|\\n:u' .\} . \" troff and (daisy-wheel) nroff accents .ds : \\k:\h'-(\\n(.wu*8/10-\*(#H+.1m+\*(#F)'\v'-\*(#V'\z.\h'.2m+\*(#F'.\h'|\\n:u'\v'\*(#V' .ds 8 \h'\*(#H'\(*b\h'-\*(#H' .ds o \\k:\h'-(\\n(.wu+\w'\(de'u-\*(#H)/2u'\v'-.3n'\*(#[\z\(de\v'.3n'\h'|\\n:u'\*(#] .ds d- \h'\*(#H'\(pd\h'-\w'~'u'\v'-.25m'\f2\(hy\fP\v'.25m'\h'-\*(#H' .ds D- D\\k:\h'-\w'D'u'\v'-.11m'\z\(hy\v'.11m'\h'|\\n:u' .ds th \*(#[\v'.3m'\s+1I\s-1\v'-.3m'\h'-(\w'I'u*2/3)'\s-1o\s+1\*(#] .ds Th \*(#[\s+2I\s-2\h'-\w'I'u*3/5'\v'-.3m'o\v'.3m'\*(#] .ds ae a\h'-(\w'a'u*4/10)'e .ds Ae A\h'-(\w'A'u*4/10)'E . \" corrections for vroff .if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u' .if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u' . \" for low resolution devices (crt and lpr) .if \n(.H>23 .if \n(.V>19 \ \{\ . ds : e . ds 8 ss . ds o a . ds d- d\h'-1'\(ga . ds D- D\h'-1'\(hy . ds th \o'bp' . ds Th \o'LP' . ds ae ae . ds Ae AE .\} .rm #[ #] #H #V #F C .\" ======================================================================== .\" .IX Title "LATEXDIFF 1" .TH LATEXDIFF 1 "2012-12-16" "perl v5.12.4" " " .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l .nh .SH "NAME" latexdiff \- determine and markup differences between two latex files .SH "SYNOPSIS" .IX Header "SYNOPSIS" \&\fBlatexdiff\fR [ \fB\s-1OPTIONS\s0\fR ] \fIold.tex\fR \fInew.tex\fR > \fIdiff.tex\fR .SH "DESCRIPTION" .IX Header "DESCRIPTION" Briefly, \fIlatexdiff\fR is a utility program to aid in the management of revisions of latex documents. It compares two valid latex files, here called \f(CW\*(C`old.tex\*(C'\fR and \f(CW\*(C`new.tex\*(C'\fR, finds significant differences between them (i.e., ignoring the number of white spaces and position of line breaks), and adds special commands to highlight the differences. Where visual highlighting is not possible, e.g. for changes in the formatting, the differences are nevertheless marked up in the source. .PP The program treats the preamble differently from the main document. Differences between the preambles are found using line-based differencing (similarly to the Unix diff command, but ignoring white spaces). A comment, "\f(CW\*(C`%DIF\ >\*(C'\fR" is appended to each added line, i.e. a line present in \f(CW\*(C`new.tex\*(C'\fR but not in \f(CW\*(C`old.tex\*(C'\fR. Discarded lines are deactivated by prepending "\f(CW\*(C`%DIF\ <\*(C'\fR". Changed blocks are preceded by comment lines giving information about line numbers in the original files. Where there are insignificant differences, the resulting file \f(CW\*(C`diff.tex\*(C'\fR will be similar to \&\f(CW\*(C`new.tex\*(C'\fR. At the end of the preamble, the definitions for \fIlatexdiff\fR markup commands are inserted. In differencing the main body of the text, \fIlatexdiff\fR attempts to satisfy the following guidelines (in order of priority): .IP "1." 3 If both \f(CW\*(C`old.tex\*(C'\fR and \f(CW\*(C`new.tex\*(C'\fR are valid LaTeX, then the resulting \&\f(CW\*(C`diff.tex\*(C'\fR should also be valid LateX. (\s-1NB\s0 If a few plain TeX commands are used within \f(CW\*(C`old.tex\*(C'\fR or \f(CW\*(C`new.tex\*(C'\fR then \f(CW\*(C`diff.tex\*(C'\fR is not guaranteed to work but usually will). .IP "2." 3 Significant differences are determined on the level of individual words. All significant differences, including differences between comments should be clearly marked in the resulting source code \&\f(CW\*(C`diff.tex\*(C'\fR. .IP "3." 3 If a changed passage contains text or text-producing commands, then running \f(CW\*(C`diff.tex\*(C'\fR through LateX should produce output where added and discarded passages are highlighted. .IP "4." 3 Where there are insignificant differences, e.g. in the positioning of line breaks, \f(CW\*(C`diff.tex\*(C'\fR should follow the formatting of \f(CW\*(C`new.tex\*(C'\fR .PP For differencing the same algorithm as \fIdiff\fR is used but words instead of lines are compared. An attempt is made to recognize blocks which are completely changed such that they can be marked up as a unit. Comments are differenced line by line but the number of spaces within comments is ignored. Commands including all their arguments are generally compared as one unit, i.e., no mark-up is inserted into the arguments of commands. However, for a selected number of commands (for example, \f(CW\*(C`\ecaption\*(C'\fR and all sectioning commands) the last argument is known to be text. This text is split into words and differenced just as ordinary text (use options to show and change the list of text commands, see below). As the algorithm has no detailed knowledge of LaTeX, it assumes all pairs of curly braces immediately following a command (i.e. a sequence of letters beginning with a backslash) are arguments for that command. As a restriction to condition 1 above it is thus necessary to surround all arguments with curly braces, and to not insert extraneous spaces. For example, write .PP .Vb 1 \& \esection{\etextem{This is an emphasized section title}} .Ve .PP and not .PP .Vb 1 \& \esection {\etextem{This is an emphasized section title}} .Ve .PP or .PP .Vb 1 \& \esection\etextem{This is an emphasized section title} .Ve .PP even though all varieties are the same to LaTeX (but see \&\fB\-\-allow\-spaces\fR option which allows the second variety). .PP For environments whose content does not conform to standard LaTeX or where graphical markup does not make sense all markup commands can be removed by setting the \s-1PICTUREENV\s0 configuration variable, set by default to \f(CW\*(C`picture\*(C'\fR and \f(CW\*(C`DIFnomarkup\*(C'\fR environments; see \fB\-\-config\fR option). The latter environment (\f(CW\*(C`DIFnomarkup\*(C'\fR) can be used to protect parts of the latex file where the markup results in illegal markup. You have to surround the offending passage in both the old and new file by \f(CW\*(C`\ebegin{DIFnomarkup}\*(C'\fR and \f(CW\*(C`\eend{DIFnomarkup}\*(C'\fR. You must define the environment in the preambles of both old and new documents. I prefer to define it as a null-environment, .PP \&\f(CW\*(C`\enewenvironment{DIFnomarkup}{}{}\*(C'\fR .PP but the choice is yours. Any markup within the environment will be removed, and generally everything within the environment will just be taken from the new file. .PP It is also possible to difference files which do not have a preamble. In this case, the file is processed in the main document mode, but the definitions of the markup commands are not inserted. .PP All markup commands inserted by \fIlatexdiff\fR begin with "\f(CW\*(C`\eDIF\*(C'\fR". Added blocks containing words, commands or comments which are in \f(CW\*(C`new.tex\*(C'\fR but not in \f(CW\*(C`old.tex\*(C'\fR are marked by \f(CW\*(C`\eDIFaddbegin\*(C'\fR and \f(CW\*(C`\eDIFaddend\*(C'\fR. Discarded blocks are marked by \f(CW\*(C`\eDIFdelbegin\*(C'\fR and \f(CW\*(C`\eDIFdelend\*(C'\fR. Within added blocks all text is highlighted with \f(CW\*(C`\eDIFadd\*(C'\fR like this: \&\f(CW\*(C`\eDIFadd{Added text block}\*(C'\fR Selected `safe' commands can be contained in these text blocks as well (use options to show and change the list of safe commands, see below). All other commands as well as braces \*(L"{\*(R" and \*(L"}\*(R" are never put within the scope of \f(CW\*(C`\eDIFadd\*(C'\fR. Added comments are marked by prepending "\f(CW\*(C`%DIF\ >\ \*(C'\fR". .PP Within deleted blocks text is highlighted with \f(CW\*(C`\eDIFdel\*(C'\fR. Deleted comments are marked by prepending "\f(CW\*(C`%DIF\ <\ \*(C'\fR\*(L". Non-safe command and curly braces within deleted blocks are commented out with \&\*(R"\f(CW\*(C`%DIFDELCMD\ <\ \*(C'\fR". .SH "OPTIONS" .IX Header "OPTIONS" .SS "Preamble" .IX Subsection "Preamble" The following options determine the visual markup style by adding the appropriate command definitions to the preamble. See the end of this section for a description of available styles. .IP "\fB\-\-type=markupstyle\fR or \fB\-t markupstyle\fR" 4 .IX Item "--type=markupstyle or -t markupstyle" Add code to preamble for selected markup style. This option defines \&\f(CW\*(C`\eDIFadd\*(C'\fR and \f(CW\*(C`\eDIFdel\*(C'\fR commands. Available styles: .Sp \&\f(CW\*(C`UNDERLINE CTRADITIONAL TRADITIONAL CFONT FONTSTRIKE INVISIBLE CHANGEBAR CCHANGEBAR CULINECHBAR CFONTCBHBAR\*(C'\fR .Sp [ Default: \f(CW\*(C`UNDERLINE\*(C'\fR ] .IP "\fB\-\-subtype=markstyle\fR or \fB\-s markstyle\fR" 4 .IX Item "--subtype=markstyle or -s markstyle" Add code to preamble for selected style for bracketing commands (e.g. to mark changes in margin). This option defines \&\f(CW\*(C`\eDIFaddbegin\*(C'\fR, \f(CW\*(C`\eDIFaddend\*(C'\fR, \f(CW\*(C`\eDIFdelbegin\*(C'\fR and \f(CW\*(C`\eDIFdelend\*(C'\fR commands. Available styles: \f(CW\*(C`SAFE MARGINAL COLOR DVIPSCOL\*(C'\fR .Sp [ Default: \f(CW\*(C`SAFE\*(C'\fR ] .IP "\fB\-\-floattype=markstyle\fR or \fB\-f markstyle\fR" 4 .IX Item "--floattype=markstyle or -f markstyle" Add code to preamble for selected style which replace standard marking and markup commands within floats (e.g., marginal remarks cause an error within floats so marginal marking can be disabled thus). This option defines all \&\f(CW\*(C`\eDIF...FL\*(C'\fR commands. Available styles: \f(CW\*(C`FLOATSAFE TRADITIONALSAFE IDENTICAL\*(C'\fR .Sp [ Default: \f(CW\*(C`FLOATSAFE\*(C'\fR ] .IP "\fB\-\-encoding=enc\fR or \fB\-e enc\fR" 4 .IX Item "--encoding=enc or -e enc" Specify encoding of old.tex and new.tex. Typical encodings are \&\f(CW\*(C`ascii\*(C'\fR, \f(CW\*(C`utf8\*(C'\fR, \f(CW\*(C`latin1\*(C'\fR, \f(CW\*(C`latin9\*(C'\fR. A list of available encodings can be obtained by executing .Sp \&\f(CW\*(C`perl \-MEncode \-e \*(Aqprint join ("\en",Encode\-\*(C'\fRencodings( \*(L":all\*(R" )) ;' > .Sp [Default encoding is utf8 unless the first few lines of the preamble contain an invocation \f(CW\*(C`\eusepackage[..]{inputenc}\*(C'\fR in which case the encoding chosen by this command is asssumed. Note that \s-1ASCII\s0 (standard latex) is a subset of utf8] .IP "\fB\-\-preamble=file\fR or \fB\-p file\fR" 4 .IX Item "--preamble=file or -p file" Insert file at end of preamble instead of generating preamble. The preamble must define the following commands \&\f(CW\*(C`\eDIFaddbegin, \eDIFaddend, \eDIFadd{..}, \&\eDIFdelbegin,\eDIFdelend,\eDIFdel{..},\*(C'\fR and varieties for use within floats \&\f(CW\*(C`\eDIFaddbeginFL, \eDIFaddendFL, \eDIFaddFL{..}, \&\eDIFdelbeginFL, \eDIFdelendFL, \eDIFdelFL{..}\*(C'\fR (If this option is set \fB\-t\fR, \fB\-s\fR, and \fB\-f\fR options are ignored.) .IP "\fB\-\-packages=pkg1,pkg2,..\fR" 4 .IX Item "--packages=pkg1,pkg2,.." Tell latexdiff that .tex file is processed with the packages in list loaded. This is normally not necessary if the .tex file includes the preamble, as the preamble is automatically scanned for \f(CW\*(C`\eusepackage\*(C'\fR commands. Use of the \fB\-\-packages\fR option disables automatic scanning, so if for any reason package specific parsing needs to be switched off, use \fB\-\-packages=none\fR. The following packages trigger special behaviour: .RS 4 .ie n .IP """amsmath""" 8 .el .IP "\f(CWamsmath\fR" 8 .IX Item "amsmath" Configuration variable amsmath is set to \f(CW\*(C`align*\*(C'\fR (Default: \f(CW\*(C`eqnarray*\*(C'\fR) .ie n .IP """endfloat""" 8 .el .IP "\f(CWendfloat\fR" 8 .IX Item "endfloat" Ensure that \f(CW\*(C`\ebegin{figure}\*(C'\fR and \f(CW\*(C`\eend{figure}\*(C'\fR always appear by themselves on a line. .ie n .IP """hyperref""" 8 .el .IP "\f(CWhyperref\fR" 8 .IX Item "hyperref" Change name of \f(CW\*(C`\eDIFadd\*(C'\fR and \f(CW\*(C`\eDIFdel\*(C'\fR commands to \f(CW\*(C`\eDIFaddtex\*(C'\fR and \f(CW\*(C`\eDIFdeltex\*(C'\fR and define new \f(CW\*(C`\eDIFadd\*(C'\fR and \f(CW\*(C`\eDIFdel\*(C'\fR commands, which provide a wrapper for these commands, using them for the text but not for the link defining command (where any markup would cause errors). .RE .RS 4 .Sp [ Default: scan the preamble for \f(CW\*(C`\e\eusepackage\*(C'\fR commands to determine loaded packages.] .RE .IP "\fB\-\-show\-preamble\fR" 4 .IX Item "--show-preamble" Print generated or included preamble commands to stdout. .SS "Configuration" .IX Subsection "Configuration" .ie n .IP "\fB\-\-exclude\-safecmd=exclude\-file\fR or \fB\-A exclude-file\fR or \fB\-\-exclude\-safecmd=""cmd1,cmd2,...""\fR" 4 .el .IP "\fB\-\-exclude\-safecmd=exclude\-file\fR or \fB\-A exclude-file\fR or \fB\-\-exclude\-safecmd=``cmd1,cmd2,...''\fR" 4 .IX Item "--exclude-safecmd=exclude-file or -A exclude-file or --exclude-safecmd=cmd1,cmd2,..." .PD 0 .IP "\fB\-\-replace\-safecmd=replace\-file\fR" 4 .IX Item "--replace-safecmd=replace-file" .ie n .IP "\fB\-\-append\-safecmd=append\-file\fR or \fB\-a append-file\fR or \fB\-\-append\-safecmd=""cmd1,cmd2,...""\fR" 4 .el .IP "\fB\-\-append\-safecmd=append\-file\fR or \fB\-a append-file\fR or \fB\-\-append\-safecmd=``cmd1,cmd2,...''\fR" 4 .IX Item "--append-safecmd=append-file or -a append-file or --append-safecmd=cmd1,cmd2,..." .PD Exclude from, replace or append to the list of regular expressions (RegEx) matching commands which are safe to use within the scope of a \f(CW\*(C`\eDIFadd\*(C'\fR or \f(CW\*(C`\eDIFdel\*(C'\fR command. The file must contain one Perl-RegEx per line (Comment lines beginning with # or % are ignored). Note that the RegEx needs to match the whole of the token, i.e., /^regex$/ is implied and that the initial \&\*(L"\e\*(R" of the command is not included. The \fB\-\-exclude\-safecmd\fR and \fB\-\-append\-safecmd\fR options can be combined with the \-\fB\-\-replace\-safecmd\fR option and can be used repeatedly to add cumulatively to the lists. \fB\-\-exclude\-safecmd\fR and \fB\-\-append\-safecmd\fR can also take a comma separated list as input. If a comma for one of the regex is required, escape it thus \*(L"\e,\*(R". In most cases it will be necessary to protect the comma-separated list from the shell by putting it in quotation marks. .ie n .IP "\fB\-\-exclude\-textcmd=exclude\-file\fR or \fB\-X exclude-file\fR or \fB\-\-exclude\-textcmd=""cmd1,cmd2,...""\fR" 4 .el .IP "\fB\-\-exclude\-textcmd=exclude\-file\fR or \fB\-X exclude-file\fR or \fB\-\-exclude\-textcmd=``cmd1,cmd2,...''\fR" 4 .IX Item "--exclude-textcmd=exclude-file or -X exclude-file or --exclude-textcmd=cmd1,cmd2,..." .PD 0 .IP "\fB\-\-replace\-textcmd=replace\-file\fR" 4 .IX Item "--replace-textcmd=replace-file" .ie n .IP "\fB\-\-append\-textcmd=append\-file\fR or \fB\-x append-file\fR or \fB\-\-append\-textcmd=""cmd1,cmd2,...""\fR" 4 .el .IP "\fB\-\-append\-textcmd=append\-file\fR or \fB\-x append-file\fR or \fB\-\-append\-textcmd=``cmd1,cmd2,...''\fR" 4 .IX Item "--append-textcmd=append-file or -x append-file or --append-textcmd=cmd1,cmd2,..." .PD Exclude from, replace or append to the list of regular expressions matching commands whose last argument is text. See entry for \fB\-\-exclude\-safecmd\fR directly above for further details. .IP "\fB\-\-replace\-context1cmd=replace\-file\fR" 4 .IX Item "--replace-context1cmd=replace-file" .PD 0 .ie n .IP "\fB\-\-append\-context1cmd=append\-file\fR or =item \fB\-\-append\-context1cmd=""cmd1,cmd2,...""\fR" 4 .el .IP "\fB\-\-append\-context1cmd=append\-file\fR or =item \fB\-\-append\-context1cmd=``cmd1,cmd2,...''\fR" 4 .IX Item "--append-context1cmd=append-file or =item --append-context1cmd=cmd1,cmd2,..." .PD Replace or append to the list of regex matching commands whose last argument is text but which require a particular context to work, e.g. \ecaption will only work within a figure or table. These commands behave like text commands, except when they occur in a deleted section, when they are disabled, but their argument is shown as deleted text. .IP "\fB\-\-replace\-context2cmd=replace\-file\fR" 4 .IX Item "--replace-context2cmd=replace-file" .PD 0 .ie n .IP "\fB\-\-append\-context2cmd=append\-file\fR or =item \fB\-\-append\-context2cmd=""cmd1,cmd2,...""\fR As corresponding commands for context1. The only difference is that context2 commands are completely disabled in deleted sections, including their arguments." 4 .el .IP "\fB\-\-append\-context2cmd=append\-file\fR or =item \fB\-\-append\-context2cmd=``cmd1,cmd2,...''\fR As corresponding commands for context1. The only difference is that context2 commands are completely disabled in deleted sections, including their arguments." 4 .IX Item "--append-context2cmd=append-file or =item --append-context2cmd=cmd1,cmd2,... As corresponding commands for context1. The only difference is that context2 commands are completely disabled in deleted sections, including their arguments." .IP "\fB\-\-config var1=val1,var2=val2,...\fR or \fB\-c var1=val1,..\fR" 4 .IX Item "--config var1=val1,var2=val2,... or -c var1=val1,.." .IP "\fB\-c configfile\fR" 4 .IX Item "-c configfile" .PD 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): .Sp \&\f(CW\*(C`MINWORDSBLOCK\*(C'\fR (integer) .Sp \&\f(CW\*(C`FLOATENV\*(C'\fR (RegEx) .Sp \&\f(CW\*(C`PICTUREENV\*(C'\fR (RegEx) .Sp \&\f(CW\*(C`MATHENV\*(C'\fR (RegEx) .Sp \&\f(CW\*(C`MATHREPL\*(C'\fR (String) .Sp \&\f(CW\*(C`MATHARRENV\*(C'\fR (RegEx) .Sp \&\f(CW\*(C`MATHARRREPL\*(C'\fR (String) .Sp \&\f(CW\*(C`ARRENV\*(C'\fR (RegEx) .Sp \&\f(CW\*(C`COUNTERCMD\*(C'\fR (RegEx) .IP "\fB\-\-show\-safecmd\fR" 4 .IX Item "--show-safecmd" Print list of RegEx matching and excluding safe commands. .IP "\fB\-\-show\-textcmd\fR" 4 .IX Item "--show-textcmd" Print list of RegEx matching and excluding commands with text argument. .IP "\fB\-\-show\-config\fR" 4 .IX Item "--show-config" Show values of configuration variables. .IP "\fB\-\-show\-all\fR" 4 .IX Item "--show-all" Combine all \-\-show commands. .Sp \&\s-1NB\s0 For all \-\-show commands, no \f(CW\*(C`old.tex\*(C'\fR or \f(CW\*(C`new.tex\*(C'\fR file needs to be specified, and no differencing takes place. .SS "Other configuration options:" .IX Subsection "Other configuration options:" .IP "\fB\-\-allow\-spaces\fR" 4 .IX Item "--allow-spaces" Allow spaces between bracketed or braced arguments to commands. Note that this option might have undesirable side effects (unrelated scope might get lumpeded with preceding commands) so should only be used if the default produces erroneous results. (Default requires arguments to directly follow each other without intervening spaces). .IP "\fB\-\-math\-markup=level\fR" 4 .IX Item "--math-markup=level" Determine granularity of markup in displayed math environments: Possible values for level are (both numerical and text labels are acceptable): .Sp \&\f(CW\*(C`off\*(C'\fR or \f(CW0\fR: suppress markup for math environments. Deleted equations will not appear in diff file. This mode can be used if all the other modes cause invalid latex code. .Sp \&\f(CW\*(C`whole\*(C'\fR or \f(CW1\fR: Differencing on the level of whole equations. Even trivial changes to equations cause the whole equation to be marked changed. This mode can be used if processing in coarse or fine mode results in invalid latex code. .Sp \&\f(CW\*(C`coarse\*(C'\fR or \f(CW2\fR: Detect changes within equations marked up with a coarse granularity; changes in equation type (e.g.displaymath to equation) appear as a change to the complete equation. This mode is recommended for situations where the content and order of some equations are still being changed. [Default] .Sp \&\f(CW\*(C`fine\*(C'\fR or \f(CW3\fR: Detect small change in equations and mark up at fine granularity. This mode is most suitable, if only minor changes to equations are expected, e.g. correction of typos. .IP "\fB\-\-disable\-citation\-markup\fR" 4 .IX Item "--disable-citation-markup" Suppress citation markup in styles using ulem (\s-1UNDERLINE\s0, \&\s-1FONTSTRIKE\s0, \s-1CULINECHBAR\s0) .IP "\fB\-\-enable\-citation\-markup\fR" 4 .IX Item "--enable-citation-markup" Protect citation commands in changed sections with \e\embox command [i.e. use default behaviour for ulem package for other packages] .SS "Miscellaneous" .IX Subsection "Miscellaneous" .RS 4 Output various status information to stderr during processing. Default is to work silently. .Sp \&\fB\-\-driver=type\fR .Sp Choose driver for changebar package (only relevant for styles using changebar: \s-1CCHANGEBAR\s0 \s-1CFONTCHBAR\s0 \s-1CULINECHBAR\s0 \s-1CHANGEBAR\s0). Possible drivers are listed in changebar manual, e.g. pdftex,dvips,dvitops [Default: dvips] .Sp \&\fB\-\-ignore\-warnings\fR .Sp Suppress warnings about inconsistencies in length between input and parsed strings and missing characters. These warning messages are often related to non-standard latex or latex constructions with a syntax unknown to \f(CW\*(C`latexdiff\*(C'\fR but the resulting difference argument is often fully functional anyway, particularly if the non-standard latex only occurs in parts of the text which have not changed. .Sp \&\fB\-\-label=label\fR or \&\fB\-L label\fR .Sp Sets the labels used to describe the old and new files. The first use of this option sets the label describing the old file and the second use of the option sets the label for the new file, i.e. set both labels like this \f(CW\*(C`\-L labelold \-L labelnew\*(C'\fR. [Default: use the filename and modification dates for the label] .Sp \&\fB\-\-no\-label\fR .Sp Suppress inclusion of old and new file names as comment in output file .Sp \&\fB\-\-visble\-label\fR .Sp Include old and new filenames (or labels set with \-\-label option) as visible output. .Sp \&\fB\-\-flatten\fR .Sp Replace \f(CW\*(C`\einput\*(C'\fR and \f(CW\*(C`\einclude\*(C'\fR commands within body by the content of the files in their argument. If \f(CW\*(C`\eincludeonly\*(C'\fR is present in the preamble, only those files are expanded into the document. However, no recursion is done, i.e. \f(CW\*(C`\einput\*(C'\fR and \f(CW\*(C`\einclude\*(C'\fR commands within included sections are not expanded. The included files are assumed to be located in the same directories as the old and new master files, respectively, making it possible to organise files into old and new directories. \&\-\-flatten is applied recursively, so inputted files can contain further \&\f(CW\*(C`\einput\*(C'\fR statements. .Sp Use of this option might result in prohibitive processing times for larger documents, and the resulting difference document no longer reflects the structure of the input documents. .Sp \&\fB\-\-help\fR or \&\fB\-h\fR .Sp Show help text .Sp \&\fB\-\-version\fR .Sp Show version number .RE .SS "Predefined styles" .IX Subsection "Predefined styles" .SS "Major types" .IX Subsection "Major types" The major type determine the markup of plain text and some selected latex commands outside floats by defining the markup commands \f(CW\*(C`\eDIFadd{...}\*(C'\fR and \f(CW\*(C`\eDIFdel{...}\*(C'\fR . .ie n .IP """UNDERLINE""" 10 .el .IP "\f(CWUNDERLINE\fR" 10 .IX Item "UNDERLINE" Added text is wavy-underlined and blue, discarded text is struck out and red (Requires color and ulem packages). Overstriking does not work in displayed math equations such that deleted parts of equation are underlined, not struck out (this is a shortcoming inherent to the ulem package). .ie n .IP """CTRADITIONAL""" 10 .el .IP "\f(CWCTRADITIONAL\fR" 10 .IX Item "CTRADITIONAL" Added text is blue and set in sans-serif, and a red footnote is created for each discarded piece of text. (Requires color package) .ie n .IP """TRADITIONAL""" 10 .el .IP "\f(CWTRADITIONAL\fR" 10 .IX Item "TRADITIONAL" Like \f(CW\*(C`CTRADITIONAL\*(C'\fR but without the use of color. .ie n .IP """CFONT""" 10 .el .IP "\f(CWCFONT\fR" 10 .IX Item "CFONT" Added text is blue and set in sans-serif, and discarded text is red and very small size. .ie n .IP """FONTSTRIKE""" 10 .el .IP "\f(CWFONTSTRIKE\fR" 10 .IX Item "FONTSTRIKE" Added tex is set in sans-serif, discarded text small and struck out .ie n .IP """CCHANGEBAR""" 10 .el .IP "\f(CWCCHANGEBAR\fR" 10 .IX Item "CCHANGEBAR" Added text is blue, and discarded text is red. Additionally, the changed text is marked with a bar in the margin (Requires color and changebar packages). .ie n .IP """CFONTCHBAR""" 10 .el .IP "\f(CWCFONTCHBAR\fR" 10 .IX Item "CFONTCHBAR" Like \f(CW\*(C`CFONT\*(C'\fR but with additional changebars (Requires color and changebar packages). .ie n .IP """CULINECHBAR""" 10 .el .IP "\f(CWCULINECHBAR\fR" 10 .IX Item "CULINECHBAR" Like \f(CW\*(C`UNDERLINE\*(C'\fR but with additional changebars (Requires color, ulem and changebar packages). .ie n .IP """CHANGEBAR""" 10 .el .IP "\f(CWCHANGEBAR\fR" 10 .IX Item "CHANGEBAR" No mark up of text, but mark margins with changebars (Requires changebar package). .ie n .IP """INVISIBLE""" 10 .el .IP "\f(CWINVISIBLE\fR" 10 .IX Item "INVISIBLE" No visible markup (but generic markup commands will still be inserted. .SS "Subtypes" .IX Subsection "Subtypes" The subtype defines the commands that are inserted at the begin and end of added or discarded blocks, irrespectively of whether these blocks contain text or commands (Defined commands: \f(CW\*(C`\eDIFaddbegin, \eDIFaddend, \eDIFdelbegin, \eDIFdelend\*(C'\fR) .ie n .IP """SAFE""" 10 .el .IP "\f(CWSAFE\fR" 10 .IX Item "SAFE" No additional markup (Recommended choice) .ie n .IP """MARGIN""" 10 .el .IP "\f(CWMARGIN\fR" 10 .IX Item "MARGIN" Mark beginning and end of changed blocks with symbols in the margin nearby (using the standard \f(CW\*(C`\emarginpar\*(C'\fR command \- note that this sometimes moves somewhat from the intended position. .ie n .IP """COLOR""" 10 .el .IP "\f(CWCOLOR\fR" 10 .IX Item "COLOR" An alternative way of marking added passages in blue, and deleted ones in red. (It is recommeneded to use instead the main types to effect colored markup, although in some cases coloring with dvipscol can be more complete, for example with citation commands). .ie n .IP """DVIPSCOL""" 10 .el .IP "\f(CWDVIPSCOL\fR" 10 .IX Item "DVIPSCOL" An alternative way of marking added passages in blue, and deleted ones in red. Note that \f(CW\*(C`DVIPSCOL\*(C'\fR only works with the dvips converter, e.g. not pdflatex. (it is recommeneded to use instead the main types to effect colored markup, although in some cases coloring with dvipscol can be more complete). .SS "Float Types" .IX Subsection "Float Types" Some of the markup used in the main text might cause problems when used within floats (e.g. figures or tables). For this reason alternative versions of all markup commands are used within floats. The float type defines these alternative commands. .ie n .IP """FLOATSAFE""" 10 .el .IP "\f(CWFLOATSAFE\fR" 10 .IX Item "FLOATSAFE" Use identical markup for text as in the main body, but set all commands marking the begin and end of changed blocks to null-commands. You have to choose this float type if your subtype is \f(CW\*(C`MARGIN\*(C'\fR as \f(CW\*(C`\emarginpar\*(C'\fR does not work properly within floats. .ie n .IP """TRADITIONALSAFE""" 10 .el .IP "\f(CWTRADITIONALSAFE\fR" 10 .IX Item "TRADITIONALSAFE" Mark additions the same way as in the main text. Deleted environments are marked by angular brackets \e[ and \e] and the deleted text is set in scriptscript size. This float type should always be used with the \f(CW\*(C`TRADITIONAL\*(C'\fR and \f(CW\*(C`CTRADITIONAL\*(C'\fR markup types as the \efootnote command does not work properly in floating environments. .ie n .IP """IDENTICAL""" 10 .el .IP "\f(CWIDENTICAL\fR" 10 .IX Item "IDENTICAL" Make no difference between the main text and floats. .SS "Configuration Variables" .IX Subsection "Configuration Variables" .ie n .IP """MINWORDSBLOCK""" 10 .el .IP "\f(CWMINWORDSBLOCK\fR" 10 .IX Item "MINWORDSBLOCK" 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 \f(CW\*(C`MINWORDSBLOCK\*(C'\fR to the preceding added and discarded parts. .Sp [ Default: 3 ] .ie n .IP """FLOATENV""" 10 .el .IP "\f(CWFLOATENV\fR" 10 .IX Item "FLOATENV" Environments whose name matches the regular expression in \f(CW\*(C`FLOATENV\*(C'\fR are considered floats. Within these environments, the \fIlatexdiff\fR markup commands are replaced by their \s-1FL\s0 variaties. .Sp [ Default: \f(CW\*(C`(?:figure|table|plate)[\ew\ed*@]*\*(C'\fR\ ] .ie n .IP """PICTUREENV""" 10 .el .IP "\f(CWPICTUREENV\fR" 10 .IX Item "PICTUREENV" Within environments whose name matches the regular expression in \f(CW\*(C`PICTUREENV\*(C'\fR all latexdiff markup is removed (in pathologic cases this might lead to inconsistent markup but this situation should be rare). .Sp [ Default: \f(CW\*(C`(?:picture|DIFnomarkup)[\ew\ed*@]*\*(C'\fR\ ] .ie n .IP """MATHENV"",""MATHREPL""" 10 .el .IP "\f(CWMATHENV\fR,\f(CWMATHREPL\fR" 10 .IX Item "MATHENV,MATHREPL" If both \ebegin and \eend for a math environment (environment name matching \f(CW\*(C`MATHENV\*(C'\fR or \e[ and \e]) are within the same deleted block, they are replaced by a \ebegin and \eend commands for \f(CW\*(C`MATHREPL\*(C'\fR rather than being commented out. .Sp [ Default: \f(CW\*(C`MATHENV\*(C'\fR=\f(CW\*(C`(?:displaymath|equation)\*(C'\fR\ , \f(CW\*(C`MATHREPL\*(C'\fR=\f(CW\*(C`displaymath\*(C'\fR\ ] .ie n .IP """MATHARRENV"",""MATHARRREPL""" 10 .el .IP "\f(CWMATHARRENV\fR,\f(CWMATHARRREPL\fR" 10 .IX Item "MATHARRENV,MATHARRREPL" as \f(CW\*(C`MATHENV\*(C'\fR,\f(CW\*(C`MATHREPL\*(C'\fR but for equation arrays .Sp [ Default: \f(CW\*(C`MATHARRENV\*(C'\fR=\f(CW\*(C`eqnarray\e*?\*(C'\fR\ , \f(CW\*(C`MATHREPL\*(C'\fR=\f(CW\*(C`eqnarray\*(C'\fR\ ] .ie n .IP """ARRENV""" 10 .el .IP "\f(CWARRENV\fR" 10 .IX Item "ARRENV" If a match to \f(CW\*(C`ARRENV\*(C'\fR is found within an inline math environment within a deleted or added block, then the inlined math is surrounded by \f(CW\*(C`\embox{\*(C'\fR...\f(CW\*(C`}\*(C'\fR. This is necessary as underlining does not work within inlined array environments. .Sp [ Default: \f(CW\*(C`ARRENV\*(C'\fR=\f(CW\*(C`(?:array|[pbvBV]matrix)\*(C'\fR\ .ie n .IP """COUNTERCMD""" 10 .el .IP "\f(CWCOUNTERCMD\fR" 10 .IX Item "COUNTERCMD" If a command in a deleted block which is also in the textcmd list matches \f(CW\*(C`COUNTERCMD\*(C'\fR then an additional command \f(CW\*(C`\eaddtocounter{\*(C'\fR\fIcntcmd\fR\f(CW\*(C`}{\-1}\*(C'\fR, where \fIcntcmd\fR 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. .Sp [ Default: \f(CW\*(C`COUNTERCMD\*(C'\fR=\f(CW\*(C`(?:footnote|part|section|subsection\*(C'\fR ... .Sp \&\f(CW\*(C`|subsubsection|paragraph|subparagraph)\*(C'\fR ] .SH "COMMON PROBLEMS" .IX Header "COMMON PROBLEMS" .IP "Citations result in overfull boxes" 10 .IX Item "Citations result in overfull boxes" There is an incompatibility between the \f(CW\*(C`ulem\*(C'\fR package, which \f(CW\*(C`latexdiff\*(C'\fR uses for underlining and striking out in the \s-1UNDERLINE\s0 style, the default style. In order to be able to mark up citations properly, they are placed with an \f(CW\*(C`\embox\*(C'\fR command in post-processing. As mboxes cannot be broken across lines, this procedure frequently results in overfull boxes, possibly obscuring the content as it extends beyond the right margin. If this is a problem, you have two possibilities: .Sp 1. Use \f(CW\*(C`COLOR\*(C'\fR or \f(CW\*(C`DVIPSCOL\*(C'\fR subtype markup (option \f(CW\*(C`\-s COLOR\*(C'\fR): If this markup is chosen, then changed citations are no longer marked up with the wavy line (additions) or struck out (deletions), but are still highlighted in the appropriate color. .Sp 2. Choose option \f(CW\*(C`\-\-disable\-citation\-markup\*(C'\fR which turns off the marking up of citations: deleted citations are no longer shown, and added ctations are shown without markup. (This was the default behaviour of latexdiff at versions 0.6 and older) .IP "Changes in complicated mathematical equations result in latex processing errors" 10 .IX Item "Changes in complicated mathematical equations result in latex processing errors" Try options \f(CW\*(C`\-\-math\-markup=whole\*(C'\fR. If even that fails, you can turn off mark up for equations with \f(CW\*(C`\-\-math\-markup=off\*(C'\fR. .SH "BUGS" .IX Header "BUGS" Option allow-spaces not implemented entirely consistently. It breaks the rules that number and type of white space does not matter, as different numbers of inter-argument spaces are treated as significant. .PP Please submit bug reports on the latexdiff project page \fIhttp://latexdiff.berlios.de\fR, send them to user discussion list \f(CW\*(C`latexdiff\-users@lists.berlios,de\*(C'\fR (prior subscription to list required, also on project webpage) or send them to \fItilmann@gfz\-potsdam.de\fR. Include the serial number of \fIlatexdiff\fR (from comments at the top of the source or use \fB\-\-version\fR). 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 latex, please send me those files, ideally edited to only contain the offending passage as long as that still reproduces the problem. If your file relies on non-standard class files, you must include those. I will not look at examples where I have trouble to latex the original files. .SH "SEE ALSO" .IX Header "SEE ALSO" latexrevise, latexdiff-vc .SH "PORTABILITY" .IX Header "PORTABILITY" \&\fIlatexdiff\fR does not make use of external commands and thus should run on any platform supporting Perl 5.6 or higher. If files with encodings other than \s-1ASCII\s0 or \s-1UTF\-8\s0 are processed, Perl 5.8 or higher is required. .PP The standard version of \fIlatexdiff\fR requires installation of the Perl package \&\f(CW\*(C`Algorithm::Diff\*(C'\fR (available from \fIwww.cpan.org\fR \- \&\fIhttp://search.cpan.org/~nedkonz/Algorithm\-Diff\-1.15\fR) but a stand-alone version, \fIlatexdiff-so\fR, which has this package inlined, is available, too. \&\fIlatexdiff-fast\fR requires the \fIdiff\fR command to be present. .SH "AUTHOR" .IX Header "AUTHOR" Version 1.0.2 Copyright (C) 2004\-2012 Frederik Tilmann .PP This program is free software; you can redistribute it and/or modify it under the terms of the \s-1GNU\s0 General Public License Version 3 .PP Contributors of fixes and additions: V. Kuhlmann, J. Paisley, N. Becker, T. Doerges, K. Huebner, T. Connors, Sebastian Gouezel and many others. Thanks to the many people who send in bug reports, feature suggestions, and other feedback. .SH "POD ERRORS" .IX Header "POD ERRORS" Hey! \fBThe above document had some coding errors, which are explained below:\fR .IP "Around line 2942:" 4 .IX Item "Around line 2942:" =over should be: '=over' or '=over positive_number' .Sp You can't have =items (as at line 2948) unless the first thing after the =over is an =item latexdiff-1.0.2/latexrevise0000755000076400007640000004666712063450736015670 0ustar tilmanntilmann#!/usr/bin/env perl # latexrevise - takes output file of latexdiff and removes either discarded # or appended passages, then deletes all other latexdiff markup # # Copyright (C) 2004 F J Tilmann (tilmann@gfz-potsdam.de, ftilmann@users.berlios.de) # # Project webpages: http://latexdiff.berlios.de/ # CTAN page: http://www.ctan.org/tex-archive/support/latexdiff # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation, either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # You should have received a copy of the GNU General Public License # along with this program. If not, see . # # Detailed usage information at the end of the file # Note: version number now keeping up with latexdiff # Version 1.0.2 Option --version # Version 1.0.1 no changes to latexrevise # Version 0.3 Updated for compatibility with latexdiff 0.3 output (DIFAUXCMD removal) # Version 0.1 First public release use Getopt::Long ; use strict; use warnings; my $versionstring=< \$accept, 'decline|d'=> \$decline, 'simplify|s' => \$simplify, 'comment|c=s' => \$comment, 'comment-environment|e=s' => \$comenv, 'markup|m=s' => \$markup, 'markup-environment|n=s' => \$markenv, 'no-warnings|q' => \$verbose, 'version' => \$version, 'verbose|V' => \$verbose, 'help|h|H' => \$help); if ( $help ) { usage() ; } if ( $version ) { die $versionstring ; } if ( ($accept && $decline) || ($accept && $simplify) || ($decline && $simplify) ) { die '-a,-d and -s options are mutually axclusive. Type latexrevise -h to get more help.'; } print STDERR "ACCEPT mode\n" if $verbose && $accept; print STDERR "DECLINE mode\n" if $verbose && $decline; print STDERR "SIMPLIFY mode. WARNING: The output will not normally be valid latex,\n" if $verbose && $simplify; # Slurp old and new files { local $/ ; # locally set record operator to undefined, ie. enable whole-file mode $input=<>; } # split into parts ($preamble,$body,$post)=splitdoc($input,'\begin{document}','\end{document}'); if (length $preamble && ( $accept || $decline ) ) { # # WORK ON PREAMBLE # # (compare subroutine linediff in latexdiff to make sure correct strings are used) # remove extra commands added to preamble by latexdiff $preamble =~ s/${PREAMBLEXTBEG}.*?${PREAMBLEXTEND}\n{0,1}//smg ; if ( $accept ) { # delete mark up in appended lines $preamble =~ s/^(.*) %DIF > $/$1/mg ; } elsif ( $decline ) { # delete appended lines # $preamble =~ s/^(.*) %DIF > $//mg ; $preamble =~ s/^(.*) %DIF > \n//mg ; # delete markup in deleted lines $preamble =~ s/^%DIF < //mg ; } # remove any remaining DIF markups #$preamble =~ s/%DIF.*$//mg ; $preamble =~ s/%DIF.*?\n//sg ; } #print $preamble ; # # WORK ON BODY # if ($accept) { # remove ADDMARKOPEN, ADDMARKCLOSE tokens @matches= $body =~ m/${ADDMARKOPEN}(.*?)${ADDMARKCLOSE}/sg; checkpure(@matches); $body =~ s/${ADDMARKOPEN}(.*?)${ADDMARKCLOSE}/$1/sg; # remove text flanked by DELMARKOPEN, DELMARKCLOSE tokens @matches= $body =~ m/${DELMARKOPEN}(.*?)${DELMARKCLOSE}/sg; checkpure(@matches); $body =~ s/${DELMARKOPEN}(.*?)${DELMARKCLOSE}//sg; # remove markup of added comments $body =~ s/%${ADDCOMMENT}(.*?)$/%$1/mg ; # remove deleted comments (full line) $body =~ s/^%${DELCOMMENT}.*?\n//mg ; # remove deleted comments (part of line) $body =~ s/%${DELCOMMENT}.*?$//mg ; } elsif ( $decline) { # remove DELMARKOPEN, DELMARKCLOSE tokens @matches= $body =~ m/${DELMARKOPEN}(.*?)${DELMARKCLOSE}/sg; checkpure(@matches); $body =~ s/${DELMARKOPEN}(.*?)${DELMARKCLOSE}/$1/sg; # remove text flanked by ADDMARKOPEN, ADDMARKCLOSE tokens # as latexdiff algorithm keeps the formatting and white spaces # of the new text, sometimes whitespace might be inserted or # removed inappropriately. We try to guess whether this has # happened # Mop up tokens. This must be done already now as otherwise # detection of white-space problems does not work $cnt = $body =~ s/${DELOPEN}($pat4)${DELCLOSE}/$1/sg; # remove markup of deleted commands $cnt += $body =~ s/${DELCMDOPEN}(.*?)${DELCMDCLOSE}/$1/sg ; $cnt += $body =~ s/${DELCMDOPEN}//g ; # remove aux commands $cnt += $body =~ s/^.*${AUXCMD}$/${someword}/mg; $body =~ s/${someword}\n//g; while ( $body =~ m/${ADDMARKOPEN}(.*?)${ADDMARKCLOSE}/s ) { $prematch=$`; $postmatch=$'; checkpure($1); if ( $prematch =~ /\w$/s && $postmatch =~ /^\w/ ) { # apparently no white-space between word=>Insert white space $body =~ s/${ADDMARKOPEN}(.*?)${ADDMARKCLOSE}/ /s ; } elsif ( $prematch =~ /\s$/s && $postmatch =~ /^[.,;:]/ ) { # space immediately before one of ".,:;" => remove this space $body =~ s/\s${ADDMARKOPEN}(.*?)${ADDMARKCLOSE}//s ; } else { # do not insert or remove any extras $body =~ s/${ADDMARKOPEN}(.*?)${ADDMARKCLOSE}//s; } } # Alternative without special cases treatment # @matches= $body =~ m/${ADDMARKOPEN}(.*?)${ADDMARKCLOSE}/sg; # checkpure(@matches); # $body =~ s/${ADDMARKOPEN}(.*?)${ADDMARKCLOSE}//sg; # remove markup of deleted comments $body =~ s/%${DELCOMMENT}(.*?)$/%$1/mg ; # remove added comments (full line) $body =~ s/^%${ADDCOMMENT}.*?\n//mg ; # remove added comments (part of line) $body =~ s/%${ADDCOMMENT}.*?$//mg ; } # remove any remaining tokens if ( $accept || $decline || $simplify ) { # first substitution command deals with special case of added paragraph $cnt = $body =~ s/${ADDOPEN}($pat4)\n${ADDCLOSE}\n/$1\n/sg; $cnt += $body =~ s/${ADDOPEN}($pat4)${ADDCLOSE}/$1/sg; $cnt==0 || warn 'Remaining $ADDOPEN tokens in DECLINE mode\n' unless ( $quiet || $accept || $simplify ); } if ($accept || $simplify ) { # Note: in decline mode these commands have already been removed above $cnt = $body =~ s/${DELOPEN}($pat4)${DELCLOSE}/$1/sg; #### remove markup of deleted commands $cnt += $body =~ s/${DELCMDOPEN}(.*?)${DELCMDCLOSE}/$1/sg ; $cnt += $body =~ s/${DELCMDOPEN}//g ; # remove aux commands # $cnt += $body =~ s/^.*${AUXCMD}$/${someword}/mg; $body =~ s/${someword}\n//g; #### remove deleted comments ###$cnt += $body =~ s/${DIFDELCMD}.*?$//mg ; $cnt==0 || warn 'Remaining $DELOPEN or $DIFDELCMD tokens in ACCEPT mode\n' unless ( $quiet || $simplify ); } # Remove comment commands if (defined($comment)) { print STDERR "Removing \\$comment\{..\} sequences ..." if $verbose; # protect $comments in comments by making them look different $body =~ s/(%.*)${comment}(.*)$/$1${someword}$2/mg ; # carry out the substitution $cnt = 0 + $body =~ s/\\${comment}(?:\[${brat0}\])?\{${pat4}\}//sg ; print STDERR "$cnt matches found and removed.\n" if $verbose; # and undo the protection substitution $body =~ s/(%.*)${someword}(.*)$/$1${comment}$2/mg ; } if (defined($comenv)) { print STDERR "Removing $comenv environments ..." if $verbose; $body =~ s/(%.*)${comenv}/$1${someword}/mg ; ## $cnt = 0 + $body =~ s/\\begin(?:\[${brat0}\])?\{\$comenv\}.*?\\end\{\$comenv\}//sg ; $cnt = 0 + $body =~ s/\\begin(?:\[${brat0}\])?\{${comenv}\}.*?\\end\{${comenv}\}\s*?\n//sg ; print STDERR "$cnt matches found and removed.\n" if $verbose; $body =~ s/(%.*)${someword}/$1${comenv}/mg ; } if (defined($markup)) { print STDERR "Removing \\$markup\{..\} cpmmands ..." if $verbose; # protect $markups in comments by making them look different $body =~ s/(%.*)${markup}(.*)$/$1${someword}$2/mg ; # carry out the substitution $cnt = 0 + $body =~ s/\\${markup}(?:\[${brat0}\])?\{(${pat4})\}/$1/sg ; print STDERR "$cnt matches found and removed.\n" if $verbose; # and undo the protection substitution $body =~ s/(%.*)${someword}(.*)$/$1${markup}$2/mg ; } if (defined($markenv)) { print STDERR "Removing $markenv environments ..." if $verbose; $body =~ s/(%.*)${markenv}/$1${someword}/mg ; $cnt = 0 + $body =~ s/\\begin(?:\[${brat0}\])?\{${markenv}\}\n?//sg; $cnt += 0 + $body =~ s/\\end\{${markenv}\}\n?//sg; print STDERR $cnt/2, " matches found and removed.\n" if $verbose; $body =~ s/(%.*)${someword}/$1${markenv}/mg ; } if ( length $preamble ) { print "$preamble\\begin{document}${body}\\end{document}$post"; } else { print $body; } # checkpure(@matches) # checks whether any of the strings in matches contains # $ADDMARKOPEN, $ADDMARKCLOSE,$DELMARKOPEN, or $DELMARKCLOSE # If so, die reporting nesting problems, otherwise return to caller sub checkpure { while (defined($_=shift)) { if ( /$ADDMARKOPEN/ || /$ADDMARKCLOSE/ || /$DELMARKOPEN/ || /$DELMARKCLOSE/ ) { die <=0 && $j>$i ) { $part1 = substr($text,0,$i) ; $part2 = substr($text,$i+$l1,$j-$i-$l1); $part3 = substr($text,$j+$l2) unless $j+$l2 >= length $text; } else { die "$word1 or $word2 not in the correct order or not present as a pair." } return ($part1,$part2,$part3); } sub usage { die <<"EOF"; Usage: $0 [OPTIONS] [diff.tex] > revised.tex Read a file diff.tex (output of latexdiff), and remove its markup. If no filename is given read from standard input. The command can be used in ACCEPT, DECLINE, or SIMPLIFY mode, and be used to remove user-defined latex commands from the input (see options -c, -e, -m, -n below). In ACCEPT mode, all appended text fragments (or preamble lines) are kept, and all discarded text fragments (or preamble lines) are deleted. In DECLINE mode, all discarded text fragments are kept, and all appended text fragments are deleted. If you wish to keep some changes, edit the diff.tex file in advance, and manually remove those tokens which would otherwise be deleted. Note that latexrevise only pays attention to the \\DIFaddbegin, \\DIFaddend, \\DIFdelbegin, and \\DIFdelend tokens and corresponding FL varieties. All \\DIFadd and \\DIFdel commands (but not their content) are simply deleted. The commands added by latexdiff to the preamble are also removed. In SIMPLIFY mode all latexdiff markup is removed from the body of the text (after \\begin{document}) except for \\DIFaddbegin, \\DIFaddend, \\DIFdelbegin, \\DIFdelend tokens and the corresponding FL varieties of those commands. The result will not in general be valid latex-code but might be easier to read and edit in preparation for a subsequent run in ACCEPT or DECLINE mode. In SIMPLIFY mode the preamble is left unmodified. -a --accept Run in ACCEPT mode (delete all blocks marked by \\DIFdelbegin and \\DIFdelend). -d --decline Run in DECLINE mode (delete all blocks marked by \\DIFaddbegin and \\DIFaddend). -s --simplify Run in SIMPLIFY mode (Keep all \\DIFaddbegin, \\DIFaddend, \\DIFdelbegin, \\DIFdelend tokens, but remove all other latexdiff markup from body. Note that the three mode options are mutually exclusive. If no mode option is given, latexrevise simply removes user annotations and markup according to the following four options. -c cmd --comment=cmd Remove \\cmd{...}. cmd is supposed to mark some explicit anotations which should be removed from the file before release. -e envir --comment-environment=envir Remove explicit annotation environments from the text, i.e. remove \\begin{envir} ... \\end{envir} blocks. -m cmd --markup=cmd Remove the markup command cmd but leave its argument, i.e. turn \\cmd{abc} into abc. -n envir --markup-environment=envir Similarly, remove \\begin{envir} and \\end{envir} commands, but leave content of the environment in the text. -q --no-warnings Do not warn users about \\DIDadd{..} or \\DIFdel statements which should not be there anymore -V --verbose Verbose output EOF } =head1 NAME latexrevise - selectively remove markup and text from latexdiff output =head1 SYNOPSIS B [ B ] [ F ] > F =head1 DESCRIPTION I reads a file C (output of I), and remove the markup commands. If no filename is given the input is read from standard input. The command can be used in I, I, or I mode, or can be used to remove user-defined latex commands from the input (see B<-c>, B<-e>, B<-m>, and B<-n> below). In I mode, all appended text fragments (or preamble lines) are kept, and all discarded text fragments (or preamble lines) are deleted. In I mode, all discarded text fragments are kept, and all appended text fragments are deleted. If you wish to keep some changes, edit the diff.tex file in advance, and manually remove those tokens which would otherwise be deleted. Note that I only pays attention to the C<\DIFaddbegin>, C<\DIFaddend>, C<\DIFdelbegin>, and C<\DIFdelend> tokens and corresponding FL varieties. All C<\DIFadd> and C<\DIFdel> commands (but not their contents) are simply deleted. The commands added by latexdiff to the preamble are also removed. In I mode, C<\DIFaddbegin, \DIFaddend, \DIFdelbegin, \DIFdelend> tokens and their corresponding C varieties are kept but all other markup (e.g. C and <\DIFdel>) is removed. The result will not in general be valid latex-code but it will be easier to read and edit in preparation for a subsequent run in I or I mode. In I mode the preamble is left unmodified. =head1 OPTIONS =over 4 =item B<-a> or B<--accept> Run in I mode (delete all blocks marked by C<\DIFdelbegin> and C<\DIFdelend>). =item B<-d> or B<--decline> Run in I mode (delete all blocks marked by C<\DIFaddbegin> and C<\DIFaddend>). =item B<-s> or B<--simplify> Run in I mode (Keep all C<\DIFaddbegin>, C<\DIFaddend>, C<\DIFdelbegin>, C<\DIFdelend> tokens, but remove all other latexdiff markup from body). =back Note that the three mode options are mutually exclusive. If no mode option is given, I simply removes user annotations and markup according to the following four options. =over 4 =item B<-c cmd> or B<--comment=cmd> Remove C<\cmd{...}> sequences. C is supposed to mark some explicit anotations which should be removed from the file before release. =item B<-e envir> or B<--comment-environment=envir> Remove explicit annotation environments from the text, i.e. remove \begin{envir} ... \end{envir} blocks. =item B<-m cmd> or B<--markup=cmd> Remove the markup command C<\cmd> but leave its argument, i.e. turn C<\cmd{abc}> into C. =item B<-n envir> or B<--markup-environment=envir> Similarly, remove C<\begin{envir}> and C<\end{envir}> commands but leave content of the environment in the text. =item B<-V> or B<--verbose> Verbose output =item B<-q> or B<--no-warnings> Do not warn users about C<\DIDadd{..}> or C<\DIFdel{..}> statements which should have been removed already. =back =head1 BUGS The current version is a beta version which has not yet been extensively tested, but worked fine locally. Please submit bug reports through the latexdiff project page I or send to I. Include the serial number of I (from comments at the top of the source). If you come across latexdiff output which is not processed correctly by I please include the problem file as well as the old and new files on which it is based, ideally edited to only contain the offending passage as long as that still reproduces the problem. Note that I gets confused by commented C<\begin{document}> or C<\end{document}> statements =head1 SEE ALSO L =head1 PORTABILITY I does not make use of external commands and thus should run on any platform supporting PERL v5 or higher. =head1 AUTHOR Copyright (C) 2004 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 =cut latexdiff-1.0.2/latexdiff-vc.10000644000076400007640000002205512063450736016026 0ustar tilmanntilmann.\" Automatically generated by Pod::Man 2.23 (Pod::Simple 3.14) .\" .\" Standard preamble: .\" ======================================================================== .de Sp \" Vertical space (when we can't use .PP) .if t .sp .5v .if n .sp .. .de Vb \" Begin verbatim text .ft CW .nf .ne \\$1 .. .de Ve \" End verbatim text .ft R .fi .. .\" Set up some character translations and predefined strings. \*(-- will .\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left .\" double quote, and \*(R" will give a right double quote. \*(C+ will .\" give a nicer C++. Capital omega is used to do unbreakable dashes and .\" therefore won't be available. \*(C` and \*(C' expand to `' in nroff, .\" nothing in troff, for use with C<>. .tr \(*W- .ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p' .ie n \{\ . ds -- \(*W- . ds PI pi . if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch . if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\" diablo 12 pitch . ds L" "" . ds R" "" . ds C` "" . ds C' "" 'br\} .el\{\ . ds -- \|\(em\| . ds PI \(*p . ds L" `` . ds R" '' 'br\} .\" .\" Escape single quotes in literal strings from groff's Unicode transform. .ie \n(.g .ds Aq \(aq .el .ds Aq ' .\" .\" If the F register is turned on, we'll generate index entries on stderr for .\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index .\" entries marked with X<> in POD. Of course, you'll have to process the .\" output yourself in some meaningful fashion. .ie \nF \{\ . de IX . tm Index:\\$1\t\\n%\t"\\$2" .. . nr % 0 . rr F .\} .el \{\ . de IX .. .\} .\" .\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2). .\" Fear. Run. Save yourself. No user-serviceable parts. . \" fudge factors for nroff and troff .if n \{\ . ds #H 0 . ds #V .8m . ds #F .3m . ds #[ \f1 . ds #] \fP .\} .if t \{\ . ds #H ((1u-(\\\\n(.fu%2u))*.13m) . ds #V .6m . ds #F 0 . ds #[ \& . ds #] \& .\} . \" simple accents for nroff and troff .if n \{\ . ds ' \& . ds ` \& . ds ^ \& . ds , \& . ds ~ ~ . ds / .\} .if t \{\ . ds ' \\k:\h'-(\\n(.wu*8/10-\*(#H)'\'\h"|\\n:u" . ds ` \\k:\h'-(\\n(.wu*8/10-\*(#H)'\`\h'|\\n:u' . ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'^\h'|\\n:u' . ds , \\k:\h'-(\\n(.wu*8/10)',\h'|\\n:u' . ds ~ \\k:\h'-(\\n(.wu-\*(#H-.1m)'~\h'|\\n:u' . ds / \\k:\h'-(\\n(.wu*8/10-\*(#H)'\z\(sl\h'|\\n:u' .\} . \" troff and (daisy-wheel) nroff accents .ds : \\k:\h'-(\\n(.wu*8/10-\*(#H+.1m+\*(#F)'\v'-\*(#V'\z.\h'.2m+\*(#F'.\h'|\\n:u'\v'\*(#V' .ds 8 \h'\*(#H'\(*b\h'-\*(#H' .ds o \\k:\h'-(\\n(.wu+\w'\(de'u-\*(#H)/2u'\v'-.3n'\*(#[\z\(de\v'.3n'\h'|\\n:u'\*(#] .ds d- \h'\*(#H'\(pd\h'-\w'~'u'\v'-.25m'\f2\(hy\fP\v'.25m'\h'-\*(#H' .ds D- D\\k:\h'-\w'D'u'\v'-.11m'\z\(hy\v'.11m'\h'|\\n:u' .ds th \*(#[\v'.3m'\s+1I\s-1\v'-.3m'\h'-(\w'I'u*2/3)'\s-1o\s+1\*(#] .ds Th \*(#[\s+2I\s-2\h'-\w'I'u*3/5'\v'-.3m'o\v'.3m'\*(#] .ds ae a\h'-(\w'a'u*4/10)'e .ds Ae A\h'-(\w'A'u*4/10)'E . \" corrections for vroff .if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u' .if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u' . \" for low resolution devices (crt and lpr) .if \n(.H>23 .if \n(.V>19 \ \{\ . ds : e . ds 8 ss . ds o a . ds d- d\h'-1'\(ga . ds D- D\h'-1'\(hy . ds th \o'bp' . ds Th \o'LP' . ds ae ae . ds Ae AE .\} .rm #[ #] #H #V #F C .\" ======================================================================== .\" .IX Title "LATEXDIFF-VC 1" .TH LATEXDIFF-VC 1 "2012-12-16" "perl v5.12.4" " " .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l .nh .SH "NAME" latexdiff\-vc \- wrapper script that calls latexdiff for different versions of a file under version management (CVS, RCS or SVN) .SH "SYNOPSIS" .IX Header "SYNOPSIS" \&\fBlatexdiff-vc\fR [ \fIlatexdiff-options\fR ] [ \fIlatexdiff-vc-options\fR ] \fB\-r\fR [\fIrev1\fR] [\fB\-r\fR \fIrev2\fR] \fIfile1.tex\fR [ \fIfile2.tex\fR ...] .PP .Vb 1 \& or .Ve .PP \&\fBlatexdiff-vc\fR [ \fIlatexdiff-options\fR ] [ \fIlatexdiff-vc-options\fR ][ \fB\-\-postscript\fR | \fB\-\-pdf\fR ] \fIold.tex\fR \fInew.tex\fR .SH "DESCRIPTION" .IX Header "DESCRIPTION" \&\fIlatexdiff-vc\fR is a wrapper script that applies \fIlatexdiff\fR to a file, or multiple files under version control (\s-1CVS\s0, \s-1RCS\s0 or \s-1SVN\s0), and optionally runs the sequence of \f(CW\*(C`latex\*(C'\fR and \f(CW\*(C`dvips\*(C'\fR or \f(CW\*(C`pdflatex\*(C'\fR commands necessary to produce pdf or postscript output of the difference tex file(s). It can also be applied to a pair of files to automatise the generation of difference file in postscript or pdf format. .SH "OPTIONS" .IX Header "OPTIONS" .IP "\fB\-\-rcs\fR, \fB\-\-svn\fR, \fB\-\-cvs\fR, or \fB\-\-git\fR" 4 .IX Item "--rcs, --svn, --cvs, or --git" Set the version system. If no version system is specified, latexdiff-vc will venture a guess. .Sp latexdiff-cvs and latexdiff-rcs are variants of latexdiff-vc which default to the respective versioning system. However, this default can still be overridden using the options above. .IP "\fB\-r\fR, \fB\-r\fR \fIrev\fR or \fB\-\-revision\fR, \fB\-\-revision=\fR\fIrev\fR" 4 .IX Item "-r, -r rev or --revision, --revision=rev" Choose revision (under \s-1RCS\s0, \s-1CVS\s0, \s-1SVN\s0 or \s-1GIT\s0). One or two \fB\-r\fR options can be specified, and they result in different behaviour: .RS 4 .IP "\fBlatexdiff-vc\fR \-r \fIfile.tex\fR ..." 4 .IX Item "latexdiff-vc -r file.tex ..." compares \fIfile.tex\fR with the most recent version checked into \s-1RCS\s0. .IP "\fBlatexdiff-vc\fR \-r \fIrev1\fR \fIfile.tex\fR ..." 4 .IX Item "latexdiff-vc -r rev1 file.tex ..." compares \fIfile.tex\fR with revision \fIrev1\fR. .IP "\fBlatexdiff-vc\fR \-r \fIrev1\fR \-r \fIrev2\fR \fIfile.tex\fR ..." 4 .IX Item "latexdiff-vc -r rev1 -r rev2 file.tex ..." compares revisions \fIrev1\fR and \fIrev2\fR of \fIfile.tex\fR. .Sp Multiple files can be specified for all of the above options. All files must have the extension \f(CW\*(C`.tex\*(C'\fR, though. .IP "\fBlatexdiff-vc\fR \fIold.tex\fR \fInew.tex\fR" 4 .IX Item "latexdiff-vc old.tex new.tex" compares two files. .RE .RS 4 .Sp The name of the difference file is generated automatically and reported to stdout. .RE .IP "\fB\-d\fR or \fB\-\-dir\fR \fB\-d\fR \fIpath\fR or \fB\-\-dir=\fR\fIpath\fR" 4 .IX Item "-d or --dir -d path or --dir=path" Rather than appending the string \f(CW\*(C`diff\*(C'\fR and optionally the version numbers given to the output-file, this will prepend a directory name \f(CW\*(C`diff\*(C'\fR to the original filename, creating the directory and subdirectories should they not exist already. This is particularly useful in order to clone a complete directory hierarchy. Optionally, a pathname \fIpath\fR can be specified, which is prepended instead of \f(CW\*(C`diff\*(C'\fR. .IP "\fB\-\-fast\fR or \fB\-\-so\fR" 4 .IX Item "--fast or --so" Use \f(CW\*(C`latexdiff\-fast\*(C'\fR or \f(CW\*(C`latexdiff\-so\*(C'\fR, respectively (instead of \f(CW\*(C`latexdiff\*(C'\fR). .IP "\fB\-\-ps\fR or \fB\-\-postscript\fR" 4 .IX Item "--ps or --postscript" Generate postscript output from difference file. This will run the sequence \f(CW\*(C`latex; latex; dvips\*(C'\fR on the difference file (do not use this option in the rare cases, where three \f(CW\*(C`latex\*(C'\fR commands are required if you care about correct referencing). If the difference file contains a \f(CW\*(C`\ebibliography\*(C'\fR tag, run the sequence \f(CW\*(C`latex; bibtex; latex; latex; dvips\*(C'\fR. .IP "\fB\-\-pdf\fR" 4 .IX Item "--pdf" Generate pdf output from difference file using \f(CW\*(C`pdflatex\*(C'\fR. This will run the sequence \f(CW\*(C`pdflatex; pdflatex\*(C'\fR on the difference file, or \&\f(CW\*(C`pdflatex; bibtex; pdflatex; pdflatex\*(C'\fR for files requiring bibtex. .IP "\fB\-\-force\fR" 4 .IX Item "--force" Overwrite existing diff files without asking for confirmation. Default behaviour is to ask for confirmation before overwriting an existing difference file. .IP "\fB\-\-help\fR or \fB\-h\fR" 4 .IX Item "--help or -h" Show help text .IP "\fB\-\-version\fR" 4 .IX Item "--version" Show version number .PP All other options are passed on to \f(CW\*(C`latexdiff\*(C'\fR. .SH "SEE ALSO" .IX Header "SEE ALSO" latexdiff .SH "PORTABILITY" .IX Header "PORTABILITY" \&\fIlatexdiff-vc\fR uses external commands and is therefore limited to Unix-like systems. It also requires the \s-1RCS\s0 version control system and latex to be installed on the system. Modules from Perl 5.8 or higher are required. .SH "BUG REPORTING" .IX Header "BUG REPORTING" .Vb 6 \& Please submit bug reports through \&the latexdiff project page I or send \&to I. Include the serial number of I \&(option C<\-\-version>) \&. \&=head1 AUTHOR .Ve .PP Copyright (C) 2005,2012 Frederik Tilmann .PP This program is free software; you can redistribute it and/or modify it under the terms of the \s-1GNU\s0 General Public License Version 3 Contributors: S Utcke, H Bruyninckx latexdiff-1.0.2/contrib/0000755000076400007640000000000012063451363015021 5ustar tilmanntilmannlatexdiff-1.0.2/contrib/latexdiff.spec0000644000076400007640000000272312051550016017637 0ustar tilmanntilmannSummary: Diff for LaTeX files Name: latexdiff Version: 0.5 Release: 1 License: GPL Group: Productivity/Publishing/TeX/Utilities URL: http://www.tug.org/tex-archive/help/Catalogue/entries/latexdiff.html Source0: %{name}.zip BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root # only required for 'make install-ext' # Requires: perl-Algorithm-Diff %description latexdiff is a Perl script, which compares two latex files and marks up significant differences between them (i.e. a diff for latex files). Various options are available for visual markup using standard latex packages such as "color.sty". Changes not directly affecting visible text, for example in formatting commands, are still marked in the latex source. (C) 2004 Frederik Tilmann %prep %setup -n %{name} %build # quick had to adapt the Makefile %{__mv} Makefile Makefile.old %{__sed} \ -e "s;INSTALLPATH = /usr/local;INSTALLPATH = \${DESTDIR}%{_prefix};" \ -e "s;INSTALLMANPATH = \$(INSTALLPATH)/man;INSTALLMANPATH = \${DESTDIR}%{_mandir};" \ Makefile.old > Makefile %install %{__mkdir_p} $RPM_BUILD_ROOT%{_bindir} %{__mkdir_p} $RPM_BUILD_ROOT%{_mandir}/man1 %makeinstall %clean [ "${RPM_BUILD_ROOT}" != "/" ] && [ -d "${RPM_BUILD_ROOT}" ] && %{__rm} -rf "${RPM_BUILD_ROOT}" %files %defattr(-,root,root) %doc example CHANGES LICENSE README %{_bindir}/* %{_mandir}/man*/* %changelog * Thu Jan 4 2007 Till Dörges - 0.5-1 - Initial build. latexdiff-1.0.2/contrib/latexdiff-wrap0000755000076400007640000001054412051550016017660 0ustar tilmanntilmann#!/bin/bash # # latexdiff-wrap # # Wrapper for latexdiff, to # * provide support for documents consiting of more than 1 latex file # * provide my common arguments # # Copyright (C) by Volker Kuhlmann # Released under the terms of the GNU General Public License (GPL) Version 2. # See http://www.gnu.org/ for details. # # Volker Kuhlmann # 5, 6, 7, 12, 16, 17 Oct 2005 # 31 Jan; 5, 7, 13, 15 Feb 2006 # VERSION="0.6, 15 Feb 2006" AUTHOR="Volker Kuhlmann " COPYRIGHT="Copyright (C) 2005-2006" #### #### Constants and initialised variables # diffcmd="latexdiff" diffrc="$HOME/texmf/latexdiff" #diffargs="-e latin1 --ignore-warnings -p latexdiff-preamble.sty" diffargs="-e latin1 --ignore-warnings" diffargs="$diffargs --append-safecmd $diffrc/safe-cmds" diffargs="$diffargs --append-textcmd $diffrc/text-cmds" # Note: Can't use multiple --append-safecmd # show current command lists: #diffcmd="$diffcmd --show-safecmd --show-textcmd --show-config" #### #### Version, Usage, Help # show_version() { echo "${0##*/} version $VERSION $COPYRIGHT by $AUTHOR" } show_usage() { echo " Usage: ${0##*/} OLDDIR NEWDIR DIFFDIR [DIFFARGS --] FILE.tex [...] ${0##*/} --show [DIFFARGS] Version $VERSION $COPYRIGHT by $AUTHOR " } show_help() { show_usage echo "\ For each FILE.tex, build a new file DIFFDIR/FILE.tex with markup of the changes which were made from OLDDIR/FILE.tex to NEWDIR/FILE.tex. Any path given with FILE.tex is stripped off. Any DIFFARGS are added to the latexdiff call, if present (remember to follow them with a double-hyphen on its own before the FILE arguments). With --show, shows the settings latexdiff would be running with, including the changes applied by the user. " } # For scripts not using function library only: Version() { show_version; exitwith ErrVersion; } Usage() { show_help; exitwith ErrUsage; } Help() { test "$1" && exitwith ErrHelp show_help; show_help; exitwith ErrOK; } #### #### Error/Exit codes # exitwith() { exec 1>&2 # write stdout on stderr instead case "$1" in ErrOK) exit 0;; ErrVersion|ErrUsage|ErrHelp) # Output generated by function (program) $2, if given test -n "$2" && "$2" exit 1;; # more codes in here # more codes in here ErrBadoption) echo "Bad option '$2'." echo "Call with -h for help." exit 9;; ErrMissingParameter) echo "A required parameter for option $2 is missing." echo "Call with -h for help." exit 9;; *) echo "Internal error: exitwith() called with illegal error code '$1'." exit 19;; esac } #### #### Parse command line parameters # # If the next arg starts with a "-", collect additional argument for latexdiff # until "--". scanextraargs() { addargs=() case "$1" in -*) while [ $# -gt 0 -a "$1" != "--" ]; do addargs=( "${addargs[@]}" "$1" ) shift done test "$1" == "--" && shift ;; esac fileargs=( "$@" ) } case "$1" in --version) Version;; --usage) Usage;; --help|-h|-help) Help;; --show) shift scanextraargs "$@" (set -x $diffcmd $diffargs "${addargs[@]}" \ --show-safecmd --show-textcmd --show-config ) | fmt exit $? ;; esac olddir="${1%/}" newdir="${2%/}" diffdir="${3%/}" if ! [ -d "$olddir" -a -d "$newdir" -a -d "$diffdir" ]; then Help 1>&2 err fi shift 3 scanextraargs "$@" set -- "${fileargs[@]}" #### #### Functions # #set -x Log() { echo 1>&2 "+ $@"; "$@"; } #### #### Main # # Create output directory, just in case. (set -x mkdir -p "$diffdir" ) while [ $# -gt 0 ]; do file="${1##*/}" echo Examining: "$file" # No point running latexdiff if both files are identical, # but run latexdiff on top-level LaTeX file in any case. if cmp --quiet "$olddir/$file" "$newdir/$file" \ && ! grep -lq '\\begin.*{document}' "$newdir/$file"; then (set -x cp -p "$olddir/$file" "$diffdir" ) else # Delete file, to make sure it's not clobbered by redirecting stdout # in case it's a symlink to te original. test -f "$diffdir/$file" && (set -x rm "$diffdir/$file" ) # Run latexdiff if both input files are present. run=1 test -f "$olddir/$file" || { echo 1>&2 "No file: $olddir/$file"; run=; } test -f "$newdir/$file" || { echo 1>&2 "No file: $newdir/$file"; run=; } test -n "$run" && \ (set -x $diffcmd $diffargs "${addargs[@]}" \ "$olddir/$file" "$newdir/$file" > "$diffdir/$file" ) fi shift done latexdiff-1.0.2/contrib/latexchanges.py0000644000076400007640000000424412051550016020035 0ustar tilmanntilmann#! /bin/env python # latexchanges # # Wrapper for latexdiff, intended as a drop-in replacement for latex, # when you have several numbered (or dated) versions of a manuscript. # My coauthors don't as a rule know what CVS or SVN is, they simply # use a number or date for the different versions. # # latexchanges replaces the current DVI with one that includes a # latexdiff to the last version. The last version is selected as the # TEX file in the same directory with the same prefix (up to a number # or a dot), that has an mtime immediately preceding the given TEX # file. # # (I should probably add CVS version numbering too, at some point.) # # Copyright (C) 2009 by Jan-\AA{}ke Larsson # Released under the terms of the GNU General Public License (GPL) # Version 2. See http://www.gnu.org/ for details. # # Please do provide patches and bug reports, but remember: if it # breaks, you get to keep the pieces. # # Jan-\AA{}ke Larsson # Sept 16 2009 from os import listdir,system,stat from sys import argv from re import split name="" newarg=[] # Find filename argument for i in range(1,len(argv)): if argv[i][-4:]==".tex": basename=split('[0-9.]',argv[i])[0] name=argv[i][:-4] newarg.append(name+".changes.tex") else: newarg.append(argv[i]) if name: print "Filename",name+".tex" print "Prefix is",basename # Find last archived version mtime=stat(name+".tex").st_mtime old_mtime=0 ls=listdir(".") for j in ls: if j.startswith(basename) and j.endswith(".tex")\ and not j.endswith(".changes.tex"): tmptime=stat(j).st_mtime if mtime>tmptime and old_mtime0: print "Comparing with",oldname system ("/bin/cp "+name+".aux "+name+".changes.aux") system ("/bin/cp "+name+".bbl "+name+".changes.bbl") system ("latexdiff "+oldname+" "+name+".tex > "+name+".changes.tex") system ("latex "+" ".join(newarg)) system ("cp "+name+".changes.dvi "+name+".dvi") else: system ("latex "+" ".join(argv[1:])) latexdiff-1.0.2/contrib/README.latexchanges0000644000076400007640000000107712051550016020343 0ustar tilmanntilmannlatexchanges.py (Jan-Ake Larsson): Here's a wrapper I wrote for latexdiff, intended as a drop-in replacement for latex, when you have several numbered (or dated) versions of a manuscript. My coauthors don't as a rule know what CVS or SVN is, they simply use a number or date for the different versions. latexchanges replaces the current DVI with one that includes a latexdiff to the last version. The last version is selected as the TEX file in the same directory with the same prefix (up to a number or a dot), that has an mtime immediately preceding the given TEX file.