summaryrefslogtreecommitdiff
path: root/support/latexdiff
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2019-09-02 13:46:59 +0900
committerNorbert Preining <norbert@preining.info>2019-09-02 13:46:59 +0900
commite0c6872cf40896c7be36b11dcc744620f10adf1d (patch)
tree60335e10d2f4354b0674ec22d7b53f0f8abee672 /support/latexdiff
Initial commit
Diffstat (limited to 'support/latexdiff')
-rw-r--r--support/latexdiff/COPYING623
-rw-r--r--support/latexdiff/Makefile64
-rw-r--r--support/latexdiff/README118
-rw-r--r--support/latexdiff/contrib/README.latexchanges13
-rw-r--r--support/latexdiff/contrib/latexchanges.py67
-rwxr-xr-xsupport/latexdiff/contrib/latexdiff-wrap192
-rw-r--r--support/latexdiff/contrib/latexdiff.spec58
-rw-r--r--support/latexdiff/doc/example-diff.tex107
-rw-r--r--support/latexdiff/doc/latexdiff-man.pdfbin0 -> 274601 bytes
-rw-r--r--support/latexdiff/doc/latexdiff-man.tex367
-rw-r--r--support/latexdiff/example/example-draft.tex59
-rw-r--r--support/latexdiff/example/example-rev.tex60
-rwxr-xr-xsupport/latexdiff/latexdiff5030
-rwxr-xr-xsupport/latexdiff/latexdiff-fast5591
-rwxr-xr-xsupport/latexdiff/latexdiff-so5487
-rwxr-xr-xsupport/latexdiff/latexdiff-vc827
-rw-r--r--support/latexdiff/latexdiff-vc.1309
-rw-r--r--support/latexdiff/latexdiff.1924
-rwxr-xr-xsupport/latexdiff/latexrevise538
-rw-r--r--support/latexdiff/latexrevise.1243
20 files changed, 20677 insertions, 0 deletions
diff --git a/support/latexdiff/COPYING b/support/latexdiff/COPYING
new file mode 100644
index 0000000000..d6fa9152e8
--- /dev/null
+++ b/support/latexdiff/COPYING
@@ -0,0 +1,623 @@
+ GNU GENERAL PUBLIC LICENSE
+ Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ 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
+
+
diff --git a/support/latexdiff/Makefile b/support/latexdiff/Makefile
new file mode 100644
index 0000000000..143ddd213c
--- /dev/null
+++ b/support/latexdiff/Makefile
@@ -0,0 +1,64 @@
+# Modify these paths to the requirements of your own system
+# For the current setting you will need root permission but
+# it is perfectly acceptable to choose user directories
+#
+INSTALLPATH = /usr/local
+INSTALLMANPATH = $(INSTALLPATH)/man
+INSTALLEXECPATH = $(INSTALLPATH)/bin
+
+default:
+ @echo "To install stand-alone version type: make install"
+ @echo " (Note the standard version requires prior installation"
+ @echo " of the PERL package Algorithm::Diff available from "
+ @echo " the PERL archive www.cpan.org)"
+ @echo " "
+ @echo "To install fast version (using UNIX diff) type: make install fast "
+ @echo " "
+ @echo "To install the version which uses the system Algorithm::Diff package type: make install-ext"
+ @echo " "
+
+install: install-so
+
+install-ext: install-latexdiff install-latexrevise install-latexdiff-vc install-man
+
+install-so: install-latexdiff-so install-latexrevise install-latexdiff-vc install-man
+
+install-fast: install-latexdiff-fast install-latexrevise install-latexdiff-vc install-man
+
+install-man:
+ install -m 644 -D -t $(INSTALLMANPATH)/man1 latexrevise.1 latexdiff.1 latexdiff-vc.1
+
+install-latexdiff:
+ install -D -t $(INSTALLEXECPATH) latexdiff
+
+install-latexdiff-so:
+ if [ -e $(INSTALLEXECPATH)/latexdiff ]; then rm $(INSTALLEXECPATH)/latexdiff; fi
+ install -D -t $(INSTALLEXECPATH) latexdiff-so
+ cd $(INSTALLEXECPATH); ln -s latexdiff-so latexdiff
+
+install-latexdiff-fast:
+ if [ -e $(INSTALLEXECPATH)/latexdiff ]; then rm $(INSTALLEXECPATH)/latexdiff; fi
+ install -D -t $(INSTALLEXECPATH) latexdiff-fast
+ cd $(INSTALLEXECPATH); ln -s latexdiff-fast latexdiff
+
+install-latexrevise:
+ install -D -t $(INSTALLEXECPATH) latexrevise
+
+install-latexdiff-vc:
+ install -D -t $(INSTALLEXECPATH) latexdiff-vc
+ cd $(INSTALLEXECPATH); for vcs in cvs rcs svn git hg ; do if [ -e latexdiff-$$vcs ]; then rm latexdiff-$$vcs; fi; ln -s latexdiff-vc latexdiff-$$vcs ; done
+
+test-ext:
+ @echo "latexdiff example/example-draft.tex example/example-rev.tex (system Algorithm::Diff)"
+ ./latexdiff -V example/example-draft.tex example/example-rev.tex > example/example-diff.tex
+ @echo "Difference file created: example/example-diff.tex"
+
+test-so:
+ @echo "latexdiff example/example-draft.tex example/example-rev.tex (stand-alone version)"
+ ./latexdiff-so -V example/example-draft.tex example/example-rev.tex > example/example-diff.tex
+ @echo "Difference file created: example/example-diff.tex"
+
+test-fast:
+ @echo "latexdiff example/example-draft.tex example/example-rev.tex (stand-alone version)"
+ ./latexdiff-fast -V example/example-draft.tex example/example-rev.tex > example/example-diff.tex
+ @echo "Difference file created: example/example-diff.tex"
diff --git a/support/latexdiff/README b/support/latexdiff/README
new file mode 100644
index 0000000000..b75fa841bc
--- /dev/null
+++ b/support/latexdiff/README
@@ -0,0 +1,118 @@
+INTRODUCTION
+
+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. Note that only files conforming to latex syntax will
+be processed correctly, not generic TeX files. Some further
+minor restrictions apply, see documentation.
+
+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.
+
+Project webpage: https://github.com/ftilmann/latexdiff/
+CTAN page: http://www.ctan.org/pkg/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, latexdiff-git
+ latexdiff-svn and latexdiff-hg for latexdiff-vc.
+
+The attached trivial 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. It will often be
+as easy to carry out these steps manually instead of using the Makefile.
+
+
+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)
+
+Contributions 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
+
+EXTERNAL LATEXDIFF SUPPORT PROGRAMS
+
+LATEXDIFFCITE (Author: Christer van der Meeren) is a wrapper around latexdiff to make citations diff properly. It works by expanding \cite type commands using the bbl or bib file, such that citations are treated just like normal text rather than as atomic in the plain latexdiff.
+https://latexdiffcite.readthedocs.org
+
+GIT-LATEXDIFF (lead author: Matthieu Moy) is a wrapper (bash scipt) around latexdiff that allows using it to diff two revisions of a LaTeX file under git revision control (similar functionality is provided by latexdiff-vc --git with --flatten option included with this distribution but git-latexdiff allows more fine-grained control on (not to be confused with latexdiff-git, which is normally installed as a soft link to latexdiff-vc)
+https://gitorious.org/git-latexdiff/
+
+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).
+
diff --git a/support/latexdiff/contrib/README.latexchanges b/support/latexdiff/contrib/README.latexchanges
new file mode 100644
index 0000000000..4a02765844
--- /dev/null
+++ b/support/latexdiff/contrib/README.latexchanges
@@ -0,0 +1,13 @@
+latexchanges.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.
+
+
diff --git a/support/latexdiff/contrib/latexchanges.py b/support/latexdiff/contrib/latexchanges.py
new file mode 100644
index 0000000000..de7acbe825
--- /dev/null
+++ b/support/latexdiff/contrib/latexchanges.py
@@ -0,0 +1,67 @@
+#! /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 <jan-ake.larsson@liu.se>
+# 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_mtime<tmptime:
+ oldname=j
+ old_mtime=tmptime
+
+ # Archived version found?
+ if old_mtime>0:
+ 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:]))
diff --git a/support/latexdiff/contrib/latexdiff-wrap b/support/latexdiff/contrib/latexdiff-wrap
new file mode 100755
index 0000000000..894b424de3
--- /dev/null
+++ b/support/latexdiff/contrib/latexdiff-wrap
@@ -0,0 +1,192 @@
+#!/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 <VolkerKuhlmann@gmx.de>
+# 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 <VolkerKuhlmann@gmx.de>"
+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
diff --git a/support/latexdiff/contrib/latexdiff.spec b/support/latexdiff/contrib/latexdiff.spec
new file mode 100644
index 0000000000..9255a69fea
--- /dev/null
+++ b/support/latexdiff/contrib/latexdiff.spec
@@ -0,0 +1,58 @@
+Summary: 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 <tilmann@esc.cam.ac.uk>
+
+
+%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 <till@doerges.net> - 0.5-1
+- Initial build.
diff --git a/support/latexdiff/doc/example-diff.tex b/support/latexdiff/doc/example-diff.tex
new file mode 100644
index 0000000000..9724038884
--- /dev/null
+++ b/support/latexdiff/doc/example-diff.tex
@@ -0,0 +1,107 @@
+\documentclass[12pt,a4paper]{article}
+%DIF LATEXDIFF DIFFERENCE FILE
+%DIF DEL example-draft.tex Thu Jun 12 00:01:26 2014
+%DIF ADD example-rev.tex Thu Jun 12 00:01:26 2014
+
+\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
+\providecommand{\DIFmodbegin}{} %DIF PREAMBLE
+\providecommand{\DIFmodend}{} %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 LISTINGS PREAMBLE %DIF PREAMBLE
+\RequirePackage{listings} %DIF PREAMBLE
+\RequirePackage{color} %DIF PREAMBLE
+\lstdefinelanguage{DIFcode}{ %DIF PREAMBLE
+%DIF DIFCODE_UNDERLINE %DIF PREAMBLE
+ moredelim=[il][\color{red}\sout]{\%DIF\ <\ }, %DIF PREAMBLE
+ moredelim=[il][\color{blue}\uwave]{\%DIF\ >\ } %DIF PREAMBLE
+} %DIF PREAMBLE
+\lstdefinestyle{DIFverbatimstyle}{ %DIF PREAMBLE
+ language=DIFcode, %DIF PREAMBLE
+ basicstyle=\ttfamily, %DIF PREAMBLE
+ columns=fullflexible, %DIF PREAMBLE
+ keepspaces=true %DIF PREAMBLE
+} %DIF PREAMBLE
+\lstnewenvironment{DIFverbatim}{\lstset{style=DIFverbatimstyle}}{} %DIF PREAMBLE
+\lstnewenvironment{DIFverbatim*}{\lstset{style=DIFverbatimstyle,showspaces=true}}{} %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}
+
+
diff --git a/support/latexdiff/doc/latexdiff-man.pdf b/support/latexdiff/doc/latexdiff-man.pdf
new file mode 100644
index 0000000000..32bfa06e2b
--- /dev/null
+++ b/support/latexdiff/doc/latexdiff-man.pdf
Binary files differ
diff --git a/support/latexdiff/doc/latexdiff-man.tex b/support/latexdiff/doc/latexdiff-man.tex
new file mode 100644
index 0000000000..1059eb25a3
--- /dev/null
+++ b/support/latexdiff/doc/latexdiff-man.tex
@@ -0,0 +1,367 @@
+\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}}
+\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 edit \verb|example-diff.tex| to 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-diff.tex > example-final.tex
+\end{verbatim}
+\verb|example-final.tex| is then almost identical to
+\verb|example-rev.tex| except for the last paragraph.
+
+\section*{External tools}
+The following is an incomplete list of wrappers written by others providing some added functionality. These are not included with the distribution but need to be downloaded and installed separately.
+
+\begin{description}
+ \item[latexdiffcite] (Author: Christer van der Meeren) is a wrapper around latexdiff to make citations diff properly. It works by expanding \verb|\cite| type commands using the bbl or bib file, such that citations are treated just like normal text rather than as atomic in the plain latexdiff. \\
+\verb|https://latexdiffcite.readthedocs.org|
+\item[git-latexdiff] (lead author: Matthieu Moy) is a wrapper (bash scipt) around latexdiff that allows using it to diff two revisions of a LaTeX file under git revision control Similar functionality is provided by \verb|latexdiff-vc --git| with \verb|--flatten| option included with this distribution but git-latexdiff allows more fine-grained control on varous aspects. (Not to be confused with latexdiff-git, which is normally installed as a soft link to latexdiff-vc) \\
+\verb|https://gitorious.org/git-latexdiff/|
+
+\end{description}
+
+\end{document}
diff --git a/support/latexdiff/example/example-draft.tex b/support/latexdiff/example/example-draft.tex
new file mode 100644
index 0000000000..593a170712
--- /dev/null
+++ b/support/latexdiff/example/example-draft.tex
@@ -0,0 +1,59 @@
+\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}
+
+
diff --git a/support/latexdiff/example/example-rev.tex b/support/latexdiff/example/example-rev.tex
new file mode 100644
index 0000000000..4bcaf15627
--- /dev/null
+++ b/support/latexdiff/example/example-rev.tex
@@ -0,0 +1,60 @@
+\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}
+
+
diff --git a/support/latexdiff/latexdiff b/support/latexdiff/latexdiff
new file mode 100755
index 0000000000..227cc2c45e
--- /dev/null
+++ b/support/latexdiff/latexdiff
@@ -0,0 +1,5030 @@
+#!/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-16 F J Tilmann (tilmann@gfz-potsdam.de)
+#
+# Repository/issue tracker: https://github.com/ftilmann/latexdiff
+# CTAN page: http://www.ctan.org/pkg/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 <http://www.gnu.org/licenses/>.
+#
+# Detailed usage information at the end of the file
+#
+
+# Version 1.3.0 (7 October 2018):
+# - treat options to \documentclass as potential package names (some packages allow implicit loading of or imply selected packages
+# - improved pattern matching: now allows nested angular brackets, and is no longer confused by escaped curly braces
+# - improved pattern matching in COARSE mode: occasionally, the closing bracket or some other elements would be matched in an 'unnatural' way due to another sequence being more minimal in the computational sense, sometimes even causing errors due to tokens moving in or out of the scope of math environments. This is now discouraged by adding internal \DIFANCHOR commands (which are removed again in post-processing) (fixes issues reported via email by li_ruomeng .
+# - verbatim and lstlisting environments are marked-up with line-by-line in a similar style to non-verbatim text (requires the listing package to be installed)
+# (see new configuration variable VERBATIMLINEENV) (several issues and pull requests by jprotze)
+# - --flatten: now supports \verbatiminput and \lstlistinput
+# - --flatten: if file is not found, do not fail, simply warn and leave command unexpanded (inspired by issue #112). Don't warn if file name contains #[0-9] as it is then most likely an argument within a command definition rather than an actual file (applies to \input, \subfile, \include commands)
+# - added to textcmds: \intertext
+# - new config variable CUSTOMDIFCMD to allow defining special versions of commands in added or deleted blocks (Pull request by github user jprotze)
+# - added option -no-links (mostly for use by latexdiff-vc in only-changes modes) (Pull request by github user jprotze)
+# Bug fixes:
+# - pattern matching of \verb and \lstinline commands had an error which meant they would trigger on commands beginning with \verb.
+# - In description environments, mark up item descriptions by effectively reating the insides of item commannds as text commands (fixes #161)
+#
+#
+# Version 1.2.1 (22 June 2017)
+# - add "DeclareOldFontCommand" to styles using \bf or \sf old style font commands (fixies issue #92 )
+# - improved markup: process lstinline commands in listings package correctly
+# for styles using colour, \verb and \lstinline arguments are marked up with colour (blue for added, red for deleted)
+# - bug fix: protecting inline math expressions for mbox did not work as intended (see stack exchange question: http://tex.stackexchange.com/questions/359412/compiling-the-latexdiff-when-adding-a-subscript-before-a-pmatrix-environment-cau)
+# - bug fix: when deleted \item commands are followed immediately by unsafe commands, they were not restored properly
+# (thanks to J. Protze for pull request) (pull request #89)
+# - treat lstlisting and comment as equivalent to verbatim environment
+# make environments that are treated like verbatim environments configurable (config variable VERBATIMENV)
+# treat lstinlne as equivalent to verb command
+# partially addresses issue #38
+# - refactoring: set default configuration variables in a hash, and those that correspond to lists
+# - feature: option --add-to-config used to amend configuration variables, which are regex pattern lists
+# - bug fix: deleted figures when endfloat package is activated
+# - bug fix: alignat environment now always processed correctly (fix issues #65)
+# - bug fix: avoid processing of commands as potential files in routine init_regex_arr (fix issue #70 )
+# - minimal feature enhancement: treat '@' as allowed character in commands (strictly speaking requires prior \makeatletter statement, but always assuming it to be
+# @ a letter if it is part of a command name will usually lead to the correct behaviour (see http://tex.stackexchange.com/questions/346651/latexdiff-and-let)
+# - new feature/bug fix: --flatten option \endinput in included files now respected but only if \endinput stands right at the beginning of the line (issue #77)
+# - bug fix: flatten would incorrectly attempt to process commented out \include commands (from discussion in issue #77 )
+# - introduce an invisible space (\hspace{0pt} after \mbox{..} auxiliary commands (not in math mode), to allow line breaks between added and deleted citations (change should not cause adverse behaviour otherwise)
+#
+# Version 1.2.0:
+# - highlight new and deleted figures
+# - bug fix in title mark-up. Previously deleted commands in title (such as \title, \author or \date) were marked up erroneously
+# - (minor) bug fixes in new 1.1.1 features: disabled label was commented out twice, additional spaces were introduced before list environment begin and end commands
+# - depracation fix: left brace in RegEx now needs to be escaped
+# - add type PDFCOMMENT based on issue #49 submitted by github user peci1 (Martin Pecka)
+# - make utf8 the default encoding
+#
+# Version 1.1.1
+# - patch mhchem: allow ce in equations
+# - flatten now also expands \input etc. in the preamble (but not \usepackage!)
+# - Better support for Japanese ( contributed by github user kshramt )
+# - prevent duplicated verbatim hashes (patch contributed by github user therussianjig, issue #36)
+# - disable deleted label commands (fixes issue #31)
+# - introduce post-processing to reinstate most deleted environments and all needed item commands (fixes issue #1)
+#
+# Version 1.1.0
+# - treat diacritics (\",\', etc) as safe commands
+# - treat \_ and \& correctly as safe commands, even if used without spacing to the next word
+# - Add a BOLD markup type that sets added text in bold face (Contribution by Victor Zabalza via pull request )
+# - add append-mboxsafecmd list option to be able to specify special safe commands which need to be surrounded by mbox to avoid breaking (mostly this is needed with ulem package)
+# - support for siunitx and cleveref packages: protect \SI command in siunitx package and \cref,\Cref{range}{*} in cleveref packages (thanks to Stefan Pinnow for testing)
+# - experimental support for chemformula, mhchem packages: define \ch and \ce in packages as safe (but not \ch,\cee in equation array environments) - these unfortunately will not be marked up (thanks to Stefan Pinnow for testing)
+# - bug fix: packages identified correctly even if \usepackage command options extend over several lines (previously \usepackage command needed to be fully contained in one line)
+# - new subtype ONLYCHANGEDPAGE outputs only changed pages (might not work well for floating material)
+# - new subtype ZLABEL operates similarly to LABEL but uses absolute page numbers (needs zref package)
+# - undocumented option --debug/--nodebug to override default setting for debug mode (Default: 0 for release version, 1: for development version
+#
+# Version 1.0.4
+# - introduce list UNSAFEMATHCMD, which holds list of commands which cannot be marked up with \DIFadd or \DIFdel commands (only relevant for WHOLE and COARSE math markup modes)
+# - new subtype LABEL which gives each change a label. This can later be used to only display pages where changes
+# have been made (instructions for that are put as comments into the diff'ed file) inspired by answer on http://tex.stackexchange.com/questions/166049/invisible-markers-in-pdfs-using-pdflatex
+# - Configuration variables take into accout some commands from additional packages:
+# tikzpicture environment now treated as PICTUREENV, and \smallmatrix in ARRENV (amsmath)
+# - --flatten: support for \subfile command (subfiles package) (in response to http://tex.stackexchange.com/questions/167620/latexdiff-with-subfiles )
+# - --flatten: \bibliography commands expand if corresponding bbl file present
+# - angled bracket optional commands now parsed correctly (patch #3570) submitted by Dave Kleinschmidt (thanks)
+# - \RequirePackage now treated as synonym of \usepackage with respect to setting packages
+# - special rules for apacite package (redefine citation commands)
+# - recognise /dev/null as 'file-like' arguments for --preamble and --config options
+# - fix units package incompatibility with ulem for text maths statements $ ..$ (thanks to Stuart Prescott for reporting this)
+# - amsmath environment cases treated correctly (Bug fix #19029) (thanks to Jalar)
+# - {,} in comments no longer confuse latexdiff (Bug fix #19146)
+# - \% in one-letter sub/Superscripts was not converted correctly
+#
+# Version 1.0.3
+# - fix bug in add_safe_commands that made latexdiff hang on DeclareMathOperator
+# command in preamble
+# - \(..\) inline math expressions were not parsed correctly, if they contained a linebreak
+# - applied patch contributed by tomflannaghan via Berlios: [ Patch #3431 ] Adds correct handling of \left< and \right>
+# - \$ is treated correctly as a literal dollar sign (thanks to Reed Cartwright and Joshua Miller for reporting this bug
+# and sketching out the solution)
+# - \^ and \_ are correctly interpreted as accent and underlined space, respectively, not as superscript of subscript
+# (thanks to Wail Yahyaoui for pointing out this bug)
+#
+# 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
+# \<nl> (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)=<<EOF ;
+This is LATEXDIFF 1.3.0 (Algorithm::Diff $Algorithm::Diff::VERSION, Perl $^V)
+ (c) 2004-2018 F J Tilmann
+EOF
+
+# Hash with defaults for configuration variables. These marked undef have default values constructed from list defined in the DATA block
+# (under tag CONFIG)
+my %CONFIG=(
+ MINWORDSBLOCK => 3, # minimum number of tokens to form an independent block
+ # shorter identical blocks will be merged to the previous word
+ SCALEDELGRAPHICS => 0.5, # factor with which deleted figures will be scaled down (i.e. 0.5 implies they are shown at half linear size)
+ # this is only used for --graphics-markup=BOTH option
+ FLOATENV => undef , # Environments in which FL variants of defined commands are used
+ PICTUREENV => undef , # Environments in which all change markup is removed
+ MATHENV => undef , # Environments turning on display math mode (code also knows about \[ and \])
+ MATHREPL => 'displaymath', # Environment introducing deleted maths blocks
+ MATHARRENV => undef , # Environments turning on eqnarray math mode
+ MATHARRREPL => 'eqnarray*', # Environment introducing deleted maths blocks
+ ARRENV => undef , # Environments making arrays in math mode. The underlining style does not cope well with those - as a result in-text math environments are surrounded by \mbox{ } if any of these commands is used in an inline math block
+ COUNTERCMD => undef,
+ # COUNTERCMD textcmds which are associated with a counter
+ # If any of these commands occur in a deleted block
+ # they will be succeeded by an \addtocounter{...}{-1}
+ # for the associated counter such that the overall numbers
+ # should be the same as in the new file
+ LISTENV => undef , # list making environments - they will generally be kept
+ VERBATIMENV => undef, # Environments whose content should be treated as verbatim text and not be touched
+ VERBATIMLINEENV => undef, # Environments whose content should be treated as verbatim text and processed in line diff mode
+ CUSTOMDIFCMD => undef,# Custom dif command. Is defined in the document as a \DELcommand and \ADDcommand version to be replaced by the diff
+ ITEMCMD => 'item' # command marking item in a list environment
+);
+# Configuration variables: these have to be visible from the subroutines
+my ($ARRENV,
+ $COUNTERCMD,
+ $FLOATENV,
+ $ITEMCMD,
+ $LISTENV,
+ $MATHARRENV,
+ $MATHARRREPL,
+ $MATHENV,
+ $MATHREPL,
+ $MINWORDSBLOCK,
+ $PICTUREENV,
+ $SCALEDELGRAPHICS,
+ $VERBATIMENV,
+ $VERBATIMLINEENV,
+ $CUSTOMDIFCMD
+ );
+
+# my $MINWORDSBLOCK=3; # minimum number of tokens to form an independent block
+# # shorter identical blocks will be merged to the previous word
+# my $SCALEDELGRAPHICS=0.5; # factor with which deleted figures will be scaled down (i.e. 0.5 implies they are shown at half linear size)
+# # this is only used for --graphics-markup=BOTH option
+# my $FLOATENV='(?:figure|table|plate)[\w\d*@]*' ; # Environments in which FL variants of defined commands are used
+# my $PICTUREENV='(?:picture|tikzpicture|DIFnomarkup)[\w\d*@]*' ; # Environments in which all change markup is removed
+# my $MATHENV='(?:equation[*]?|displaymath|DOLLARDOLLAR)[*]?' ; # Environments turning on display math mode (code also knows about \[ and \])
+# my $MATHREPL='displaymath'; # Environment introducing deleted maths blocks
+# my $MATHARRENV='(?:eqnarray|align|alignat|gather|multline|flalign)[*]?' ; # Environments turning on eqnarray math mode
+# my $MATHARRREPL='eqnarray*'; # Environment introducing deleted maths blocks
+# my $ARRENV='(?:aligned|gathered|array|[pbvBV]?matrix|smallmatrix|cases|split)'; # Environments making arrays in math mode. The underlining style does not cope well with those - as a result in-text math environments are surrounded by \mbox{ } if any of these commands is used in an inline math block
+# my $COUNTERCMD='(?:footnote|part|chapter|section|subsection|subsubsection|paragraph|subparagraph)'; # textcmds which are associated with a counter
+# # If any of these commands occur in a deleted block
+# # they will be succeeded by an \addtocounter{...}{-1}
+# # for the associated counter such that the overall numbers
+# # should be the same as in the new file
+# my $LISTENV='(?:itemize|description|enumerate)'; # list making environments - they will generally be kept
+# my $ITEMCMD='item'; # command marking item in a list environment
+
+
+
+my $LABELCMD='(?:label)'; # matching commands are disabled within deleted blocks - mostly useful for maths mode, as otherwise it would be fine to just not add those to SAFECMDLIST
+my @UNSAFEMATHCMD=('qedhere'); # Commands which are definitely unsafe for marking up in math mode (amsmath qedhere only tested to not work with UNDERLINE markup) (only affects WHOLE and COARSE math markup modes). Note that unlike text mode (or FINE math mode0 deleted unsafe commands are not deleted but simply taken outside \DIFdel
+my $MBOXINLINEMATH=0; # if set to 1 then surround marked-up inline maths expression with \mbox ( to get around compatibility
+ # problems between some maths packages and ulem package
+
+
+# Markup strings
+# If at all possible, do not change these as parts of the program
+# depend on the actual name (particularly post-processing)
+# At the very least adapt subroutine postprocess to new tokens.
+my $ADDMARKOPEN='\DIFaddbegin '; # Token to mark begin of appended text
+my $ADDMARKCLOSE='\DIFaddend '; # Token to mark end of appended text
+my $ADDOPEN='\DIFadd{'; # To mark begin of added text passage
+my $ADDCLOSE='}'; # To mark end of added text passage
+my $ADDCOMMENT='DIF > '; # To mark added comment line
+my $DELMARKOPEN='\DIFdelbegin '; # Token to mark begin of deleted text
+my $DELMARKCLOSE='\DIFdelend '; # Token to mark end of deleted text
+my $DELOPEN='\DIFdel{'; # To mark begin of deleted text passage
+my $DELCLOSE='}'; # To mark end of deleted text passage
+my $DELCMDOPEN='%DIFDELCMD < '; # To mark begin of deleted commands (must begin with %, i.e., be a comment
+my $DELCMDCLOSE="%%%\n"; # To mark end of deleted commands (must end with a new line)
+my $AUXCMD='%DIFAUXCMD' ; # follows auxiliary commands put in by latexdiff to make difference file legal
+ # auxiliary commands must be on a line of their own
+ # Note that for verbatim environment openings the %DIFAUXCMD cannot be placed in
+ # the same line as this would mean they are shown
+ # so the special form "%DIFAUXCMD NEXT" is used to indicate that the next line
+ # is an auxiliary command
+ # Similarly "%DIFAUXCMD LAST" would indicate the auxiliary command is in previous line (not currently used)
+my $DELCOMMENT='DIF < '; # To mark deleted comment line
+my $VERBCOMMENT='DIFVRB '; # to mark lines which are within a verbatim environment
+
+# main local variables:
+my @TEXTCMDLIST=(); # array containing patterns of commands with text arguments
+my @TEXTCMDEXCL=(); # array containing patterns of commands without text arguments (if a pattern
+ # matches both TEXTCMDLIST and TEXTCMDEXCL it is excluded)
+my @CONTEXT1CMDLIST=(); # array containing patterns of commands with text arguments (subset of text commands),
+ # but which cause confusion if used out of context (e.g. \caption).
+ # In deleted passages, the command will be disabled but its argument is marked up
+ # Otherwise they behave exactly like TEXTCMD's
+my @CONTEXT1CMDEXCL=(); # exclude list for above, but always empty
+my @CONTEXT2CMDLIST=(); # array containing patterns of commands with text arguments, but which fail or cause confusion
+ # if used out of context (e.g. \title). They and their arguments will be disabled in deleted
+ # passages
+my @CONTEXT2CMDEXCL=(); # exclude list for above, but always empty
+my @MATHTEXTCMDLIST=(); # treat like textcmd. If a textcmd is in deleted or added block, just wrap the
+ # whole content with \DIFadd or \DIFdel irrespective of content. This functionality
+ # is useful for pseudo commands \MATHBLOCK.. into which math environments are being
+ # transformed
+my @MATHTEXTCMDEXCL=(); #
+
+# Note I need to declare this with "our" instead of "my" because later in the code I have to "local"ise these
+our @SAFECMDLIST=(); # array containing patterns of safe commands (which do not break when in the argument of DIFadd or DIFDEL)
+our @SAFECMDEXCL=();
+my @MBOXCMDLIST=(); # patterns for commands which are in principle safe but which need to be surrounded by an \mbox
+my @MBOXCMDEXCL=(); # all the patterns in MBOXCMDLIST will be appended to SAFECMDLIST
+
+
+my ($i,$j,$l);
+my ($old,$new);
+my ($line,$key);
+my (@dumlist);
+my ($newpreamble,$oldpreamble);
+my (@newpreamble,@oldpreamble,@diffpreamble,@diffbody);
+my ($latexdiffpreamble);
+my ($oldbody, $newbody, $diffbo);
+my ($oldpost, $newpost);
+my ($diffall);
+# Option names
+my ($type,$subtype,$floattype,$config,$preamblefile,$encoding,$nolabel,$visiblelabel,
+ $showpreamble,$showsafe,$showtext,$showconfig,$showall,
+ $replacesafe,$appendsafe,$excludesafe,
+ $replacetext,$appendtext,$excludetext,
+ $replacecontext1,$appendcontext1,
+ $replacecontext2,$appendcontext2,
+ $help,$verbose,$driver,$version,$ignorewarnings,
+ $enablecitmark,$disablecitmark,$allowspaces,$flatten,$nolinks,$debug,$earlylatexdiffpreamble); ###$disablemathmark,
+my ($mboxsafe);
+# MNEMNONICS for mathmarkup
+my $mathmarkup;
+use constant {
+ OFF => 0,
+ WHOLE => 1,
+ COARSE => 2,
+ FINE => 3
+};
+# MNEMNONICS for graphicsmarkup
+my $graphicsmarkup;
+use constant {
+ NONE => 0,
+ NEWONLY => 1,
+ BOTH => 2
+};
+
+my ($mboxcmd);
+
+my (@configlist,@addtoconfiglist,@labels,
+ @appendsafelist,@excludesafelist,
+ @appendmboxsafelist,@excludemboxsafelist,
+ @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
+$mathmarkup=COARSE;
+$verbose=0;
+# output debug and intermediate files, set to 0 in final distribution
+$debug=0;
+# insert preamble directly after documentclass - experimental feature, set to 0 in final distribution
+# Note that this failed with mini example (or other files, where packages used in latexdiff preamble
+# are called again with incompatible options in preamble of resulting file)
+$earlylatexdiffpreamble=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,
+ 'add-to-config=s' => \@addtoconfiglist,
+ '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,
+ 'exclude-mboxsafecmd=s' => \@excludemboxsafelist,
+ 'append-mboxsafecmd=s' => \@appendmboxsafelist,
+ '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,
+ 'graphics-markup=s' => \$graphicsmarkup,
+ 'enable-citation-markup|enforce-auto-mbox' => \$enablecitmark,
+ 'disable-citation-markup|disable-auto-mbox' => \$disablecitmark,
+ 'verbose|V' => \$verbose,
+ 'ignore-warnings' => \$ignorewarnings,
+ 'driver=s'=> \$driver,
+ 'flatten' => \$flatten,
+ 'no-links' => \$nolinks,
+ 'version' => \$version,
+ 'help|h' => \$help,
+ 'debug!' => \$debug ) or die "Use latexdiff -h to get help.\n" ;
+
+if ( $help ) {
+ usage() ;
+}
+
+
+if ( $version ) {
+ die $versionstring ;
+}
+
+print STDERR $versionstring if $verbose;
+
+if (defined($showall)){
+ $showpreamble=$showsafe=$showtext=$showconfig=1;
+}
+# Default types
+$type='UNDERLINE' unless defined($type);
+$subtype='SAFE' unless defined($subtype);
+# set floattype to IDENTICAL for LABEL and ONLYCHANGEDPAGE subtype, unless it has been set explicitly on the command line
+$floattype=($subtype eq 'LABEL' || $subtype eq 'ONLYCHANGEDPAGE') ? 'IDENTICAL' : 'FLOATSAFE' unless defined($floattype);
+if ( $subtype eq 'LABEL' ) {
+ print STDERR "Note that LABEL subtype is deprecated. If possible, use ZLABEL instead (requires zref package)";
+}
+
+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 "latexdiff Illegal value: ($mathmarkup) for option--math-markup. Possible values: OFF,WHOLE,COARSE,FINE,0-3\n";
+ }
+ # 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);
+}
+# setting up @MBOXCMDLIST and @MBOXCMDEXCL
+foreach $mboxsafe ( @appendmboxsafelist ) {
+ init_regex_arr_ext(\@MBOXCMDLIST, $mboxsafe);
+}
+foreach $mboxsafe ( @excludemboxsafelist ) {
+ init_regex_arr_ext(\@MBOXCMDEXCL, $mboxsafe);
+}
+
+
+
+# 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 || lc $config eq '/dev/null' ) {
+ open(FILE,$config) or die ("Couldn't open configuration file $config: $!");
+ while (<FILE>) {
+ 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)";
+ exists $CONFIG{$1} or die "Unknown configuration variable $1.";
+ $CONFIG{$1}=$2;
+}
+
+my @addtoconfig=();
+foreach $config ( @addtoconfiglist ) {
+ if (-f $config || lc $config eq '/dev/null' ) {
+ open(FILE,$config) or die ("Couldn't open addd-to-config file $config: $!");
+ while (<FILE>) {
+ chomp;
+ next if /^\s*#/ || /^\s*%/ || /^\s*$/ ;
+ push (@addtoconfig,$_);
+ }
+ close(FILE);
+ }
+ else {
+# foreach ( split(",",$config) ) {
+# push @addtoconfig,$_;
+# }
+ push @addtoconfig,split(",",$config)
+ }
+}
+
+# initialise default lists from DATA
+# for those configuration variables, which have not been set explicitly, initiate from list in document
+foreach $key ( keys(%CONFIG) ) {
+ if (!defined $CONFIG{$key}) {
+ @dumlist=();
+ init_regex_arr_data(\@dumlist,"$key CONFIG");
+ $CONFIG{$key}=join(";",@dumlist)
+ }
+}
+
+
+foreach $assign ( @addtoconfig ) {
+ ###print STDERR "assign:|$assign|\n";
+ $assign=~ m/\s*(\w*)\s*=\s*(\S*)\s*$/ or die "Illegal assignment $assign in configuration list (must be variable=value)";
+ exists $CONFIG{$1} or die "Unknown configuration variable $1.";
+ $CONFIG{$1}.=";$2";
+}
+
+# Map from hash to variables (we do this to have more concise code later, change from comma-separated list)
+foreach ( keys(%CONFIG) ) {
+ if ( $_ eq "MINWORDSBLOCK" ) { $MINWORDSBLOCK = $CONFIG{$_}; }
+ elsif ( $_ eq "FLOATENV" ) { $FLOATENV = liststringtoregex($CONFIG{$_}) ; }
+ elsif ( $_ eq "ITEMCMD" ) { $ITEMCMD = $CONFIG{$_} ; }
+ elsif ( $_ eq "LISTENV" ) { $LISTENV = liststringtoregex($CONFIG{$_}) ; }
+ elsif ( $_ eq "PICTUREENV" ) { $PICTUREENV = liststringtoregex($CONFIG{$_}) ; }
+ elsif ( $_ eq "MATHENV" ) { $MATHENV = liststringtoregex($CONFIG{$_}) ; }
+ elsif ( $_ eq "MATHREPL" ) { $MATHREPL = $CONFIG{$_} ; }
+ elsif ( $_ eq "MATHARRENV" ) { $MATHARRENV = liststringtoregex($CONFIG{$_}) ; }
+ elsif ( $_ eq "MATHARRREPL" ) { $MATHARRREPL = $CONFIG{$_} ; }
+ elsif ( $_ eq "ARRENV" ) { $ARRENV = liststringtoregex($CONFIG{$_}) ; }
+ elsif ( $_ eq "VERBATIMENV" ) { $VERBATIMENV = liststringtoregex($CONFIG{$_}) ; }
+ elsif ( $_ eq "VERBATIMLINEENV" ) { $VERBATIMLINEENV = liststringtoregex($CONFIG{$_}) ; }
+ elsif ( $_ eq "CUSTOMDIFCMD" ) { $CUSTOMDIFCMD = liststringtoregex($CONFIG{$_}) ; }
+ elsif ( $_ eq "COUNTERCMD" ) { $COUNTERCMD = liststringtoregex($CONFIG{$_}) ; }
+ elsif ( $_ eq "SCALEDELGRAPHICS" ) { $SCALEDELGRAPHICS = $CONFIG{$_} ; }
+ else { die "Unknown configuration variable $_.";}
+}
+
+if ( $mathmarkup == COARSE || $mathmarkup == WHOLE ) {
+ push(@MATHTEXTCMDLIST,qr/^MATHBLOCK(?:$MATHENV|$MATHARRENV|SQUAREBRACKET)$/);
+}
+
+
+
+foreach $pkg ( @packagelist ) {
+ map { $packages{$_}="" } split(/,/,$pkg) ;
+}
+
+
+
+if ($showconfig || $showtext || $showsafe || $showpreamble) {
+ show_configuration();
+ 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 $pat_n = $pat0;
+# if you get "undefined control sequence MATHBLOCKmath" error, increase the maximum value in this loop
+ for (my $i_pat = 0; $i_pat < 20; ++$i_pat){
+ $pat_n = '(?:[^{}]|\{'.$pat_n.'\}|\\\\\{|\\\\\})*';
+ # Actually within the text body, quoted braces are replaced in pre-processing. The only place where
+ # the last part of the pattern matters is when processing the arguments of context2cmds in the preamble
+ # and these contain a \{ or \} combination, probably rare.
+ # It should thus be fine to use the simpler version below.
+ ### $pat_n = '(?:[^{}]|\{'.$pat_n.'\})*';
+ }
+
+ my $brat0 = '(?:[^\[\]]|\\\[|\\\])*';
+ my $brat_n = $brat0;
+ for (my $i_pat = 0; $i_pat < 4; ++$i_pat){
+ $brat_n = '(?:[^\[\]]|\['.$brat_n.'\]|\\\[|\\\])*';
+ ### $brat_n = '(?:[^\[\]]|\['.$brat_n.'\])*'; # Version not taking into account escaped \[ and \]
+ }
+ my $abrat0 = '(?:[^<>])*';
+
+ my $quotemarks = '(?:\'\')|(?:\`\`)';
+ my $punct='[0.,\/\'\`:;\"\?\(\)\[\]!~\p{IsNonAsciiPunct}\p{IsNonAsciiS}]';
+ my $number='-?\d*\.\d*';
+ my $mathpunct='[+=<>\-\|]';
+ my $and = '&';
+ my $coords= '[\-.,\s\d]*';
+# quoted underscore - this needs special treatment as perl treats _ as a letter (\w) but latex does not
+# such that a\_b is interpreted as a{\_}b by latex but a{\_b} by perl
+ my $quotedunderscore='\\\\_';
+# word: sequence of letters or accents followed by letter
+ my $word_ja='\p{Han}+|\p{InHiragana}+|\p{InKatakana}+';
+ my $word='(?:' . $word_ja . '|(?:(?:[-\w\d*]|\\\\[\"\'\`~^][A-Za-z\*])(?!(?:' . $word_ja . ')))+)';
+ my $cmdleftright='\\\\(?:left|right|[Bb]igg?[lrm]?|middle)\s*(?:[<>()\[\]|\.]|\\\\(?:[|{}]|\w+))';
+ my $cmdoptseq='\\\\[\w\d@\*]+'.$extraspace.'(?:(?:<'.$abrat0.'>|\['.$brat_n.'\]|\{'. $pat_n . '\}|\(' . $coords .'\))'.$extraspace.')*';
+ my $defseq='\\\\def\\\\[\w\d@\*]+(?:#\d+|\[#\d+\])+(?:\{'. $pat_n . '\})?';
+ my $backslashnl='\\\\\n';
+ my $oneletcmd='\\\\.\*?(?:\['.$brat_n.'\]|\{'. $pat_n . '\})*';
+ my $math='\$(?:[^$]|\\\$)*?\$|\\\\[(](?:.|\n)*?\\\\[)]';
+## the current maths command cannot cope with newline within the math expression
+ my $comment='%[^\n]*\n';
+ my $pat=qr/(?:\A\s*)?(?:${and}|${quotemarks}|${number}|${word}|$quotedunderscore|${defseq}|$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
+# first find out which file name is longer for correct alignment
+my ($diff,$oldlabel_n_spaces,$newlabel_n_spaces);
+$oldlabel_n_spaces = 0;
+$newlabel_n_spaces = 0;
+$diff = length($newfile) - length($oldfile);
+if ($diff > 0) {
+ $oldlabel_n_spaces = $diff;
+}
+if ($diff < 0) {
+ $newlabel_n_spaces = abs($diff);
+}
+
+my ($oldtime,$newtime,$oldlabel,$newlabel);
+if (defined($labels[0])) {
+ $oldlabel=$labels[0] ;
+} else {
+ $oldtime=localtime((stat($oldfile))[9]);
+ $oldlabel="$oldfile " . " "x($oldlabel_n_spaces) . $oldtime;
+}
+if (defined($labels[1])) {
+ $newlabel=$labels[1] ;
+} else {
+ $newtime=localtime((stat($newfile))[9]);
+ $newlabel="$newfile " . " "x($newlabel_n_spaces) . $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);
+ # flatten preamble
+ $oldpreamble=flatten($oldpreamble,$oldpreamble,$oldfile,$encoding);
+ $newpreamble=flatten($newpreamble,$newpreamble,$newfile,$encoding);
+
+}
+
+
+
+
+my @auxlines;
+
+# boolean variab
+my ($ulem)=0;
+
+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);
+
+ # get a list of packages from preamble if not predefined
+ %packages=list_packages($newpreamble) unless %packages;
+ if ( %packages && $debug ) { my $key ; foreach $key (keys %packages) { print STDERR "DEBUG \\usepackage[",$packages{$key},"]{",$key,"}\n" ;} }
+}
+
+# have to return to all processing to properly add preamble additions based on packages found
+if (defined($graphicsmarkup)) {
+ $graphicsmarkup=~tr/a-z/A-Z/;
+ if ( $graphicsmarkup eq 'OFF' or $graphicsmarkup eq 'NONE' ) {
+ $graphicsmarkup=NONE;
+ } elsif ( $graphicsmarkup eq 'NEWONLY' or $graphicsmarkup eq 'NEW-ONLY' ) {
+ $graphicsmarkup=NEWONLY;
+ } elsif ( $graphicsmarkup eq 'BOTH' ) {
+ $graphicsmarkup=BOTH;
+ } elsif ( $graphicsmarkup !~ m/^[012]$/ ) {
+ die "latexdiff Illegal value: ($graphicsmarkup) for option --highlight-graphics. Possible values: OFF,WHOLE,COARSE,FINE,0-2\n";
+ }
+ # else use numerical value
+} else {
+ # Default: no explicit setting in menu
+ if ( defined $packages{"graphicx"} or defined $packages{"graphics"} ) {
+ $graphicsmarkup=NEWONLY;
+ } else {
+ $graphicsmarkup=NONE;
+ }
+}
+
+if (defined $packages{"hyperref"} ) {
+ # deleted lines should not generate or appear in link names:
+ print STDERR "hyperref package detected.\n" if $verbose ;
+ $latexdiffpreamble =~ s/\{\\DIFadd\}/{\\DIFaddtex}/g;
+ $latexdiffpreamble =~ s/\{\\DIFdel\}/{\\DIFdeltex}/g;
+ $latexdiffpreamble .= join "\n",(extrapream("HYPERREF"),"");
+ if($nolinks){
+ $latexdiffpreamble .= "\n\\hypersetup{bookmarks=false}";
+ }
+ ### $latexdiffpreamble .= '%DIF PREAMBLE EXTENSION ADDED BY LATEXDIFF FOR HYPERREF PACKAGE' . "\n";
+ ### $latexdiffpreamble .= '\providecommand{\DIFadd}[1]{\texorpdfstring{\DIFaddtex{#1}}{#1}}' . "\n";
+ ### $latexdiffpreamble .= '\providecommand{\DIFdel}[1]{\texorpdfstring{\DIFdeltex{#1}}{}}' . "\n";
+ ### $latexdiffpreamble .= '%DIF END PREAMBLE EXTENSION ADDED BY LATEXDIFF FOR HYPERREF PACKAGE' . "\n";
+}
+
+# add commands for figure highlighting to preamble
+if ($graphicsmarkup != NONE ) {
+ my @matches;
+ # Check if \DIFaddbeginFL definition calls \DIFaddbegin - if so we will issue an error message that graphics highlighting is
+ # is not compatible with this.
+ # (A more elegant solution would be to suppress the redefinitions of the \DIFaddbeginFL etc commands, but for this narrow use case
+ # I currently don't see this as an efficient use of time)
+ ### The foreach loop does not make sense here. I don't know why I put this in - (F Tilmann)
+ ###foreach my $cmd ( "DIFaddbegin","DIFaddend","DIFdelbegin","DIFdelend" ) {
+ @matches=( $latexdiffpreamble =~ m/command\{\\DIFaddbeginFL}\{($pat_n)}/sg ) ;
+ # we look at the last one of the list to take into account possible redefinition but almost always matches should have exactly one element
+ if ( $matches[$#matches] =~ m/\\DIFaddbegin/ ) {
+ die "Cannot combine graphics markup with float styles defining \\DIFaddbeginFL in terms of \\DIFaddbegin. Use --graphics-markup=none option or choose a different float style.";
+ exit 10;
+ }
+ ###}
+ $latexdiffpreamble .= join "\n",("\\newcommand{\\DIFscaledelfig}{$SCALEDELGRAPHICS}",extrapream("HIGHLIGHTGRAPHICS"),"");
+
+ # only change required for highlighting both is to declare \includegraphics safe, as preamble already contains commands for deleted environment
+ if ( $graphicsmarkup == BOTH ) {
+ init_regex_arr_list(\@SAFECMDLIST,'includegraphics');
+ }
+}
+
+$ulem = ($latexdiffpreamble =~ /\\RequirePackage(?:\[$brat_n\])?\{ulem\}/ || defined $packages{"ulem"});
+
+
+# If listings is being used or can be found in the latexdiff search path, add to the preamble auxiliary code to enable line-by-line markup
+if ( defined($packages{"listings"}) or `kpsewhich listings.sty` ne "" ) {
+ my @listingpreamble=extrapream("LISTINGS");
+ my @listingDIFcode=();
+ my $replaced;
+ # note that in case user supplies preamblefile the type might not reflect well the
+ @listingDIFcode=extrapream("-nofail","DIFCODE_" . $type) unless defined($preamblefile);
+ if (!(@listingDIFcode)) {
+ # if listingDIFcode is empty try to guess a suitable one from the preamble
+ if ($latexdiffpreamble =~ /\\RequirePackage(?:\[$brat_n\])?\{color\}/ and $ulem ) {
+ @listingDIFcode=extrapream("DIFCODE_UNDERLINE");
+ } elsif ( $latexdiffpreamble =~ /\\RequirePackage(?:\[$brat_n\])?\{color\}/ ) {
+ # only colour used
+ @listingDIFcode=extrapream("DIFCODE_CFONT");
+ } else {
+ # fall-back solution
+ @listingDIFcode=extrapream("DIFCODE_BOLD");
+ }
+ }
+ # now splice it in
+ $replaced=0;
+ ###print STDERR "DEBUG: listingDIFcode: ",join("\n",@listingDIFcode),"|||\n" if $debug;
+
+ @listingpreamble=grep {
+ # only replace if this has not been done already (use short-circuit property of and)
+ if (!$replaced and $_ =~ s/^.*%DIFCODE TEMPLATE.*$/join("\n",@listingDIFcode)/e ) {
+ ###print STDERR "DEBUG: Replaced text $_\n" if $debug;
+ $replaced=1;
+ 1;
+ } else {
+ # return false for those lines matching %DIFCODE TEMPLATE (so that they are not included in output)
+ not m/%DIFCODE TEMPLATE/;
+ }
+ } @listingpreamble;
+ ### print STDERR "DEBUG: listingpreamble @listingpreamble\n";
+ $latexdiffpreamble .= join "\n",(@listingpreamble,"");
+} else {
+ print STDERR "WARNING: listings package not detected. Disabling mark-up in verbatim environments \n" ;
+ # if listings does not exist disable line-by-line markup and treat all verbatim environments as opaque
+ $VERBATIMENV = liststringtoregex($CONFIG{VERBATIMENV}.";".$CONFIG{VERBATIMLINEENV});
+ $VERBATIMLINEENV = "";
+}
+
+# adding begin and end marker lines to preamble
+$latexdiffpreamble = "%DIF PREAMBLE EXTENSION ADDED BY LATEXDIFF\n" . $ latexdiffpreamble . "%DIF END PREAMBLE EXTENSION ADDED BY LATEXDIFF\n";
+
+# and return to preamble specific processing
+if ( length $oldpreamble && length $newpreamble ) {
+ 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);
+ }
+ if ( $earlylatexdiffpreamble) {
+ # insert latexdiff command directly after documentclass at beginning of preamble
+ # note that grep is only run for its side effect
+ ( grep { s/^([^%]*\\documentclass.*)$/$1$latexdiffpreamble/ } @diffpreamble )==1 or die "Could not find documentclass statement in preamble";
+ } else {
+ # insert latexdiff commands at the end of preamble (default behaviour)
+ push @diffpreamble,$latexdiffpreamble;
+ }
+ push @diffpreamble,'\begin{document}';
+ if (defined $packages{"hyperref"} && $nolinks) {
+ push @diffpreamble, '\begin{NoHyper}';
+ }
+}
+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);
+}
+
+# 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
+# and $packages{"apacite"}!~/natbibpapa/
+
+
+if (defined $packages{"units"} && $ulem ) {
+ # protect inlined maths environments by surrounding with an \mbox
+ # this is done to get around an incompatibility between the ulem and units package
+ # where spaces in the argument to underlined or crossed-out \unit commands cause an error message
+ print STDERR "units package detected at the same time as style using ulem.\n" if $verbose ;
+ $MBOXINLINEMATH=1;
+}
+
+if (defined $packages{"siunitx"} ) {
+ # protect SI command by surrounding them with an \mbox
+ # this is done to get around an incompatibility between the ulem and siunitx package
+ print STDERR "siunitx package detected.\n" if $verbose ;
+ my $mboxcmds='SI,ang,numlist,numrange,SIlist,SIrange';
+ init_regex_arr_list(\@SAFECMDLIST,'num,si');
+ if ( $enablecitmark || ( $ulem && ! $disablecitmark )) {
+ init_regex_arr_list(\@MBOXCMDLIST,$mboxcmds);
+ } else {
+ init_regex_arr_list(\@SAFECMDLIST,$mboxcmds);
+ }
+}
+
+if (defined $packages{"cleveref"} ) {
+ # protect selected command by surrounding them with an \mbox
+ # this is done to get around an incompatibility between ulem and cleveref package
+ print STDERR "cleveref package detected.\n" if $verbose ;
+ my $mboxcmds='[Cc]ref(?:range)?\*?,labelcref,(?:lc)?name[cC]refs?' ;
+ if ( $enablecitmark || ( $ulem && ! $disablecitmark )) {
+ init_regex_arr_list(\@MBOXCMDLIST,$mboxcmds);
+ } else {
+ init_regex_arr_list(\@SAFECMDLIST,$mboxcmds);
+ }
+}
+
+if (defined $packages{"glossaries"} ) {
+ # protect selected command by surrounding them with an \mbox
+ # this is done to get around an incompatibility between ulem and glossaries package
+ print STDERR "glossaries package detected.\n" if $verbose ;
+ my $mboxcmds='[gG][lL][sS](?:|pl|disp|link|first|firstplural|desc|user[iv][iv]?[iv]?),[aA][cC][rR](?:long|longpl|full|fullpl),[aA][cC][lfp]?[lfp]?';
+ init_regex_arr_list(\@SAFECMDLIST,'[gG][lL][sS](?:(?:entry)?(?:text|plural|name|symbol)|displaynumberlist|entryfirst|entryfirstplural|entrydesc|entrydescplural|entrysymbolplural|entryuser[iv][iv]?[iv]?|entrynumberlist|entrydisplaynumberlist|entrylong|entrylongpl|entryshort|entryshortpl|entryfull|entryfullpl),[gG]lossentry(?:name|desc|symbol),[aA][cC][rR](?:short|shortpl),[aA]csp?');
+ if ( $enablecitmark || ( $ulem && ! $disablecitmark )) {
+ init_regex_arr_list(\@MBOXCMDLIST,$mboxcmds);
+ } else {
+ init_regex_arr_list(\@SAFECMDLIST,$mboxcmds);
+ }
+}
+
+if (defined $packages{"chemformula"} or defined $packages{"chemmacros"} ) {
+ print STDERR "chemformula package detected.\n" if $verbose ;
+ init_regex_arr_list(\@SAFECMDLIST,'ch');
+ push(@UNSAFEMATHCMD,'ch');
+ # The next command would be needed to allow highlighting the interior of \ch commands in math environments
+ # but the redefinitions in chemformula are too deep to make this viable
+ # push(@MATHTEXTCMDLIST,'ch');
+}
+
+if (defined $packages{"mhchem"} ) {
+ print STDERR "mhchem package detected.\n" if $verbose ;
+ init_regex_arr_list(\@SAFECMDLIST,'ce');
+ push(@UNSAFEMATHCMD,'ce','cee');
+ # The next command would be needed to allow highlighting the interior of \cee commands in math environments
+ # but the redefinitions in chemformula are too deep to make this viable
+ # push(@MATHTEXTCMDLIST,'cee');
+}
+
+
+my ( $citpat);
+
+if ( defined $packages{"apacite"} ) {
+ print STDERR "apacite package detected.\n" if $verbose ;
+ $citpat='(?:mask)?(?:full|short|no)?cite(?:A|author|year|meta)?(?:NP)?';
+} else {
+ # citation command pattern for all other citation schemes
+ $citpat='(?:cite\w*|nocite)';
+};
+
+if ( ! $ulem ) {
+ # modes not using ulem: citation is safe
+ push (@SAFECMDLIST, $citpat);
+} else {
+ ### Experimental: disable text and emph commands
+ push(@SAFECMDEXCL, qr/^emph$/, qr/^text..$/);
+ # replace \cite{..} by \mbox{\cite{..}} in added or deleted blocks in post-processing
+ push(@MBOXCMDLIST,$citpat) unless $disablecitmark;
+ if ( uc($subtype) eq "COLOR" or uc($subtype) eq "DVIPSCOL" ) {
+ # remove \cite command again from list of safe commands
+ pop @MBOXCMDLIST;
+ # deleted cite commands
+ }
+}
+push(@MBOXCMDLIST,$citpat) if $enablecitmark ;
+
+
+if (defined $packages{"amsmath"} or defined $packages{"amsart"} or defined $packages{"amsbook"} ) {
+ print STDERR "amsmath package detected.\n" if $verbose ;
+ $MATHARRREPL='align*';
+}
+
+# add commands in MBOXCMDLIST to SAFECMDLIST
+foreach $mboxcmd ( @MBOXCMDLIST ) {
+ init_regex_arr_list(\@SAFECMDLIST, $mboxcmd);
+}
+
+# check if \label is in SAFECMDLIST, and if yes replace "label" in $LABELCMD by something that never matches (we hope!)
+if ( iscmd("label",\@SAFECMDLIST,\@SAFECMDEXCL) ) {
+ $LABELCMD=~ s/label/NEVERMATCHLABEL/;
+}
+
+
+
+print STDERR "Preprocessing body. " if $verbose;
+preprocess($oldbody,$newbody);
+
+
+# run difference algorithm
+@diffbody=bodydiff($oldbody, $newbody);
+$diffbo=join("",@diffbody);
+writedebugfile($diffbo,"bodydiff");
+
+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)\{($pat_n)\}/$1\{$2 \\ LATEXDIFF comparison \\ Old: $oldlabel \\ New: $newlabel \}/ or
+ $diffbo = "\\begin{verbatim}LATEXDIFF comparison\nOld: $oldlabel\nNew: $newlabel\\end{verbatim}\n$diffbo" ;
+}
+
+$diffall .= "$diffbo" ;
+if (defined $packages{"hyperref"} && $nolinks) {
+ $diffall .= "\\end{NoHyper}\n";
+}
+$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;
+
+
+# liststringtoregex(liststring)
+# expands string with semi-colon separated list into a regular expression corresponding
+# matching any of the elements
+sub liststringtoregex {
+ my ($liststring)=@_;
+ my @elements=grep /\S/,split(";",$liststring);
+ if ( @elements) {
+ return('(?:(?:' . join(')|(?:',@elements) .'))');
+ } else {
+ return "";
+ }
+}
+
+# show_configuration
+# note that this is not encapsulated but uses variables from the main program
+# It is provided for convenience because in the future it is planned to allow output
+# to be modified based on what packages are read etc - this works only if the input files are actually read
+# whether or not additional files are provided
+sub show_configuration {
+ if ($showpreamble) {
+ print "\nPreamble commands:\n";
+ print $latexdiffpreamble ;
+ }
+
+ if ($showsafe) {
+ print "\nsafecmd: Commands safe within scope of $ADDOPEN $ADDCLOSE and $DELOPEN $DELCLOSE (unless excluded):\n";
+ print_regex_arr(@SAFECMDLIST);
+ print "\nsafecmd-exlude: Commands not safe within scope of $ADDOPEN $ADDCLOSE and $DELOPEN $DELCLOSE :\n";
+ print_regex_arr(@SAFECMDEXCL);
+ print "\nmboxsafecmd: Commands safe only if they are surrounded by \\mbox command:\n";
+ print_regex_arr(@MBOXCMDLIST);
+ print "\nnmboxsafecmd: Commands not safe:\n";
+ print_regex_arr(@MBOXCMDEXCL);
+ }
+
+ 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 "ARRENV=$ARRENV\n";
+ print "COUNTERCMD=$COUNTERCMD\n";
+ print "FLOATENV=$FLOATENV\n";
+ print "ITEMCMD=$ITEMCMD\n";
+ print "LISTENV=$LISTENV\n";
+ print "MATHARRENV=$MATHARRENV\n";
+ print "MATHARRREPL=$MATHARRREPL\n";
+ print "MATHENV=$MATHENV\n";
+ print "MATHREPL=$MATHREPL\n";
+ print "MINWORDSBLOCK=$MINWORDSBLOCK\n";
+ print "PICTUREENV=$PICTUREENV\n";
+ print "SCALEDELGRAPHICS=$SCALEDELGRAPHICS\n";
+ print "VERBATIMENV=$VERBATIMENV\n";
+ print "VERBATIMLINEENV=$VERBATIMLINEENV\n";
+ print "CUSTOMDIFCMD=$CUSTOMDIFCMD\n";
+ }
+}
+
+
+
+## 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 utf8
+sub guess_encoding {
+ my ($filename)=@_;
+ my ($i,$enc);
+ open (FH, $filename) or die("Couldn't open $filename: $!");
+ $i=0;
+ while (<FH>) {
+ 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");
+ return("utf8");
+}
+
+
+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=<FILE>;
+ } 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=<FILE>;
+ } 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=<FILE>;
+ 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,\RequirePackage 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/(?<!\\)%.*$// ;
+# if ( $line =~ m/\\(?:documentclass|usepackage|RequirePackage)(?:\[(.+?)\])?\{(.*?)\}/ ) {
+## print STDERR "Found something: |$line|\n" if $debug;
+# if (defined($1)) {
+# $packages{$2}=$1;
+# } else {
+# $packages{$2}="";
+# }
+# }
+# }
+# return (%packages);
+#}
+
+
+# %packages=list_packages($preamble)
+# scans the arguments for \documentclass,\RequirePackage and \usepackage statements and constructs a hash
+# whose keys are the included packages, and whose values are the associated optional arguments
+# if argument of \usepackage or \RequirePackage is comma separated list, treat as different packages
+sub list_packages {
+ my ($preamble)=@_;
+ my %packages=();
+ my $pkg;
+
+ # remove comments
+ $preamble=~s/(?<!\\)%.*$//mg ;
+
+ while ( $preamble =~ m/\\(?:documentclass|usepackage|RequirePackage)(?:\[($brat_n)\])?\{(.*?)\}/gs ) {
+ if (defined($1)) {
+ foreach $pkg ( split /,/,$2 ) {
+ $packages{$pkg}=$1;
+ }
+ } else {
+ foreach $pkg ( split /,/,$2 ) {
+ $packages{$pkg}="";
+ }
+ }
+ }
+
+ # sometimes, class options are defined in such a way that they imply the loading and/or presence of a package
+ # so we also treat all class options as 'packages.
+ if ( $preamble =~ m/\\documentclass\s*\[($brat_n)\]\s*\{.*?\}/s ) {
+ foreach $pkg ( split /,/,$1 ) {
+ $pkg =~ s/\s//g ; # remove space and newline characters
+ $packages{$pkg}="" unless exists($packages{$pkg});
+ }
+ }
+ return (%packages);
+}
+
+# Subroutine add_safe_commands modified from version provided by S. Gouezel
+# add_safe_commands($preamble)
+# scans the argument for \newcommand and \DeclareMathOperator,
+# and adds the created commands which are clearly safe to @SAFECMDLIST
+sub add_safe_commands {
+ my ($preamble)=@_;
+
+ # get rid of comments
+ $preamble=~s/(?<!\\)%.*$//mg ;
+
+ my $to_test = "";
+ # test for \DeclareMathOperator{\foo}{myoperator}
+ while ( $preamble =~ m/\DeclareMathOperator\s*\*?\{\\(\w*?)\}/osg) {
+ $to_test=$1;
+ if ($to_test ne "" and not iscmd($to_test,\@SAFECMDLIST,\@SAFECMDEXCL) and not iscmd($to_test, \@SAFECMDEXCL, [])) {
+ # one should add $to_test to the list of safe commands.
+ init_regex_arr_list(\@SAFECMDLIST, $to_test);
+ print STDERR "Adding $to_test to the list of safe commands\n" if $verbose;
+ }
+ }
+
+ while ( $preamble =~ m/\\(?:new|renew|provide)command\s*{\\(\w*)\}(?:|\[\d*\])\s*\{(${pat_n})\}/osg ) {
+ my $maybe_to_test = $1;
+ my $should_be_safe = $2;
+ print STDERR "DEBUG Checking new command: maybe_to_test, should_be_safe: $1 $2\n" if $debug;
+ my $success = 0;
+ # test if all latex commands inside it are safe
+ $success = 1;
+ if ($should_be_safe =~ m/\\\\/) {
+ $success = 0;
+ } else {
+ while ($should_be_safe =~ m/\\(\w+)/g) {
+ ### print STDERR "DEBUG: Testing command $1 " if $debug;
+ $success = 0 unless iscmd($1,\@SAFECMDLIST,\@SAFECMDEXCL); ### or $1 eq "";
+ ### print STDERR " success=$success\n" if $debug;
+ }
+ }
+ ### }
+ if ($success) {
+ $to_test = $maybe_to_test;
+ if ( not iscmd($to_test,\@SAFECMDLIST,\@SAFECMDEXCL) and not iscmd($to_test, \@SAFECMDEXCL, [])) {
+ # # one should add $to_test to the list of safe commands.
+ init_regex_arr_list(\@SAFECMDLIST, $to_test);
+ print STDERR "Adding $to_test to the list of safe commands\n" if $verbose;
+ }
+ }
+ }
+}
+
+
+# helper function for flatten
+# remove \endinput at beginning of line and everything
+# following it, # if \endinput is not at the beginning of
+# the line, nothing will be removed. It is assumed that
+# this case is most common when \endinput is part of a
+# conditional clause. The file will only be processed
+# correctly if the conditional is always false,
+# i.e. \endinput # not actually reached
+sub remove_endinput {
+ # s/// operates on default input
+ $_[0] =~ s/^\\endinput.*\Z//ms ;
+ return($_[0]);
+}
+
+# flatten($text,$preamble,$filename,$encoding)
+# expands \input and \include commands within text
+# expands \bibliography command with corresponding bbl file if available
+# expands \subfile command (from subfiles package - not part of standard text distribution)
+# preamble is scanned for includeonly commands
+# encoding is the encoding
+sub flatten {
+ my ($text,$preamble,$filename,$encoding)=@_;
+ my ($includeonly,$dirname,$fname,$newpage,$fullfile,$filecontent,$replacement,$begline,$bblfile,$subfile,$command,$verbenv,$verboptions);
+ my ($subpreamble,$subbody,$subpost);
+ require File::Basename ;
+ require File::Spec ;
+ $dirname = File::Basename::dirname($filename);
+ $bblfile = $filename;
+ $bblfile=~s/\.tex$//;
+ $bblfile.=".bbl";
+
+ if ( ($includeonly) = ($preamble =~ m/\\includeonly\{(.*?)\}/ ) ) {
+ $includeonly =~ s/,/|/g;
+ } else {
+ $includeonly = '.*?';
+ }
+
+ print STDERR "DEBUG: includeonly $includeonly\n" if $debug;
+
+ # recursively replace \\input and \\include files
+ $text =~ s/(^(?:[^%\n]|\\%)*)(\\input\{(.*?)\}|\\include\{(${includeonly}(?:\.tex)?)\})/{
+ $begline=(defined($1)? $1 : "") ;
+ $fname = $3 if defined($3) ;
+ $fname = $4 if defined($4) ;
+ # # add tex extension unless there is a three or four letter extension already
+ $fname .= ".tex" unless $fname =~ m|\.\w{3,4}$|;
+ $fullfile = File::Spec->catfile($dirname,$fname);
+ print STDERR "DEBUG Beg of line match |$1|\n" if defined($1) && $debug ;
+ print STDERR "Include file $fname\n" if $verbose;
+ print STDERR "DEBUG looking for file ",$fullfile, "\n" if $debug;
+ # content of file becomes replacement value (use recursion), add \newpage if the command was include
+ if ( -f $fullfile ) {
+ # If file exists, replace input or include command with expanded input
+ $replacement=flatten(read_file_with_encoding($fullfile, $encoding), $preamble,$filename,$encoding) or die "Could not open file ",$fullfile,": $!";
+ $replacement = remove_endinput($replacement);
+ # \include always starts a new page; use explicit \newpage command to simulate this
+ $newpage=(defined($4)? " \\newpage " : "") ;
+ } else {
+ # if file does not exist, do not expand include or input command (do not warn if fname contains #[0-9] as it is then likely part of a command definition
+ # and is not meant to be expanded directly
+ print STDERR "WARNING: Could not find included file ",$fullfile,". I will continue but not expand |$2|\n" unless $fname =~ m(#[0-9]) ;
+ $replacement = $2 ; # i.e. just the original command again -> make no change file does not exist
+ $newpage="";
+ }
+ "$begline$newpage$replacement$newpage";
+ }/exgm;
+
+ # replace bibliography with bbl file if it exists
+ $text=~s/(^(?:[^%\n]|\\%)*)\\bibliography\{(.*?)\}/{
+ if ( -f $bblfile ){
+ $replacement=read_file_with_encoding(File::Spec->catfile($bblfile), $encoding);
+ } else {
+ warn "Bibliography file $bblfile cannot be found. No flattening of \\bibliography done. Run bibtex on old and new files first";
+ $replacement="\\bibliography{$2}";
+ }
+ $begline=(defined($1)? $1 : "") ;
+ "$begline$replacement";
+ }/exgm;
+
+ # replace subfile with contents (subfile package)
+ $text=~s/(^(?:[^%\n]|\\%)*)\\subfile\{(.*?)\}/{
+ $begline=(defined($1)? $1 : "") ;
+ $fname = $2;
+ # # add tex extension unless there is a three or four letter extension already
+ $fname .= ".tex" unless $fname =~ m|\.\w{3,4}|;
+ print STDERR "Include file as subfile $fname\n" if $verbose;
+ # content of file becomes replacement value (use recursion)
+ # now strip away everything outside and including \begin{document} and \end{document} pair#
+ # # note: no checking for comments is made
+ $fullfile=File::Spec->catfile($dirname,$fname);
+ if ( -f $fullfile) {
+ # if file exists, expand \subfile command by contents of file
+ $subfile=read_file_with_encoding($fullfile,$encoding) or die "Could not open included subfile ",$fullfile,": $!";
+ ($subpreamble,$subbody,$subpost)=splitdoc($subfile,'\\\\begin\{document\}','\\\\end\{document\}');
+ ### $subfile=~s|^.*\\begin{document}||s;
+ ### $subfile=~s|\\end{document}.*$||s;
+ $replacement=flatten($subbody, $preamble,$filename,$encoding);
+ ### $replacement = remove_endinput($replacement);
+ } else {
+ # if file does not exist, do not expand subfile
+ print STDERR "WARNING: Could not find subfile ",$fullfile,". I will continue but not expand |$2|\n" unless $fname =~ m(#[0-9]) ;
+ $replacement = "\\subfile\{$2\}" ; # i.e. just the original command again -> make no change file does not exist
+ }
+
+ "$begline$replacement";
+ }/exgm;
+
+ # replace \verbatiminput and \lstlistinginput
+ $text=~s/(^(?:[^%\n]|\\%)*)\\(verbatiminput\*?|lstinputlisting)$extraspace(\[$brat_n\])?$extraspace\{(.*?)\}/{
+ $begline=(defined($1)? $1 : "") ;
+ $command = $2 ;
+ $fname = $4 ;
+ $verboptions = defined($3)? $3 : "" ;
+ if ($command eq 'verbatiminput' ) {
+ $verbenv = "verbatim" ;
+ } elsif ($command eq 'verbatiminput*' ) {
+ $verbenv = "verbatim*" ;
+ } elsif ($command eq 'lstinputlisting' ) {
+ $verbenv = "lstlisting" ;
+ } else {
+ die "Internal errorL Unexpected verbatim input type $command.\n";
+ }
+ print STDERR "DEBUG Beg of line match |$begline|\n" if $debug ;
+ print STDERR "Include file $fname verbatim\n" if $verbose;
+ print STDERR "DEBUG looking for file ",File::Spec->catfile($dirname,$fname), "\n" if $debug;
+ # content of file becomes replacement value (do not 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=read_file_with_encoding(File::Spec->catfile($dirname,$fname), $encoding) or die "Couldn't find file ",File::Spec->catfile($dirname,$fname),": $!";
+ # Add a new line if it not already there (note that the matching operator needs to use different delimiters, as we are still inside an outer scope that takes precedence
+ $replacement .= "\n" unless $replacement =~ m(\n$) ;
+ "$begline\\begin{$verbenv}$verboptions\n$replacement\\end{$verbenv}\n";
+ }/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 or external file
+# (end of file after __END__ token)
+# if $type is a filename, it will read the file instead of reading from the appendix
+# otherwise it will screen appendix for line "%DIF $TYPE" and copy everything up to line
+# '%DIF END $TYPE' (where $TYPE is upcased version of $type)
+# extrapream('-nofail',$type) will---instead of failing---simply return nothing if
+# it does not find the matching line in a appendix (do not use -nofail option with multiple types!)
+sub extrapream {
+ my @types=@_;
+ my ($type,$arg);
+ my $nofail=0;
+ ###my @retval=("%DIF PREAMBLE EXTENSION ADDED BY LATEXDIFF") ;
+ my @retval=();
+ my ($copy);
+
+ foreach $arg ( @types ) {
+ if ( $arg eq '-nofail' ) {
+ $nofail=1;
+ next;
+ }
+ $type=$arg;
+ $copy=0;
+ if ( -f $type || lc $type eq '/dev/null' ) {
+ open (FILE,$type) or die "Cannot open preamble file $type: $!";
+ print STDERR "Reading preamble file $type\n" if $verbose ;
+ while (<FILE>) {
+ 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;
+ # save filehandle position (before first read this points to line after __END__)
+ # but seek DATA,0,0 resets it to the beginning of the file
+ # see https://stackoverflow.com/questions/4459601/how-can-i-use-data-twice
+ my $data_start = tell DATA;
+ while (<DATA>) {
+ if ( m/^%DIF $type/ ) {
+ $copy=1;
+ } elsif ( m/^%DIF END $type/ ) {
+ last;
+ }
+ chomp;
+ push (@retval,"$_ %DIF PREAMBLE") if $copy;
+ }
+ if ( $copy == 0 ) {
+ unless ($nofail) {
+ print STDERR "\nPreamble style $type not implemented.\n";
+ print STDERR "Write latexdiff -h to get help with available styles\n";
+ exit(2);
+ }
+ }
+ seek DATA,$data_start,0; # rewind DATA handle to beginning of data record
+ }
+ }
+ ###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");
+ print TOKENOLD join("***\n",@oldwords);
+ close(TOKENOLD);
+ open(TOKENNEW,">","latexdiff.debug.tokennew2");
+ 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
+# if there is white space in the beginning return that as first token
+sub splitlatex {
+ my ($inputstring) = @_ ;
+ my $string=$inputstring ;
+ # if input is empty, return empty list
+ length($string)>0 or return ();
+ $string=~s/^(\s*)//s;
+ my $leadin=$1;
+ length($string)>0 or return ($leadin);
+
+ 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;
+ }
+
+ }
+ unshift(@retval,$leadin) if (length($leadin)>0);
+ 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@*]+))((?:\[$brat_n\]|\{$pat_n\})*)/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;
+
+ # make a list of all TEXTCMDLIST commands in deleted and added blocks
+ $delcmds = extractcommands($delblock);
+ $addcmds = extractcommands($addblock);
+ # now find those text commands, which are found in both deleted and added blocks, and expand them
+ # 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}\[$brat_n\]${extraspace}|${extraspace}\{$pat_n\})*)/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}\[$brat_n\]|${extraspace}\{$pat_n\})*${extraspace}\{)($pat_n)(\}\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;
+ print STDERR "DEBUG: iscmd($cmd)=" if $debug;
+ foreach $pat ( @$regexar ) {
+ if ( $cmd =~ m/^${pat}$/ ) {
+ $ret=1 ;
+ last;
+ }
+ }
+ print STDERR "0\n" if ($debug && !$ret) ;
+ return 0 unless $ret;
+ foreach $pat ( @$regexexcl ) {
+ print STDERR "0\n" if ( $debug && $cmd =~ m/^${pat}$/) ;
+ return 0 if ( $cmd =~ m/^${pat}$/ );
+ }
+ print STDERR "1\n" if $debug;
+ 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 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);
+ ### print STDERR "DEBUG: marktags $openmark,$closemark,$open,$close,$opencmd,$closecmd,$comment\n" if $debug;
+ ### print STDERR "DEBUG: marktags blocksplit ",join("|",@$block),"\n" if $debug;
+ foreach (@$block) {
+ $word=$_;
+ ### print STDERR "DEBUG MARKTAGS: |$word|\n" if $debug;
+ if ( $word =~ s/^%/%$comment/ ) {
+ # a comment
+ if ($cmd==1) {
+ push (@$retval,$closecmd) ;
+ $cmd=-1;
+ }
+ push (@$retval,$word);
+ next;
+ }
+ if ( $word =~ m/^\s*$/ ) {
+ ### print STDERR "DEBUG MARKTAGS: whitespace detected |$word| cmdcom |$cmdcomment| |$opencmd|\n" if $debug;
+ # a sequence of white-space characters - this should only ever happen for the first element of block.
+ # in deleted block, omit, otherwise just copy it in
+ if ( ! $cmdcomment) { # ignore in deleted blocks
+ push(@$retval,$word);
+ }
+ next;
+ }
+ if (! $noncomment) {
+ push (@$retval,$openmark);
+ $noncomment=1;
+ }
+ # negative lookahead pattern (?!) in second clause is put in to avoid matching \( .. \) patterns
+ # also note that second pattern will match \\
+ print STDERR "DEBUG marktags: Considering word |$word|\n" if $debug;
+ if ( $word =~ /^[&{}\[\]]/ || ( $word =~ /^\\(?!\()(\\|[`'^"~=.]|[\w*@]+)/ && !iscmd($1,\@SAFECMDLIST,\@SAFECMDEXCL)) ) {
+ ###print STDERR "DEBUG MARKTAGS is a non-safe command ($1)\n" if $debug;
+ ### 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\]|\{$pat_n\})*\{)($pat_n)(\}\s*)$/so )
+ if ( ( $word =~ m/^(\\([\w\d\*]+)(?:${extraspace}\[$brat_n\]|${extraspace}\{$pat_n\})*${extraspace}\{)($pat_n)(\}\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=('\\','\\\\',@UNSAFEMATHCMD);
+ 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
+ ### print STDERR "MARKTAGS: Add command |$word|\n";
+ push (@$retval,$word);
+ $cmd=1;
+ }
+ } else {
+ ###print STDERR "DEBUG MARKTAGS is an ordinary word or SAFECMD command \n" if $debug;
+ # just an ordinary word or command in SAFECMD
+ push (@$retval,$open) if $cmd==-1 ;
+ push (@$retval,$closecmd,$open) if $cmd==1 ;
+ ###TODO: check here if it is a command in MBOXCMD list, and surround it with \mbox{...}
+ ### $word =~ /^\\(?!\()(\\|[`'^"~=.]|[\w*@]+)/ && iscmd($1,\@MBOXCMDLIST,\@MBOXCMDEXCL))
+ ### but actually this check has been carried out already so can simply check if word begins with backslash
+ if ( $word =~ /^\\(?!\()(\\|[`'^"~=.]|[\w*@]+)(.*?)(\s*)$/s && iscmd($1,\@MBOXCMDLIST,\@MBOXCMDEXCL)) {
+ # $word is a safe command in MBOXCMDLIST
+ ###print STDERR "DEBUG Mboxsafecmd detected:$word:\n" if $debug ;
+ push(@$retval,"\\mbox{$AUXCMD\n\\" . $1 . $2 . $3 ."}\\hspace{0pt}$AUXCMD\n" );
+ } else {
+ # $word is a normal word or a safe command (not in MBOXCMDLIST)
+ push (@$retval,$word);
+ }
+ $cmd=0;
+ }
+ }
+ push (@$retval,$close) if $cmd==0;
+ push (@$retval,$closecmd) if $cmd==1;
+
+ push (@$retval,$closemark) if ($noncomment);
+ return @$retval;
+}
+
+#used in preprocess
+sub take_comments_and_enter_from_frac() {
+ #*************take the \n and % between frac and {}***********
+ #notice all of the substitution are made none global
+ while( m/\\begin\{($MATHENV|$MATHARRENV|SQUAREBRACKET)}(.*?)\\frac(([\s]*%[^\n]*?)*[\r\n|\r|\n])+\{(.*?)\\end\{\1}/s ) {
+ # if there isn't any % or \n in the pattern $2 then there should be an \\end{...} in $2
+ ### print STDERR "Match the following in take_comments and_enter_from_frac(1):\n****$&****\n" if $debug;
+ if( $2 !~ m/\\end\{$1}/s ) {
+ # take out % and \n from the next match only (none global)
+ s/\\begin\{($MATHENV|$MATHARRENV|SQUAREBRACKET)}(.*?)\\frac(([\s]*%[^\n]*?)*[\r\n|\r|\n])+\{(.*?)\\end\{\1}/\\begin{$1}$2\\frac{$5\\end{$1}/s;
+ }
+ else{
+ #there are no more % and \n in $2, we want to find the next one so we clear the begin-end from the pattern
+ s/\\begin\{($MATHENV|$MATHARRENV|SQUAREBRACKET)}(.*?)\\end\{\1}/MATHBLOCK$1\{$2\}MATHBLOCKEND/s;
+ }
+ }
+ ###cleaning up
+ while( s/MATHBLOCK($MATHENV|$MATHARRENV|SQUAREBRACKET)\{(.*?)\}MATHBLOCKEND/\\begin{$1}$2\\end{$1}/s ){}
+ ###*************take the \n and % between frac and {}***********
+
+ ###**********take the \n and % between {} and {} of the frac***************
+ while( m/\\begin\{($MATHENV|$MATHARRENV|SQUAREBRACKET)\}(.*?)\\frac\{(.*?)\\end\{\1\}/s ) {
+ # if there isn't any more //frac before the first //end in the pattern $2 then there should be an \\end{...} in $2
+ ###print STDERR "Match the following in take_comments and_enter_from_frac(2):\n****$&****\n" if $debug;
+ if( $2 !~ m/\\end\{$1\}/s ) {
+ # from now on CURRFRAC is the frac we are looking at
+ s/\\begin\{($MATHENV|$MATHARRENV|SQUAREBRACKET)\}(.*?)\\frac\{(.*?)\\end\{\1\}/\\begin\{$1\}$2CURRFRAC\{$3\\end\{$1\}/s;
+ while( m/\\begin\{($MATHENV|$MATHARRENV|SQUAREBRACKET)\}(.*?)CURRFRAC\{(.*?)\\end\{\1\}/s ) {
+ if( m/\\begin\{($MATHENV|$MATHARRENV|SQUAREBRACKET)\}(.*?)CURRFRAC\{($pat_n)\}([\s]*(%[^\n]*?)*[\r\n|\r|\n])+[\s]*\{(.*?)\\end\{\1}/s ) {
+ s/\\begin\{($MATHENV|$MATHARRENV|SQUAREBRACKET)\}(.*?)CURRFRAC\{($pat_n)\}([\s]*(%[^\n]*?)*[\r\n|\r|\n])+[\s]*\{(.*?)\\end\{\1\}/\\begin\{$1\}$2CURRFRAC\{$3\}\{$6\\end\{$1\}/s;
+ }
+ else { # there is no comment or \n between the two brackets {}{}
+ # change CURRFRAC to FRACSTART so we can change them all back to //frac{ when we finish
+ s/\\begin\{($MATHENV|$MATHARRENV|SQUAREBRACKET)}(.*?)CURRFRAC\{(.*?)\\end\{\1}/\\begin{$1}$2FRACSTART\{$3\\end{$1}/s;
+ }
+ }
+ }
+ else{
+ ###there are no more frac in $2, we want to find the next one so we clear the begin-end from the pattern
+ s/\\begin\{($MATHENV|$MATHARRENV|SQUAREBRACKET)}(.*?)\\end\{\1}/MATHBLOCK$1\{$2\}MATHBLOCKEND/s;
+ }
+
+ }
+ ###cleaning up
+ while( s/MATHBLOCK($MATHENV|$MATHARRENV|SQUAREBRACKET)\{(.*?)\}MATHBLOCKEND/\\begin{$1}$2\\end{$1}/s ){}
+ s/FRACSTART/\\frac/g;
+ ###***************take the \n and % between {} and {} of the frac*********************
+}
+
+# preprocess($string, ..)
+# carry out the following pre-processing steps for all arguments:
+# 1. Remove leading white-space
+# Change \{ to \QLEFTBRACE and \} to \QRIGHTBRACE and \& to \AMPERSAND
+# #. Change {,} in comments to \CLEFTBRACE, \CRIGHTBRACE
+# 2. mark all first empty line (in block of several) with \PAR tokens
+# 3. Convert all '\%' into '\PERCENTAGE ' and all '\$' into \DOLLAR to make parsing regular expressions easier
+# 4. Convert all \verb|some verbatim text| commands (where | can be an arbitrary character)
+# into \verb{hash} (also lstinline)
+# 5. Convert \begin{verbatim} some verbatim text \end{verbatim} into \verbatim{hash} (not only verbatim, all patterns matching VERBATIMENV)
+# 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 math-mode COARSE,WHOLE or NONE 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 {
+ for (@_) {
+
+
+ # change in \verb and similar commands - note that I introduce an extra space here so that the
+ # already hashed variants do not trigger again
+ # transform \lstinline{...}
+# s/\\lstinline(\[$brat0\])?(\{(?:.*?)\})/"\\DIFlstinline". $1 ."{". tohash(\%verbhash,"$2") ."}"/esg;
+# s/\\lstinline(\[$brat0\])?((\S).*?\2)/"\\DIFlstinline". $1 ."{". tohash(\%verbhash,"$2") ."}"/esg;
+ s/\\lstinline((?:\[$brat_n\])?)(\{(?:.*?)\})/"\\DIFlstinline". $1 ."{". tohash(\%verbhash,"$2") ."}"/esg;
+ s/\\lstinline((?:\[$brat_n\])?)(([^\s\w]).*?\3)/"\\DIFlstinline". $1 ."{". tohash(\%verbhash,"$2") ."}"/esg;
+ s/\\(verb\*?|lstinline)([^\s\w])(.*?)\2/"\\DIF${1}{". tohash(\%verbhash,"${2}${3}${2}") ."}"/esg;
+
+ # Change \{ to \QLEFTBRACE, \} to \QRIGHTBRACE, and \& to \AMPERSAND
+ s/(?<!\\)\\\{/\\QLEFTBRACE /sg;
+ s/(?<!\\)\\\}/\\QRIGHTBRACE /sg;
+ s/(?<!\\)\\&/\\AMPERSAND /sg;
+# replace {,} in comments with \\CLEFTBRACE,\\CRIGHTBRACE
+ 1 while s/((?<!\\)%.*)\{(.*)$/$1\\CLEFTBRACE $2/mg ;
+ 1 while s/((?<!\\)%.*)\}(.*)$/$1\\CRIGHTBRACE $2/mg ;
+ s/(?<!\\)\\%/\\PERCENTAGE /g ; # (?<! is negative lookbehind assertion to prevent \\% from being converted
+ s/(?<!\\)\\\$/\\DOLLAR /g ; # (?<! is negative lookbehind assertion to prevent \\$ from being converted
+ s/\\begin\{($VERBATIMENV)\}(.*?)\\end\{\1\}/"\\${1}{". tohash(\%verbhash,"${2}") . "}"/esg;
+ s/\\begin\{($VERBATIMLINEENV)\}(.*?)\\end\{\1\}/"\\begin{$1}". linecomment($2) . "\\end{$1}"/esg;
+
+ # mark all first empty line (in block of several) with \PAR tokens
+ s/\n(\s*?)\n((?:\s*\n)*)/\n$1\\PAR\n$2/g ;
+ # Convert _n or _\cmd into \SUBSCRIPTNB{n} or \SUBSCRIPTNB{\cmd} and _{nnn} into \SUBSCRIPT{nn}
+ 1 while s/(?<!\\)_(\s*([^{\\\s]|\\\w+))/\\SUBSCRIPTNB{$1}/g ;
+ 1 while s/(?<!\\)_(\s*{($pat_n)})/\\SUBSCRIPT$1/g ;
+ # Convert ^n into \SUPERSCRIPTNB{n} and ^{nnn} into \SUPERSCRIPT{nn}
+ 1 while s/(?<!\\)\^(\s*([^{\\\s]|\\\w+))/\\SUPERSCRIPTNB{$1}/g ;
+ 1 while s/(?<!\\)\^(\s*{($pat_n)})/\\SUPERSCRIPT$1/g ;
+ # Convert \sqrt{n} into \SQRT{n} and \sqrt nn into SQRTNB{nn}
+ 1 while s/(?<!\\)\\sqrt(\s*([^{\\\s]|\\\w+))/\\SQRTNB{$1}/g ;
+ 1 while s/(?<!\\)\\sqrt(\s*{($pat_n)})/\\SQRT$1/g ;
+ # Convert $$ $$ into \begin{DOLLARDOLLAR} \end{DOLLARDOLLAR}
+ s/\$\$(.*?)\$\$/\\begin{DOLLARDOLLAR}$1\\end{DOLLARDOLLAR}/sg;
+ # Convert \[ \] into \begin{SQUAREBRACKET} \end{SQUAREBRACKET}
+ s/(?<!\\)\\\[/\\begin{SQUAREBRACKET}/sg;
+ s/\\\]/\\end{SQUAREBRACKET}/sg;
+ # Convert all picture environmentent (\begin{PICTUREENV} .. \end{PICTUREENV} \PICTUREBLOCKenv
+ s/\\begin\{($PICTUREENV)}(.*?)\\end\{\1}/\\PICTUREBLOCK$1\{$2\}/sg;
+ # For math-mode COARSE,WHOLE or NONE option -convert all \begin{MATH} .. \end{MATH}
+ # into \MATHBLOCKMATH{...} commands, where MATH is any valid math environment
+ # Also convert all array environments into ARRAYBLOCK environments
+
+ if ( $mathmarkup != FINE ) {
+ # DIFANCHORARRB and DIFANCHORARRE, DIFANCHORMATHB and DIFANCHORMATHE markers are inserted here to encourage the matching algorithm
+ # to always match up the closing brace. Otherwise sometimes one ends up with a situation where
+ # the closing brace is deleted and added at another point. The deleted closing brace is then
+ # prevented by a %DIFDELCMD, leading to material leaking in or out of the math environment.
+ # The anchors are removed in post-processing again. (note that they are simple text to cause least amount of complications
+ # Admittedly, this is something of a hack and will not always work. If it does not, then one needs to
+ # resort to WHOLE or FINE, or NONE math mode processing.
+ s/\\begin\{($ARRENV)}(.*?)\\end\{\1}/\\ARRAYBLOCK$1\{$2\\DIFANCHORARRB \}\\DIFANCHORARRE /sg;
+
+ take_comments_and_enter_from_frac();
+
+ s/\\begin\{($MATHENV|$MATHARRENV|SQUAREBRACKET)\}(.*?)\\end\{\1\}/\\MATHBLOCK$1\{$2\\DIFANCHORMATHB \}\\DIFANCHORMATHE /sg;
+ }
+
+ # add final token " STOP"
+ $_ .= " STOP"
+ }
+}
+
+
+# $expanded=linecomment($string)
+#preface all lines with verbatim marker (usually DIFVRB)
+sub linecomment {
+ my @verbatimlines=split("\n",$_[0]);
+ # the first line needs special treatment - we do want to retain optional arguments as is but wrap the remainder also with VERBCOMMENT
+ ### print STDERR "DEBUG: before verbatimlines[0] = ",$verbatimlines[0],"\n";
+ $verbatimlines[0]=~s/^((?:\s*\[$brat_n\])?\s*)([^\s\[].*)/ defined($2) ? ( "$1\%$VERBCOMMENT$2" ) : ( $1 )/e;
+ ### print STDERR "DEBUG: after verbatimlines[0] = ",$verbatimlines[0],"\n";
+ return(join("\n%$VERBCOMMENT",@verbatimlines)."\n");
+}
+
+# $simple=reverselinecomment($env $string)
+# remove DIFVRB comments but leave changed lines marked
+sub reverselinecomment {
+ my ($environment, $verbatimtext)=@_;
+ ###print STDERR "OLD VERBATIMTEXT: |$verbatimtext|\n";
+ # remove markup added by latexdiff
+ # (this should occur only if the type of verbatim environment was changed)
+ # (note that this destroys some information in old file)
+ # in theory I could save it by moving it out of the verbatim environment
+ # but this requires more bookkeeping and is probably not necessary)
+ $verbatimtext =~ s/\\DIFaddbegin //g;
+ $verbatimtext =~ s/\\DIFaddend //g;
+ $verbatimtext =~ s/\\DIFdelbegin //g;
+ $verbatimtext =~ s/\\DIFdelend //g;
+ $verbatimtext =~ s/$DELCMDOPEN.*//g;
+
+ # remove DIFVRB mark
+ $verbatimtext=~ s/%$VERBCOMMENT//g;
+
+ # remove part of the markup in changed lines
+ # if any of these substitution was made, then there was at least
+ # one changed line, and we have to extend the style
+ if ( $verbatimtext=~ s/$VERBCOMMENT//g ) {
+ # in the next line we add ~alsolanguage~ modifier, but also deletes the rest of the line after the optional argument, as lstlisting commands gets sometimes
+ # very confused by what is there (and othertimes seems to ignore this anyway)
+ unless ( $verbatimtext =~ s/^(\s*)\[($brat_n)\](.*)\n/$1\[$2,alsolanguage=DIFcode\]\n/ ) {
+ if ( $verbatimtext =~ m/^\s*\n/ ) {
+ $verbatimtext = "[alsolanguage=DIFcode]" . $verbatimtext;
+ } else {
+ $verbatimtext = "[alsolanguage=DIFcode]\n" . $verbatimtext;
+ }
+ }
+ # There is a bug in listings package (at least v1.5b) for empty comments where the actual comment command is not made invisible
+ # I therefore have to introduce an artificial '-' character at the end of empty added or deleted lines
+ $verbatimtext =~ s/($DELCOMMENT\s*)$/$1-/mg;
+ $verbatimtext = "\\DIFmodbegin\n\\begin{${environment}}${verbatimtext}\\end{${environment}}\n\\DIFmodend"
+ } else {
+ $verbatimtext = "\\begin{${environment}}${verbatimtext}\\end{${environment}}"
+ }
+ ###print STDERR "NEW VERBATIMTEXT: |$verbatimtext|\n";
+ return($verbatimtext);
+}
+
+
+#hashstring=tohash(\%hash,$string)
+# creates a hash value based on string and stores in %hash
+sub tohash {
+ my ($hash,$string)=@_;
+ my (@arr,$val);
+ my ($sum,$i)=(0,1);
+ my ($hstr);
+
+ @arr=unpack('c*',$string);
+
+ while (1) {
+ foreach $val (@arr) {
+ $sum += $i*$val;
+ $i++;
+ }
+ $hstr= "$sum";
+ last unless (defined($hash->{$hstr}) && $string ne $hash->{$hstr});
+ # else found a duplicate HASH need to repeat for a higher hash value
+ }
+ $hash->{$hstr}=$string;
+ ### print STDERR "Hash:$hstr: Content:$string:\n";
+ 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;
+}
+
+# writedebugfile(string, label)
+# if $debug set writes <string> to file latexdiff.debug.<label>
+# otherwise do nothing
+sub writedebugfile {
+ my ($string,$label)=@_;
+ if ( $debug ) {
+ open(RAWDIFF,">","latexdiff.debug." . $label);
+ print RAWDIFF $string;
+ close(RAWDIFF);
+ }
+}
+
+
+# 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 math-mode COARSE,WHOLE or NONE option set: Convert \MATHBLOCKmath{..} commands back to environments
+#
+# Convert all PICTUREblock{..} commands back to the appropriate environments
+# 3. Convert DIFadd, DIFdel, DIFaddbegin , ... 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 '\%' and '\DOLLAR ' 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, \end,{,} in comments
+# Change \QLEFTBRACE, \QRIGHTBRACE,\AMPERSAND 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);
+
+ my (@textparts,@newtextparts,@liststack,$listtype,$listlast);
+
+ my (@itemargs, $itemarg);
+
+
+ for (@_) {
+ # change $'s in comments to something harmless
+ 1 while s/(%.*)\$/$1DOLLARDIF/mg ;
+
+ # Remove final STOP token
+ s/ STOP$//;
+ # Replace \RIGHTBRACE in comments by \MBLOCKRIGHTBRACE
+ # the only way to get these is as %DIFDELCMD < \RIGHTBRACE construction
+ # This essentially marks closing right braces of MATHBLOCK environments, which did not get matched
+ # up. This case should be rare, so I just leave this in the diff file output. Not really elegant
+ # but can still be dealt with later if it results in problems.
+ s/%DIFDELCMD < \\RIGHTBRACE/%DIFDELCMD < \\MBLOCKRIGHTBRACE/g ;
+ # Replace \RIGHTBRACE by }
+ s/\\RIGHTBRACE/}/g;
+
+ # 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 ) {
+ ### while ( m/\\DIFdelbegin.*?\\DIFdelend/sg ) {
+ ### print STDERR "DEBUG Match delblock \n||||$&||||\n at ",pos,"\n";
+ $cnt=0;
+ $len=length($&);
+ $begin=pos($_) - $len;
+ $delblock=$&;
+ ### A much simpler method for math replacement might follow this strategy (can recycle part of the commands below for following
+ ### this strategy:
+ ### 1. a Insert aux commands \begin{MATHMODE} or \end{MATHMODE} for all deleted commands opening or closing displayed math mode
+ ### b Insert aux commands \begin{MATHARRMODE} or \end{MATHARRMODE} for all deleted commands opening or closing math array mode
+ ### 2 Replace MATHMODE and MATHARRMODE by correct pairing if appropriate partner math command is found in text
+ ### 3 a Replace remaining \begin{MATHMODE}...\end{MATHMODE} pairs with \begin{$MATHREPL}..\end{$MATHREPL}
+ ### b Replace remaining \begin{MATHARRMODE}...\end{MATHARRMODE} pairs with \begin{$MATHREPL}..\end{$MATHREPL}
+ ### 4 Delete all aux command math mode pairs which have simply comments or empty lines between them
+ ### As written this won't actually work!
+
+
+ ### Most general case: allow all included environments
+ ### $delblock=~ s/(\%DIFDELCMD < \s*\\begin\{(\w*\*?)\}\s*?\n)(.*?)(\%DIFDELCMD < \s*\\end\{\2\})/$1\\begin{$2}$AUXCMD\n$3\n\\end{$2}$AUXCMD\n$4/sg;
+ ### (.*?[^\n]?)\n? construct is necessary to avoid empty lines in math mode, which result in
+ ### an error
+ # displayed math environments
+ ###0.5: $delblock=~ s/(\%DIFDELCMD < \s*\\begin\{((?:$MATHENV)|SQUAREBRACKET)\}\s*?(?:$DELCMDCLOSE|\n))(.*?[^\n]?)\n?(\%DIFDELCMD < \s*\\end\{\2\})/\\begin{$MATHREPL}$AUXCMD\n$1$3\n\\end{$MATHREPL}$AUXCMD\n$4/sg;
+ 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/(?<!${AUXCMD}\n)(\%DIFDELCMD < \s*\\end\{($MATHENV)\}\s*?\n)(.*?[^\n]?)\n?(?<!${AUXCMD}\n)(\%DIFDELCMD < \s*\\begin\{\2\})/$1\\end{$MATHREPL}$AUXCMD\n$3\n\\begin{$MATHREPL}$AUXCMD\n$4/sg;
+ ###0.5: $delblock=~ s/(?<!${AUXCMD}\n)(\%DIFDELCMD < \s*\\end\{((?:$MATHENV)|SQUAREBRACKET)\}\s*?(?:$DELCMDCLOSE|\n))(.*?[^\n]?)\n?(?<!${AUXCMD}\n)(\%DIFDELCMD < \s*\\begin\{\2\})/\\end{MATHMODE}$AUXCMD\n$1$3\n\\begin{MATHMODE}$AUXCMD\n$4/sg;
+ $delblock=~ s/(?<!${AUXCMD}\n)(\%DIFDELCMD < \s*\\end\{((?:$MATHENV)|SQUAREBRACKET)\}.*?(?:$DELCMDCLOSE|\n))(.*?[^\n]?)\n?(?<!${AUXCMD}\n)(\%DIFDELCMD < \s*\\begin\{\2\})/\\end\{MATHMODE\}$AUXCMD\n$1$3\n\\begin\{MATHMODE\}$AUXCMD\n$4/sg;
+
+ # now look for unpaired %DIFDELCMD < \begin{MATHENV}; if found add \begin{$MATHREPL} and insert \end{$MATHREPL}
+ # just before end of block; again we use look-behind assertion to avoid matching constructions which have already been converted
+ if ($delblock=~ s/(?<!${AUXCMD}\n)(\%DIFDELCMD < \s*\\begin\{((?:$MATHENV)|SQUAREBRACKET)\}\s*?(?:$DELCMDCLOSE|\n))/$1\\begin{$MATHREPL}$AUXCMD\n/sg ) {
+ $delblock =~ s/(\\DIFdelend$)/\\end{$MATHREPL}$AUXCMD\n$1/s ;
+ }
+ # now look for unpaired %DIFDELCMD < \end{MATHENV}; if found add \end{MATHMODE} and insert \begin{MATHMODE}
+ # just before end of block; again we use look-behind assertion to avoid matching constructions which have already been converted
+ if ($delblock=~ s/(?<!${AUXCMD}\n)(\%DIFDELCMD < \s*\\end\{((?:$MATHENV)|SQUAREBRACKET)\}\s*?(?:$DELCMDCLOSE|\n))/$1\\end\{MATHMODE\}$AUXCMD\n/sg ) {
+ $delblock =~ s/(\\DIFdelend$)/\\begin\{MATHMODE\}$AUXCMD\n$1/s ;
+ }
+
+
+ ### pre-0.42 # same as above for special case \[.\] (latex abbreviation for displaymath)
+ ### pre-0.42 $delblock=~ s/(\%DIFDELCMD < \s*\\\[\s*?\n())(.*?[^\n]?)\n?(\%DIFDELCMD < \s*\\\])/$1\\\[$AUXCMD\n$3\n\\\]$AUXCMD\n$4/sg;
+ ### pre-0.42 $delblock=~ s/(?<!${AUXCMD}\n)(\%DIFDELCMD < \s*\\\]\s*?\n())(.*?[^\n]?)\n?(?<!${AUXCMD}\n)(\%DIFDELCMD < \s*\\\[)/$1\\\]$AUXCMD\n$3\n\\\[$AUXCMD\n$4/sg;
+ # equation array environment
+ ###pre-0.3 $delblock=~ s/(\%DIFDELCMD < \s*\\begin\{($MATHARRENV)\}\s*?\n)(.*?)(\%DIFDELCMD < \s*\\end\{\2\})/$1\\begin{$MATHARRREPL}$AUXCMD\n$3\n\\end{$MATHARRREPL}$AUXCMD\n$4/sg;
+ ###0.5 $delblock=~ s/(\%DIFDELCMD < \s*\\begin\{($MATHARRENV)\}\s*?(?:$DELCMDCLOSE|\n))(.*?[^\n]?)\n?(\%DIFDELCMD < \s*\\end\{\2\})/\\begin{$MATHARRREPL}$AUXCMD\n$1$3\n\\end{$MATHARRREPL}$AUXCMD\n$4/sg;
+ $delblock=~ s/(\%DIFDELCMD < \s*\\begin\{($MATHARRENV)\}.*?(?:$DELCMDCLOSE|\n))(.*?[^\n]?)\n?(\%DIFDELCMD < \s*\\end\{\2\})/\\begin{$MATHARRREPL}$AUXCMD\n$1$3\n\\end{$MATHARRREPL}$AUXCMD\n$4/sg;
+ ### pre-0.42 obsolete version which did not work on eqnarray test $delblock=~ s/(?<!${AUXCMD}\n)(\%DIFDELCMD < \s*\\end\{($MATHARRENV)\}\s*?\n)(.*?[^\n]?)\n?(?<!${AUXCMD}\n)(\%DIFDELCMD < \s*\\begin\{\2\})/$1\\end{$MATHARRREPL}$AUXCMD\n$3\n\\begin{$MATHARRREPL}$AUXCMD\n$4/sg;
+ $delblock=~ s/(?<!${AUXCMD}\n)(\%DIFDELCMD < \s*\\end\{($MATHARRENV)\}\s*?(?:$DELCMDCLOSE|\n))(.*?[^\n]?)\n?(?<!${AUXCMD}\n)(\%DIFDELCMD < \s*\\begin\{\2\})/\\end{MATHMODE}$AUXCMD\n$1$3\n\\begin{MATHMODE}$AUXCMD\n$4/sg;
+
+ # now look for unpaired %DIFDELCMD < \begin{MATHARRENV}; if found add \begin{$MATHARRREPL} and insert \end{$MATHARRREPL}
+ # just before end of block; again we use look-behind assertion to avoid matching constructions which have already been converted
+ if ($delblock=~ s/(?<!${AUXCMD}\n)(\%DIFDELCMD < \s*\\begin\{($MATHARRENV)\}\s*?(?:$DELCMDCLOSE|\n))/$1\\begin{$MATHARRREPL}$AUXCMD\n/sg ) {
+ $delblock =~ s/(\\DIFdelend$)/\\end{$MATHARRREPL}$AUXCMD\n$1/s ;
+ }
+ # now look for unpaired %DIFDELCMD < \end{MATHENV}; if found add \end{MATHMODE} and insert \begin{MATHMODE}
+ # just before end of block; again we use look-behind assertion to avoid matching constructions which have already been converted
+ if ($delblock=~ s/(?<!${AUXCMD}\n)(\%DIFDELCMD < \s*\\end\{($MATHARRENV)\}\s*?(?:$DELCMDCLOSE|\n))/$1\\end{MATHMODE}$AUXCMD\n/sg ) {
+ $delblock =~ s/(\\DIFdelend$)/\\begin{MATHMODE}$AUXCMD\n$1/s ;
+ }
+
+ # parse $delblock for deleted and reinstated eqnarray* environments - within those reinstate \\ and & commands
+ ### while ( $delblock =~ m/\\begin{$MATHARRREPL}$AUXCMD\n.*?\n\\end{$MATHARRREPL}$AUXCMD\n/sg ) {
+ while ( $delblock =~ m/\\begin\Q{$MATHARRREPL}$AUXCMD\E\n.*?\n\\end\Q{$MATHARRREPL}$AUXCMD\E\n/sg ) {
+ ### print STDERR "DEBUG Match eqarrayblock $& at ",pos,"\n";
+ $cnt2=0;
+ $len2=length($&);
+ $begin2=pos($delblock) - $len2;
+ $eqarrayblock=$&;
+ # reinstate deleted & and \\ commands
+ $eqarrayblock=~ s/(\%DIFDELCMD < \s*(\&|\\\\)\s*?(?:$DELCMDCLOSE|\n))/$1$2$AUXCMD\n/sg ;
+
+ substr($delblock,$begin2,$len2)=$eqarrayblock;
+ pos($delblock) = $begin2 + length($eqarrayblock);
+ }
+ } elsif ( $mathmarkup == COARSE || $mathmarkup == WHOLE ) {
+ # 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
+ $delblock=~ s/\\MATHBLOCK($MATHENV)\{($pat_n)\}/\\MATHBLOCK$MATHREPL\{$2\}/sg;
+ $delblock=~ s/\\MATHBLOCK($MATHARRENV)\{($pat_n)\}/\\MATHBLOCK$MATHARRREPL\{$2\}/sg;
+ }
+ # Reinstate completely deleted list environments. note that items within the
+ # environment will still be commented out. They will be restored later
+ $delblock=~ s/(\%DIFDELCMD < \s*\\begin\{($LISTENV)\}\s*?(?:\n|$DELCMDCLOSE))(.*?)(\%DIFDELCMD < \s*\\end\{\2\})/{
+ ### # block within the search; replacement environment
+ ### "$1\\begin{$2}$AUXCMD\n". restore_item_commands($3). "\n\\end{$2}$AUXCMD\n$4";
+ "$1\\begin{$2}$AUXCMD\n$3\n\\end{$2}$AUXCMD\n$4";
+ }/esg;
+
+ ### $delblock=~ s/\\begin\{$MATHENV}$AUXCMD/\\begin{$MATHREPL}$AUXCMD/g;
+ ### $delblock=~ s/\\end\{$MATHENV}$AUXCMD/\\end{$MATHREPL}$AUXCMD/g;
+ ### $delblock=~ s/\\begin\{$MATHARRENV}$AUXCMD/\\begin{$MATHARRREPL}$AUXCMD/g;
+ ### $delblock=~ s/\\end\{$MATHARRENV}$AUXCMD/\\end{$MATHARRREPL}$AUXCMD/g;
+
+ # 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}\[$brat_n\]${extraspace}|${extraspace}\{$pat_n\})*\s*${AUXCMD}\n)/\\$1$2\\addtocounter{$1}{-1}${AUXCMD}\n/sg ;
+
+ # bb. disable active labels within deleted blocks (i.e. those not commented out) (as these are not safe commands, this should normally only
+ # happen within deleted maths blocks
+ ### $delblock=~ s/(?<!$DELCMDOPEN)(\\$LABELCMD(?:${extraspace})\{(?:[^{}])*\}[\t ]*)\n?/${DELCMDOPEN}$1${DELCMDCLOSE}/smg ;
+ ### previous line caused trouble as by issue #90 I might need to modify this
+ $delblock=~ s/^([^%]*)(\\$LABELCMD(?:${extraspace})\{(?:[^{}])*\}[\t ]*)\n?/$1${DELCMDOPEN}$2${DELCMDCLOSE}/smg ;
+ ### print STDERR "<<<$delblock>>>\n" if $debug;
+
+
+ # c. If in-line math mode contains array environment, enclose the whole environment in \mbox'es
+ while ( $delblock =~ m/($math)(\s*)/sg ) {
+ # print STDERR "DEBUG Delblock Match math $& at ",pos,"\n";
+ $cnt2=0;
+ $len2=length($&);
+ $begin2=pos($delblock) - $len2;
+ $mathblock="%\n\\mbox{$AUXCMD\n$1\n}$AUXCMD\n";
+ next unless ( $mathblock =~ /ARRAYBLOCK/ or $mathblock =~ m/\{$ARRENV\}/ );
+ substr($delblock,$begin2,$len2)=$mathblock;
+ pos($delblock) = $begin2 + length($mathblock);
+ }
+ ### if ($CITE2CMD) {
+ ###### ${extraspace}(?:\[$brat0\]${extraspace}){0,2}\{$pat_n\})) .*?%%%\n
+ ### $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}\{$pat_n\})(\s*)/\\mbox{$AUXCMD\n$1\n}$AUXCMD\n/msg ;
+ ### $delblock=~s/(\\($CITECMD)${extraspace}(?:<$abrat0>${extraspace})?(?:\[$brat0\]${extraspace}){0,2}\{$pat_n\})(\s*)/\\mbox{$AUXCMD\n$1\n}$AUXCMD\n/msg ;
+ ### }
+ # if MBOXINLINEMATH is set, protect inlined math environments with an extra mbox
+ if ( $MBOXINLINEMATH ) {
+ # note additional \newline after command is omitted from output if right at the end of deleted block (otherwise a spurious empty line is generated)
+ $delblock=~s/($math)(?:[\s\n]*)?/\\mbox{$AUXCMD\n$1\n}$AUXCMD\n/sg;
+ }
+ ###if ( defined($packages{"listings"} and $latexdiffpreamble =~ /\\RequirePackage(?:\[$brat_n\])?\{color\}/)) {
+ ### # change included verbatim environments
+ ### $delblock =~ s/\\DIFverb\{/\\DIFDIFdelverb\{/g;
+ ### $delblock =~ s/\\DIFlstinline/\\DIFDIFdellstinline/g;
+ ###}
+ # Mark deleted verbose commands
+ $delblock =~ s/(${DELCMDOPEN}\\DIF((?:verb\*?|lstinline(?:\[$brat_n\])?)\{([-\d]*?)\}\s*).*)$/%\n\\DIFDIFdel$2${AUXCMD}\n$1/gm;
+ if ( $CUSTOMDIFCMD ) {
+ $delblock =~ s/(${DELCMDOPEN}.*)\\($CUSTOMDIFCMD)/$1${DELCMDCLOSE}\\DEL$2/gm;
+ }
+
+ # splice in modified delblock
+ substr($_,$begin,$len)=$delblock;
+ pos = $begin + length($delblock);
+ }
+ ###writedebugfile($_,'postprocess');
+
+ ### print STDERR "<<<$_>>>\n" if $debug;
+
+
+ # 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 =~ /ARRAYBLOCK/ or $mathblock =~ m/\{$ARRENV\}/) ;
+ substr($addblock,$begin2,$len2)=$mathblock;
+ pos($addblock) = $begin2 + length($mathblock);
+ }
+ # if MBOXINLINEMATH is set, protect inlined math environments with an extra mbox
+ if ( $MBOXINLINEMATH ) {
+ ##$addblock=~s/($math)/\\mbox{$AUXCMD\n$1\n}$AUXCMD\n/sg;
+ $addblock=~s/($math)(?:[\s\n]*)?/\\mbox{$AUXCMD\n$1\n}$AUXCMD\n/sg;
+ }
+ ###if ( defined($packages{"listings"} and $latexdiffpreamble =~ /\\RequirePackage(?:\[$brat0\])?\{color\}/)) {
+ # mark added verbatim commands
+ $addblock =~ s/\\DIFverb/\\DIFDIFaddverb/g;
+ $addblock =~ s/\\DIFlstinline/\\DIFDIFaddlstinline/g;
+ if( $CUSTOMDIFCMD ) {
+ $addblock =~ s/\\($CUSTOMDIFCMD)/\\ADD$1/g;
+ }
+ # markup the optional arguments of \item
+ $addblock =~ s/(\\$ITEMCMD$extraspace(?:<$abrat0>)?$extraspace)\[($brat_n)\]/
+ @itemargs=splitlatex(substr($2,0,length($2)));
+ $itemarg="[".join("",marktags("","",$ADDOPEN,$ADDCLOSE,"","",$ADDCOMMENT,\@itemargs))."]";
+ "$1$itemarg"/sge; # old substitution: $1\[$ADDOPEN$2$ADDCLOSE\]
+ ###}
+# splice in modified addblock
+ substr($_,$begin,$len)=$addblock;
+ pos = $begin + length($addblock);
+ }
+
+ # Go through whole text, and by counting list environment commands, find out when we are within a list environment.
+ # Within those restore deleted \item commands
+ @textparts=split /(?<!$DELCMDOPEN)(\\(?:begin|end)\{$LISTENV\})/ ;
+ @liststack=();
+ @newtextparts=map {
+ ### print STDERR ":::::::: $_\n";
+ if ( ($listtype) = m/^\\begin\{($LISTENV)\}$/ ) {
+ print STDERR "DEBUG: postprocess \\begin{$listtype}\n" if $debug;
+ push @liststack,$listtype;
+ } elsif ( ($listtype) = m/^\\end\{($LISTENV)\}$/ ) {
+ print STDERR "DEBUG: postprocess \\end{$listtype}\n" if $debug;
+ if (scalar @liststack > 0) {
+ $listlast=pop(@liststack);
+ ($listtype eq $listlast) or warn "Invalid nesting of list environments: $listlast environment closed by \\end{$listtype}.";
+ } else {
+ warn "WARNING: Invalid nesting of list environments: \\end{$listtype} encountered without matching \\begin{$listtype}.\n";
+ }
+ } else {
+ print STDERR "DEBUG: postprocess \@liststack=(",join(",",@liststack),")\n" if $debug;
+ if (scalar @liststack > 0 ) {
+ # we are within a list environment and should replace all item commands
+ $_=restore_item_commands($_);
+ }
+ # else: we are outside a list environment and do not need to do anything
+ }
+ $_ } @textparts; # end of map command
+ # replace the main text with the modified version
+ $_= join("",@newtextparts);
+
+
+
+
+ # 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\}((?:(.(?!(?<!\\)\&|\\\\))*)?)\\end\{MATHMODE\}/\\begin{$MATHREPL}$1\\end{$MATHREPL}/sg;
+ # others into MATHARRREPL
+ s/\\begin\{MATHMODE\}(.*?)\\end\{MATHMODE\}/\\begin{$MATHARRREPL}$1\\end{$MATHARRREPL}/sg;
+
+ # now look for AUXCMD math-mode pairs which have only comments (or empty lines between them), and remove the added commands
+ s/\\begin\{((?:$MATHENV)|(?:$MATHARRENV)|SQUAREBRACKET)\}$AUXCMD\n((?:\s*%.[^\n]*\n)*)\\end\{\1\}$AUXCMD\n/$2/sg;
+ } else {
+ # math modes OFF,WHOLE,COARSE: Convert \MATHBLOCKmath{..} commands back to environments
+ s/\\MATHBLOCK($MATHENV|$MATHARRENV|SQUAREBRACKET)\{($pat_n)\}/\\begin{$1}$2\\end{$1}/sg;
+ # convert ARRAYBLOCK.. commands back to environments
+ s/\\ARRAYBLOCK($ARRENV)\{($pat_n)\}/\\begin{$1}$2\\end{$1}/sg;
+ # get rid of the DIFANCHOR markers, first the delete comments, then everywhere
+ s/%DIFDELCMD < \\DIFANCHOR(?:MATH|ARR)[BE] (?:\n%DIFDELCMD < )?%%%\n//g ;
+ s/\\DIFANCHOR(?:MATH|ARR)[BE] //g;
+ }
+
+ # Convert all PICTUREblock{..} commands back to the appropriate environments
+ s/\\PICTUREBLOCK($PICTUREENV)\{($pat_n)\}/\\begin{$1}$2\\end{$1}/sg;
+#0.5: # Remove all mark up within picture environments
+# while ( m/\\begin\{($PICTUREENV)\}.*?\\end\{\1\}/sg ) {
+# $cnt=0;
+# $len=length($&);
+# $begin=pos($_) - $len;
+# $float=$&;
+# $float =~ s/\\DIFaddbegin //g;
+# $float =~ s/\\DIFaddend //g;
+# $float =~ s/\\DIFadd\{($pat_n)\}/$1/g;
+# $float =~ s/\\DIFdelbegin //g;
+# $float =~ s/\\DIFdelend //g;
+# $float =~ s/\\DIFdel\{($pat_n)\}//g;
+# $float =~ s/$DELCMDOPEN.*//g;
+# substr($_,$begin,$len)=$float;
+# pos = $begin + length($float);
+# }
+ # Convert DIFadd, DIFdel, DIFFaddbegin , ... into varieties
+ # within floats (currently recognised float environments: plate,table,figure
+ # plus starred varieties).
+ while ( m/\\begin\{($FLOATENV)\}.*?\\end\{\1\}/sg ) {
+ $cnt=0;
+ $len=length($&);
+ $begin=pos($_) - $len;
+ $float=$&;
+ $float =~ s/\\DIFaddbegin /\\DIFaddbeginFL /g;
+ $float =~ s/\\DIFaddend /\\DIFaddendFL /g;
+ $float =~ s/\\DIFadd\{/\\DIFaddFL{/g;
+ $float =~ s/\\DIFdelbegin /\\DIFdelbeginFL /g;
+ $float =~ s/\\DIFdelend /\\DIFdelendFL /g;
+ $float =~ s/\\DIFdel\{/\\DIFdelFL{/g;
+ substr($_,$begin,$len)=$float;
+ pos = $begin + length($float);
+ }
+ ### former location of undo renaming of \begin and \end in comments
+
+ # remove empty DIFCMD < lines
+ s/^\Q${DELCMDOPEN}\E\n//msg;
+
+ # Expand hashes of verb and verbatim environments (note negative look behind assertion to not leak out of DIFDELCMD comments
+ s/${DELCMDOPEN}\\($VERBATIMENV)\{([-\d]*?)\}/"${DELCMDOPEN}\\begin{${1}}".fromhash(\%verbhash,$2,$DELCMDOPEN)."${DELCMDOPEN}\\end{${1}}"/esg;
+ # revert changes to verbatim environments for line diffs (and add code to mark up changes)
+ s/(?<!$DELCMDOPEN)\\begin\{($VERBATIMLINEENV)\}(.*?)\\end\{\1\}/"". reverselinecomment($1, $2) .""/esg;
+# # we do the same for deleted environments but additionally reinstate the framing commands
+# s/$DELCMDOPEN\\begin\{($VERBATIMLINEENV)\}$extraspace(?:\[$brat0\])?$DELCMDCLOSE(.*?)$DELCMDOPEN\\end\{\1\}$DELCMDCLOSE/"\\begin{$1}". reverselinecomment($2) . "\\end{$1}"/esg;
+## s/$DELCMDOPEN\\begin\{($VERBATIMLINEENV)\}($extraspace(?:\[$brat0\])?\s*)(?:\n|$DELCMDOPEN)*$DELCMDCLOSE((?:\%$DELCOMMENT$VERBCOMMENT.*?\n)*)($DELCMDOPEN\\end\{\1\}(?:\n|\s|$DELCMDOPEN)*$DELCMDCLOSE)/"SUBSTITUTION: \\begin{$1}$2 INTERIOR: |$3| END: |$4|"/esg;
+ s/ # Deleted \begin command of verbatim environment (Captures $1: whole deleted command, $2: environment, $3: optional arguments with white space
+ (\Q$DELCMDOPEN\E\\begin\{($VERBATIMLINEENV)\}(\Q$extraspace\E(?:\[$brat_n\])?\s*)(?:\n|\Q$DELCMDOPEN\E)*\Q$DELCMDCLOSE\E)
+ # Interior of deleted verbatim environment should consist entirely of delete DIFVRB comments, i.e. match only lines beginning with % DIF < DIFVRB
+ # Captures: $4: all lines combined
+ ((?:\%\Q$DELCOMMENT$VERBCOMMENT\E[^\n]*?\n)*)
+ # Deleted \end command of verbatim environment. Note that the type is forced to match the opening. Captures: $5: Whole deleted environment (previous way this line was written: (\Q$DELCMDOPEN\E\\end\{\2\}(?:\n|\s|\Q$DELCMDOPEN\E)*\Q$DELCMDCLOSE\E)
+ (\Q$DELCMDOPEN\E\\end\{\2\})
+ / # Substitution part
+ $1 # Leave expression as is
+ . "$AUXCMD NEXT\n" # Mark the following line as an auxiliary command
+ . "" # reinstate the original environment without options
+ . reverselinecomment($2, "$3$4") # modify the body to change the markup; reverselinecomment parses for options
+ . " $AUXCMD\n" # close the auxiliary environment
+ . $5 # and again leave the original deleted closing environment as is
+ /esgx; # Modifiers of substitution command
+ # where changes have occurred in verbatim environment, change verbatim to DIFverbatim to allow mark-up
+ # (I use the presence of optional paramater to verbatim environment as the marker - normal verbatim
+ # environment does not take optional arguments)
+ s/(?<!$DELCMDOPEN)\\begin\{(verbatim[*]?)\}(\[$brat_n\].*?)\\end\{\1\}/\\begin{DIF$1}$2\\end{DIF$1}/sg;
+
+ s/\\($VERBATIMENV)\{([-\d]*?)\}/"\\begin{${1}}".fromhash(\%verbhash,$2)."\\end{${1}}"/esg;
+
+
+ # remove all \PAR tokens (taking care to properly keep commented out PAR's
+ # from introducing uncommented newlines - next line)
+ s/(%DIF < )([^\n]*?)\\PAR\n/$1$2\n$1\n/sg;
+ # convert PAR commands which are on a line by themselves
+ s/\n(\s*?)\\PAR\n/\n\n/sg;
+ # convert remaining PAR commands (which are preceded by non-white space characters, usually "}" ($ADDCLOSE)
+ s/\\PAR\n/\n\n/sg;
+
+ # package specific processing:
+ if ( defined($packages{"endfloat"})) {
+ #endfloat: make sure \begin{figure} and \end{figure} are always
+ # on a line by themselves, similarly for table environment
+ print STDERR "endfloat package detected.\n" if $verbose ;
+ # eliminate whitespace before and after
+ s/^(\s*)(\\(?:end|begin)\{(?:figure|table)\})(\s*?)$/$2/mg;
+ # split lines with remaining characters before float environment conmmand
+ s/^([^%]+)(\\(?:begin|end)\{(?:figure|table)\})/$1\n$2/mg;
+ # split lines with remaining characters after float environment conmmand
+ s/^((?:[^%]+)\\(?:begin|end)\{(?:figure|table)\}(?:\[[a-zA-Z]+\])?)(.+)((?:%.*)?)$/$1\n$2$3/mg;
+ }
+
+ # Convert '\PERCENTAGE ' back into '\%' (the final question mark catches a special situation where due to a latter pre-processing step the ' ' becomes separated
+ s/\\PERCENTAGE ?/\\%/g;
+ # Convert '\DOLLAR ' back into '\$'
+ s/\\DOLLAR /\\\$/g;
+
+ # undo renaming of the \begin and \end,{,} and dollars in comments
+
+ # although we only renamed $ in comments to DOLLARDIFF, we might have lost the % in unchanged verbatim blocks, so rename all
+ s/DOLLARDIF/\$/g;
+# Convert \begin{SQUAREBRACKET} \end{SQUAREBRACKET} into \[ \]
+ s/\\end\{SQUAREBRACKET\}/\\\]/sg;
+ s/\\begin\{SQUAREBRACKET\}/\\\[/sg;
+# 4. Convert \begin{DOLLARDOLLAR} \end{DOLLARDOLLAR} into $$ $$
+ s/\\begin\{DOLLARDOLLAR\}(.*?)\\end\{DOLLARDOLLAR\}/\$\$$1\$\$/sg;
+# 5. Convert \SUPERSCRIPTNB{n} into ^n and \SUPERSCRIPT{nn} into ^{nnn}
+ 1 while s/\\SUPERSCRIPT(\s*\{($pat_n)\})/^$1/g ;
+ 1 while s/\\SUPERSCRIPTNB\{(\s*$pat0)\}/^$1/g ;
+ # Convert \SUBSCRIPNB{n} into _n and \SUBCRIPT{nn} into _{nnn}
+ 1 while s/\\SUBSCRIPT(\s*\{($pat_n)\})/_$1/g ;
+ 1 while s/\\SUBSCRIPTNB\{(\s*$pat0)\}/_$1/g ;
+ # Convert \SQRT{n} into \sqrt{n} and \SQRTNB{nn} into \sqrt nn
+ 1 while s/\\SQRT(\s*\{($pat_n)\})/\\sqrt$1/g ;
+ 1 while s/\\SQRTNB\{(\s*$pat0)\}/\\sqrt$1/g ;
+
+ 1 while s/(%.*)\\CRIGHTBRACE (.*)$/$1\}$2/mg ;
+ 1 while s/(%.*)\\CLEFTBRACE (.*)$/$1\{$2/mg ;
+
+
+# Change \QLEFTBRACE, \QRIGHTBRACE to \{,\}
+ s/\\QLEFTBRACE /\\\{/sg;
+ s/\\QRIGHTBRACE /\\\}/sg;
+ s/\\AMPERSAND /\\&/sg;
+ # Highligh added inline verbatim commands if possible
+ if ( $latexdiffpreamble =~ /\\RequirePackage(?:\[$brat_n\])?\{color\}/ ) {
+ # wrap added verb commands with color commands
+ s/\\DIFDIFadd((?:verb\*?|lstinline(?:\[$brat_n\])?)\{[-\d]*?\}[\s\n]*)/\{\\color{blue}$AUXCMD\n\\DIF$1%\n\}$AUXCMD\n/sg;
+ s/\\DIFDIFdel((?:verb\*?|lstinline(?:\[$brat_n\])?)\{[-\d]*?\}[\s\n]*$AUXCMD)/\{\\color{red}${AUXCMD}\n\\DIF$1\n\}${AUXCMD}/sg;
+ } else {
+ # currently if colour markup is not used just remove the added mark
+ s/\\DIFDIFadd(verb\*?|lstinline)/\\DIF$1/sg;
+ s/\\DIFDIFdel((?:verb\*?|lstinline(?:\[$brat_n\])?)\{[-\d]*?\}[\s\n]*$AUXCMD\n)//sg;
+ }
+ # expand \verb and friends inline arguments
+ s/\\DIF((?:DIFadd|DIFdel)?(?:verb\*?|lstinline(?:\[$brat_n\])?))\{([-\d]*?)\}/"\\${1}". fromhash(\%verbhash,$2)/esg;
+ # add basicstyle color{blue} to added lstinline commands
+ # finally add the comment to the ones not having an optional argument before
+ ###s/\\DIFaddlstinline(?!\[)/\\lstinline\n[basicstyle=\\color{blue}]$AUXCMD\n/g;
+
+ return;
+ }
+}
+
+# $out = restore_item_commands($listenviron)
+# short helper function for post-process, which restores deleted \item commands in its argument (as DIFAUXCMDs)
+sub restore_item_commands {
+ my ($string)=@_ ;
+ my ($itemarg,@itemargs);
+ $string =~ s/(\%DIFDELCMD < \s*(\\$ITEMCMD$extraspace)((?:<$abrat0>)?$extraspace)((?:\[$brat_n\])?)\s*((?:${cmdoptseq}\s*?)*)(?:\n|$DELCMDCLOSE))/
+ # if \item has an []argument, then mark up the argument as deleted)
+ if (length($4)>0) {
+ # use substr to exclude square brackets at end points
+ @itemargs=splitlatex(substr($4,1,length($4)-2));
+ $itemarg="[".join("",marktags("","",$DELOPEN,$DELCLOSE,$DELCMDOPEN,$DELCMDCLOSE,$DELCOMMENT,\@itemargs))."]";
+ } else {
+ $itemarg="";
+ }
+ "$1$2$3$itemarg$AUXCMD\n"; ###.((length($5)>0) ? "%DIFDELCMD $5 $DELCMDCLOSE\n" : "")
+ /sge;
+ return($string);
+}
+
+
+# @auxlines=preprocess_preamble($oldpreamble,$newpreamble);
+ # pre-process preamble by looking for commands used in \maketitle (title, author, date etc commands)
+ # the list of commands is defined in CONTEXT2CMD
+ # if found then use a bodydiff to mark up content, and replace the corresponding commands
+ # in both preambles by marked up version to 'fool' the linediff (such that only body is marked
+ # up.
+ # A special case are e.g. author commands being added (or removed)
+ # 1. If commands are added, then the entire content is marked up as new, but also the lines are marked as new in the linediff
+ # 2. If commands are removed, then the linediff will mark the line as deleted. The program returns
+ # with $auxlines a text to be appended at the end of the preamble, which shows the respective fields as deleted
+sub preprocess_preamble {
+ my ($oldpreambleref,$newpreambleref)=(\$_[0],\$_[1]) ;
+ my @auxlines=();
+ # Remember to use $$oldpreambleref to refer to oldpreamble
+ my ($titlecmd,$titlecmdpat);
+ my (@oldtitlecommands,@newtitlecommands );
+ my %oldhash = ();
+ my %newhash = ();
+ my ($line,$cmd,$optarg,$arg,$optargnew,$optargold,$optargdiff,$argold,$argnew,$argdiff,$auxline);
+
+ my $warnmsgdetail = <<EOF ;
+ This should not occur for standard styles, but can occur for some specifiy styles, document classes,
+ e.g. journal house styles.
+ Workaround: Use --replace-context2cmd option to specifically set those commands, which are not repeated.
+EOF
+
+ # resuse context2cmdlist to define these commands to look out for in preamble
+ $titlecmd = "(?:".join("|",@CONTEXT2CMDLIST).")";
+ # as context2cmdlist is stored as regex, e.g. ((?-xism:^title$), we need to remove ^- fo
+ # resue in a more complex regex
+ $titlecmd =~ s/[\$\^]//g;
+ # make sure to not match on comment lines:
+ $titlecmdpat=qr/^(?:[^%\n]|\\%)*(\\($titlecmd)$extraspace(?:\[($brat_n)\])?(?:\{($pat_n)\}))/ms;
+ ###print STDERR "DEBUG:",$titlecmdpat,"\n";
+ @oldtitlecommands= ( $$oldpreambleref =~ m/$titlecmdpat/g );
+ @newtitlecommands= ( $$newpreambleref =~ m/$titlecmdpat/g );
+
+
+ while ( @oldtitlecommands ) {
+ $line=shift @oldtitlecommands;
+ $cmd=shift @oldtitlecommands;
+ $optarg=shift @oldtitlecommands;
+ $arg=shift @oldtitlecommands;
+
+ if ( defined($oldhash{$cmd})) {
+ warn "WARNING: $cmd is used twice in preamble of old file. Reverting to pure line diff mode for preamble.\n";
+ print STDERR $warnmsgdetail;
+ return;
+ }
+ $oldhash{$cmd}=[ $line, $optarg, $arg ];
+ }
+ while ( @newtitlecommands ) {
+ $line=shift @newtitlecommands;
+ $cmd=shift @newtitlecommands;
+ $optarg=shift @newtitlecommands;
+ $arg=shift @newtitlecommands;
+
+ if ( defined($newhash{$cmd})) {
+ warn "$cmd is used twice in preamble of new file. Reverting to pure line diff mode for preamble.\n";
+ print STDERR $warnmsgdetail;
+ return;
+ }
+ $newhash{$cmd}=[ $line, $optarg, $arg ];
+ }
+ foreach $cmd ( keys %newhash ) {
+ if ( defined($newhash{$cmd}->[1])) {
+ $optargnew=$newhash{$cmd}->[1];
+ } else {
+ $optargnew="";
+ }
+ if ( defined($oldhash{$cmd}->[1])) {
+ $optargold=$oldhash{$cmd}->[1];
+ } else {
+ $optargold="";
+ }
+
+ if ( defined($oldhash{$cmd}->[2]) ) {
+ $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}) ;
+ $argold=$oldhash{$cmd}->[2];
+ $argdiff="{" . join("",bodydiff($argold,"")) ."}";
+ 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="";
+ }
+ $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)
+# This is used for command lists and configuration variables, but the processing is slightly
+# different:
+# For lists, the regular expression is extended to include beginning (^) and end ($) markers, to require full-string matching
+# For configuration variables (and all others), simply an unadorned list is copied
+sub init_regex_arr_data {
+ my ($arr,$token)=@_;
+ my $copy=0;
+ my ($mode);
+ if ($token =~ m/COMMANDS/ ) {
+ $mode=0; # Reading command list
+ } else {
+ $mode=1; # Reading configuration variables
+ }
+
+ while (<DATA>) {
+ if ( m/^%%BEGIN $token\s*$/ ) {
+ $copy=1;
+ next;
+ } elsif ( m/^%%END $token\s*$/ ) {
+ last; }
+ chomp;
+ if ( $mode==0 ) {
+# print STDERR "DEBUG init_regex_arr_data regex >$_<\n" if ($debug && $copy);
+ push (@$arr,qr/^$_$/) if ( $copy && !/^%/ ) ;
+ } elsif ($mode==1) {
+ push (@$arr,"$_") if ( $copy && !/^%/ ) ;
+ }
+ }
+ seek DATA,0,0; # rewind DATA handle to file begin
+}
+
+
+# init_regex_arr_ext(\@array,$arg)
+# appends 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)=@_;
+ if ( -f $arg ) {
+ init_regex_arr_file($arr,$arg);
+ } else {
+ init_regex_arr_list($arr,$arg);
+ }
+}
+
+# init_regex_arr_file(\@array,$fname)
+# appends array with regular expressions.
+# Read in list of regular expressions from $fname
+# (one expression per line)
+sub init_regex_arr_file {
+ my ($arr,$fname)=@_;
+ open(FILE,"$fname") or die ("Couldn't open $fname: $!");
+ while (<FILE>) {
+ chomp;
+ next if /^\s*#/ || /^\s*%/ || /^\s*$/ ;
+ push (@$arr,qr/^$_$/);
+ }
+ close(FILE);
+}
+
+# init_regex_arr_list(\@array,$arg)
+# appends array with regular expressions.
+# read from comma separated list of regular expressions ($arg)
+sub init_regex_arr_list {
+ my ($arr,$arg)=@_;
+ my $regex;
+ ### print STDERR "DEBUG init_regex_arr_list arg >$arg<\n" if $debug;
+ foreach $regex (split(qr/(?<!\\),/,$arg)) {
+ $regex =~ s/\\,/,/g;
+ print STDERR "DEBUG init_regex_arr_list regex >$regex<\n" if $debug;
+ push (@$arr,qr/^$regex$/);
+ }
+}
+
+
+#exetime() returns time since last execution of this command
+#exetime(1) resets this time
+my $lasttime=-1; # global variable for persistence
+sub exetime {
+ my $reset=0;
+ my $retval;
+ if ((scalar @_) >=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. Note that old.tex and new.tex need to
+be real files (not pipes or similar) as they are opened twice.
+
+--type=markupstyle
+-t markupstyle Add code to preamble for selected markup style
+ Available styles: UNDERLINE CTRADITIONAL TRADITIONAL CFONT FONTSTRIKE INVISIBLE
+ CHANGEBAR CCHANGEBAR CULINECHBAR CFONTCHBAR BOLD PDFCOMMENT
+ [ 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 MARGIN DVIPSCOL COLOR ZLABEL ONLYCHANGEDPAGE (LABEL)*
+ [ Default: SAFE ]
+ * LABEL subtype is deprecated
+
+--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.
+ context2 commands are also the only commands in the preamble, whose argument will
+ be processed in word-by-word mode (which only works, if they occur no more than
+ once in the preamble).
+
+--exclude-mboxsafecmd=exclude-file
+--exclude-mboxsafecmd="cmd1,cmd2,..."
+--append-mboxsafecmd=append-file
+--append-mboxsafecmd="cmd1,cmd2,..."
+ Define safe commands, which additionally need to be protected by encapsulating
+ in an \\mbox{..}. This is sometimes needed to get around incompatibilities
+ between external packages and the ulem package, which is used for highlighting
+ in the default style UNDERLINE as well as CULINECHBAR CFONTSTRIKE
+
+
+
+--config var1=val1,var2=val2,...
+-c var1=val1,.. Set configuration variables.
+-c configfile Available variables:
+ ARRENV (RegEx)
+ COUNTERCMD (RegEx)
+ FLOATENV (RegEx)
+ ITEMCMD (RegEx)
+ LISTENV (RegEx)
+ MATHARRENV (RegEx)
+ MATHARRREPL (String)
+ MATHENV (RegEx)
+ MATHREPL (String)
+ MINWORDSBLOCK (Integer)
+ PICTUREENV (RegEx)
+ SCALEDELGRAPHICS (Float)
+ VERBATIMENV (RegEx)
+ VERBATIMLINEENV (RegEx)
+ CUSTOMDIFCMD (RegEx)
+ This option can be repeated.
+
+--add-to-config varenv1=pattern1,varenv2=pattern2
+ For configuration variables containing a regular expression (essentially those ending
+ in ENV, and COUNTERCMD) this provides an alternative way to modify the configuration
+ variables. Instead of setting the complete pattern, with this option it is possible to add an
+ alternative pattern. varenv must be one of the variables listed above that take a regular
+ expression as argument, and pattern is any regular expression (which might need to be
+ protected from the shell by quotation). Several patterns can be added at once by using semi-colons
+ to separate them, e.g. --add-to-config "LISTENV=myitemize;myenumerate,COUNTERCMD=endnote"
+
+--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 apacite siunitx cleveref glossaries mhchem chemformula/chemmacros
+ [ 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.
+
+--graphics-markup=level Change highlight style for graphics embedded with \\includegraphics commands
+ Possible values for level:
+ none,off or 0: no highlighting for figures
+ new-only or 1: surround newly added or changed figures with a blue frame [Default]
+ both or 2: highlight new figures with a blue frame and show deleted figures
+ at reduced scale, and crossed out with a red diagonal cross. Use configuration
+ variable SCALEDELGRAPHICS to set size of deleted figures.
+ Note that changes to the optional parameters will make the figure appear as changed
+ to latexdiff, and this figure will thus be highlighted.
+
+--disable-citation-markup
+--disable-auto-mbox Suppress citation markup and markup of other vulnerable commands in styles
+ using ulem (UNDERLINE,FONTSTRIKE, CULINECHBAR)
+ (the two options are identical and are simply aliases)
+
+--enable-citation-markup
+--enforce-auto-mbox Protect citation commands and other vulnerable commands in changed sections
+ with \\mbox command, i.e. use default behaviour for ulem package for other packages
+ (the two options are identical and are simply aliases)
+
+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
+
+--visible-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.
+
+Internal options:
+These options are mostly for automated use by latexdiff-vc. They can be used directly, but
+the API should be considered less stable than for the other options.
+
+--no-links Suppress generation of hyperreferences, used for minimal diffs
+ (option --only-changes of latexdiff-vc).
+EOF
+}
+
+=head1 NAME
+
+latexdiff - determine and markup differences between two latex files
+
+=head1 SYNOPSIS
+
+B<latexdiff> [ B<OPTIONS> ] F<old.tex> F<new.tex> > F<diff.tex>
+
+=head1 DESCRIPTION
+
+Briefly, I<latexdiff> is a utility program to aid in the management of
+revisions of latex documents. It compares two valid latex files, here
+called C<old.tex> and C<new.tex>, 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. Note that old.tex and new.tex need to
+be real files (not pipes or similar) as they are opened twice (unless C<--encoding> option is used)
+
+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<C<%DIF E<gt>>>" is appended to each added line, i.e. a
+line present in C<new.tex> but not in C<old.tex>. Discarded lines
+ are deactivated by prepending "S<C<%DIF E<lt>>>". 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<diff.tex> will be similar to
+C<new.tex>. At the end of the preamble, the definitions for I<latexdiff> markup commands are inserted.
+In differencing the main body of the text, I<latexdiff> attempts to
+satisfy the following guidelines (in order of priority):
+
+=over 3
+
+=item 1
+
+If both C<old.tex> and C<new.tex> are valid LaTeX, then the resulting
+C<diff.tex> should also be valid LateX. (NB If a few plain TeX commands
+are used within C<old.tex> or C<new.tex> then C<diff.tex> 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<diff.tex>.
+
+=item 3
+
+If a changed passage contains text or text-producing commands, then
+running C<diff.tex> 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<diff.tex> should follow the formatting of C<new.tex>
+
+=back
+
+For differencing the same algorithm as I<diff> 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<picture> and C<DIFnomarkup> environments; see B<--config>
+option). The latter environment (C<DIFnomarkup>) 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<latexdiff> begin with "C<\DIF>". Added
+blocks containing words, commands or comments which are in C<new.tex>
+but not in C<old.tex> 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<C<%DIF E<gt> >>".
+
+Within deleted blocks text is highlighted with C<\DIFdel>. Deleted
+comments are marked by prepending "S<C<%DIF E<lt> >>". Non-safe command
+and curly braces within deleted blocks are commented out with
+"S<C<%DIFDELCMD E<lt> >>".
+
+
+
+=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<UNDERLINE CTRADITIONAL TRADITIONAL CFONT FONTSTRIKE INVISIBLE
+CHANGEBAR CCHANGEBAR CULINECHBAR CFONTCHBAR BOLD PDFCOMMENT>
+
+[ Default: C<UNDERLINE> ]
+
+=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<SAFE MARGIN COLOR DVIPSCOL ZLABEL ONLYCHANGEDPAGE (LABEL)*>
+
+[ Default: C<SAFE> ]
+* Subtype C<LABEL> is deprecated
+
+=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<FLOATSAFE TRADITIONALSAFE IDENTICAL>
+
+[ Default: C<FLOATSAFE> ]
+
+=item B<--encoding=enc> or
+B<-e enc>
+
+Specify encoding of old.tex and new.tex. Typical encodings are
+C<ascii>, C<utf8>, C<latin1>, C<latin9>. A list of available encodings can be
+obtained by executing
+
+C<perl -MEncode -e 'print join ("\n",Encode->encodings( ":all" )) ;' >
+
+If this option is used, then old.tex, new.tex are only opened once.
+[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<amsmath>
+
+Configuration variable MATHARRREPL is set to C<align*> (Default: C<eqnarray*>). (Note that many of the
+amsmath array environments are already recognised by default as such)
+
+=item C<endfloat>
+
+Ensure that C<\begin{figure}> and C<\end{figure}> always appear by themselves on a line.
+
+=item C<hyperref>
+
+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).
+
+=item C<apacite>
+
+Redefine the commands recognised as citation commands.
+
+=item C<siunitx>
+
+Treat C<\SI> as equivalent to citation commands (i.e. protect with C<\mbox> if markup style uses ulem package.
+
+=item C<cleveref>
+
+Treat C<\cref,\Cref>, etc as equivalent to citation commands (i.e. protect with C<\mbox> if markup style uses ulem package.
+
+=item C<glossaries>
+
+Define most of the glossaries commands as safe, protecting them with \mbox'es where needed
+
+=item C<mhchem>
+
+Treat C<\ce> as a safe command, i.e. it will be highlighted (note that C<\cee> will not be highlighted in equations as this leads to processing errors)
+
+=item C<chemformula> or C<chemmacros>
+
+Treat C<\ch> as a safe command outside equations, i.e. it will be highlighted (note that C<\ch> will not be highlighted in equations as this leads to processing 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. C<\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.
+
+context2 commands are also the only commands in the preamble, whose argument will be processed in
+word-by-word mode (which only works, if they occur no more than once in the preamble). The algorithm currently cannot cope with repeated context2 commands in the preamble, as they occur e.g. for the C<\author> argument in some journal styles (not in the standard styles, though
+If such a repetition is detected, the whole preamble will be processed in line-by-line mode. In such a case, use C<--replace-context2cmd> option to just select the commands, which should be processed and are not used repeatedly in the preamble.
+
+
+
+=item B<--exclude-mboxsafecmd=exclude-file> or B<--exclude-mboxsafecmd="cmd1,cmd2,...">
+
+=item B<--append-mboxsafecmd=append-file> or B<--append-mboxsafecmd="cmd1,cmd2,...">
+
+Define safe commands, which additionally need to be protected by encapsulating
+in an C<\mbox{..}>. This is sometimes needed to get around incompatibilities
+between external packages and the ulem package, which is used for highlighting
+in the default style UNDERLINE as well as CULINECHBAR CFONTSTRIKE
+
+
+
+
+
+=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<ARRENV> (RegEx)
+
+C<COUNTERCMD> (RegEx)
+
+C<CUSTODIFCMD> (RegEx)
+
+C<FLOATENV> (RegEx)
+
+C<ITEMCMD> (RegEx)
+
+C<LISTENV> (RegEx)
+
+C<MATHARRENV> (RegEx)
+
+C<MATHARRREPL> (String)
+
+C<MATHENV> (RegEx)
+
+C<MATHREPL> (String)
+
+C<MINWORDSBLOCK> (Integer)
+
+C<PICTUREENV> (RegEx)
+
+C<SCALEDELGRAPHICS> (Float)
+
+
+=item B<--add-to-config varenv1=pattern1,varenv2=pattern2,...>
+
+For configuration variables, which are a regular expression (essentially those ending
+in ENV, COUNTERCMD and CUSTOMDIFCMD, see list above) this option provides an alternative way to modify the configuration
+variables. Instead of setting the complete pattern, with this option it is possible to add an
+alternative pattern. C<varenv> must be one of the variables listed above that take a regular
+expression as argument, and pattern is any regular expression (which might need to be
+protected from the shell by quotation). Several patterns can be added at once by using semi-colons
+to separate them, e.g. C<--add-to-config "LISTENV=myitemize;myenumerate,COUNTERCMD=endnote">
+
+=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<old.tex> or C<new.tex> 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<off> 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<whole> 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<coarse> 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<fine> 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<--graphics-markup=level>
+
+ Change highlight style for graphics embedded with C<\includegraphics> commands.
+
+Possible values for level:
+
+C<none>, C<off> or C<0>: no highlighting for figures
+
+C<new-only> or C<1>: surround newly added or changed figures with a blue frame [Default if graphicx package loaded]
+
+C<both> or C<2>: highlight new figures with a blue frame and show deleted figures at reduced
+scale, and crossed out with a red diagonal cross. Use configuration
+variable SCALEDELGRAPHICS to set size of deleted figures.
+
+Note that changes to the optional parameters will make the figure appear as changed
+to latexdiff, and this figure will thus be highlighted
+
+=item B<--disable-citation-markup> or B<--disable-auto-mbox>
+
+Suppress citation markup and markup of other vulnerable commands in styles
+using ulem (UNDERLINE,FONTSTRIKE, CULINECHBAR)
+(the two options are identical and are simply aliases)
+
+=item B<--enable-citation-markup> or B<--enforce-auto-mbox>
+
+Protect citation commands and other vulnerable commands in changed sections
+with C<\mbox> command, i.e. use default behaviour for ulem package for other packages
+(the two options are identical and are simply aliases)
+
+=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<latexdiff> 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<--visible-label>
+
+Include old and new filenames (or labels set with C<--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 Internal options
+
+These options are mostly for automated use by latexdiff-vc. They can be used directly, but the API should be considered less stable than for the other options.
+
+=over 4
+
+=item B<--no-links>
+
+Suppress generation of hyperreferences, used for minimal diffs (option --only-changes of latexdiff-vc)
+
+=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<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).
+
+=item C<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)
+
+=item C<TRADITIONAL>
+
+Like C<CTRADITIONAL> but without the use of color.
+
+=item C<CFONT>
+
+Added text is blue and set in sans-serif, and discarded text is red and very small size.
+
+=item C<FONTSTRIKE>
+
+Added tex is set in sans-serif, discarded text small and struck out
+
+=item C<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).
+
+=item C<CFONTCHBAR>
+
+Like C<CFONT> but with additional changebars (Requires color and changebar packages).
+
+=item C<CULINECHBAR>
+
+Like C<UNDERLINE> but with additional changebars (Requires color, ulem and changebar packages).
+
+=item C<CHANGEBAR>
+
+No mark up of text, but mark margins with changebars (Requires changebar package).
+
+=item C<INVISIBLE>
+
+No visible markup (but generic markup commands will still be inserted.
+
+=item C<BOLD>
+
+Added text is set in bold face, discarded is not shown.
+
+=item C<PDFCOMMENT>
+
+The pdfcomment package is used to underline new text, and mark deletions with a PDF comment. Note that this markup might appear differently or not at all based on the pdf viewer used. The viewer with best support for pdf markup is probably acroread. This style is only recommended if the number of differences is small.
+
+=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<SAFE>
+
+No additional markup (Recommended choice)
+
+=item C<MARGIN>
+
+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<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).
+
+=item C<DVIPSCOL>
+
+An alternative way of marking added passages in blue, and deleted ones in red. Note
+that C<DVIPSCOL> 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).
+
+
+=item C<ZLABEL>
+
+can be used to highlight only changed pages, but requires post-processing. It is recommend to not call this option manually but use C<latexdiff-vc> with C<--only-changes> option. Alternatively, use the script given within preamble of diff files made using this style.
+
+=item C<ONLYCHANGEDPAGE>
+
+also highlights changed pages, without the need for post-processing, but might not work reliably if
+there is floating material (figures, tables).
+
+=item C<LABEL>
+
+is similar to C<ZLABEL>, but does not need the zref package and works less reliably (deprecated).
+
+=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<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 C<MARGIN> as C<\marginpar> does not work properly within floats.
+
+=item C<TRADITIONALSAFE>
+
+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<TRADITIONAL> and C<CTRADITIONAL> markup types as the \footnote command does not work properly in floating environments.
+
+=item C<IDENTICAL>
+
+Make no difference between the main text and floats.
+
+=back
+
+
+=head2 Configuration Variables
+
+=over 10
+
+=item C<ARRENV>
+
+If a match to C<ARRENV> is found within an inline math environment within a deleted or added block, then the inlined math
+is surrounded by C<\mbox{>...C<}>. This is necessary as underlining does not work within inlined array environments.
+
+[ Default: C<ARRENV>=S<C<(?:array|[pbvBV]matrix)> >
+
+=item C<COUNTERCMD>
+
+If a command in a deleted block which is also in the textcmd list matches C<COUNTERCMD> then an
+additional command C<\addtocounter{>F<cntcmd>C<}{-1}>, where F<cntcmd> is the matching command, is appended in the diff file such that the numbering in the diff file remains synchronized with the
+numbering in the new file.
+
+[ Default: C<COUNTERCMD>=C<(?:footnote|part|section|subsection> ...
+
+C<|subsubsection|paragraph|subparagraph)> ]
+
+=item C<CUSTOMDIFCMD>
+
+This option is for advanced users and allows definition of special versions of commands, which do not work as safe commands.
+
+Commands in C<CUSTOMDIFCMD> that occur in added or deleted blocks will be given an ADD or DEL prefix.
+The prefixed versions of the command must be defined in the preamble, either by putting them
+in the preamble of at least the new file, or by creating a custom preamble file (Option --preamble).
+For example the command C<\blindtext> (from package blindtext) does not interact well with underlining, so that
+for the standard markup type, it is not satisfactory to define it as a safe command. Instead, a customised versions
+without underlining can be defined in the preamble:
+
+C<\newcommand{\DELblindtext}{{\color{red}\blindtext}}>
+
+C<\newcommand{\ADDblindtext}{{\color{blue}\blindtext}}>
+
+and then latexdiff should be invoked with the option C<-c CUSTOMDIFCMD=blindtext>.
+
+[ Default: none ]
+
+=item C<FLOATENV>
+
+Environments whose name matches the regular expression in C<FLOATENV> are
+considered floats. Within these environments, the I<latexdiff> markup commands
+are replaced by their FL variaties.
+
+[ Default: S<C<(?:figure|table|plate)[\w\d*@]*> >]
+
+=item C<ITEMCMD>
+
+Commands representing new item line with list environments.
+
+[ Default: \C<item> ]
+
+=item C<LISTENV>
+
+Environments whose name matches the regular expression in C<LISTENV> are list environments.
+
+[ Default: S<C<(?:itemize|enumerate|description)> >]
+
+=item C<MATHENV>,C<MATHREPL>
+
+If both \begin and \end for a math environment (environment name matching C<MATHENV> or \[ and \])
+are within the same deleted block, they are replaced by a \begin and \end commands for C<MATHREPL>
+rather than being commented out.
+
+[ Default: C<MATHENV>=S<C<(?:displaymath|equation)> >, C<MATHREPL>=S<C<displaymath> >]
+
+=item C<MATHARRENV>,C<MATHARRREPL>
+
+as C<MATHENV>,C<MATHREPL> but for equation arrays
+
+[ Default: C<MATHARRENV>=S<C<eqnarray\*?> >, C<MATHREPL>=S<C<eqnarray> >]
+
+=item C<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 C<MINWORDSBLOCK> to the preceding added and discarded parts.
+
+[ Default: 3 ]
+
+=item C<PICTUREENV>
+
+Within environments whose name matches the regular expression in C<PICTUREENV>
+all latexdiff markup is removed (in pathologic cases this might lead to
+inconsistent markup but this situation should be rare).
+
+[ Default: S<C<(?:picture|DIFnomarkup)[\w\d*@]*> >]
+
+=item C<SCALEDELGRAPHICS>
+
+If C<--graphics-markup=both> is chosen, C<SCALEDELGRAPHICS> is the factor, by which deleted figures will be scaled (i.e. 0.5 implies they are shown at half linear size).
+
+[ Default: 0.5 ]
+
+=item C<VERBATIMENV>
+
+RegEx describing environments like verbatim, whose contents should be taken verbatim. The content of these environments will not be processed in any way:
+deleted content is commented out, new content is not marked up
+
+[ Default: S<C<comment> > ]
+
+=item C<VERBATIMLINEENV>
+
+RegEx describing environments like verbatim, whose contents should be taken verbatim. The content of environments described by VERBATIMLINEENV are compared in
+line mode, and changes are marked up using the listings package. The markup style is set based on the chosen mains markup type (Option -t), or on an analysis
+of the preamble.
+Note that "listings.sty" must be installed. If this file is not found the fallback solution is to
+treat VERBATIMLINEENV environments treated exactly the same way as VERBATIMENV environments.
+
+[ Default: S<C<(?:verbatim[*]?|lstlisting> > ]
+
+=back
+
+=head1 COMMON PROBLEMS AND FAQ
+
+=over 10
+
+=item Citations result in overfull boxes
+
+There is an incompatibility between the C<ulem> package, which C<latexdiff> uses for underlining and striking out in the UNDERLINE style,
+the default style, and the way citations are generated. In order to be able to mark up citations properly, they are enclosed with an C<\mbox>
+command. 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. The same occurs for some other packages (e.g., siunitx). If this is a problem, you have two possibilities.
+
+1. Use C<CFONT> type markup (option C<-t CFONT>): 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, and deleted text is shown with a different font. Other styles not using the C<ulem> package will also work.
+
+2. Choose option C<--disable-citation-markup> which turns off the marking up of citations: deleted citations are no longer shown, and
+added citations are shown without markup. (This was the default behaviour of latexdiff at versions 0.6 and older)
+
+For custom packages you can define the commands which need to be protected by C<\mbox> with C<--append-mboxsafecmd> and C<--excludemboxsafecmd> options
+(submit your lists of command as feature request at github page to set the default behaviour of future versions, see section 6)
+
+=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>.
+
+=item How can I just show the pages where changes had been made
+
+Use options -C<-s ZLABEL> (some postprocessing required) or C<-s ONLYCHANGEDPAGE>. C<latexdiff-vc --ps|--pdf> with C<--only-changes> option takes care of
+the post-processing for you (requires zref package to be installed).
+
+=back
+
+=head1 BUGS
+
+=over 10
+
+=item 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.
+
+=back
+
+Please submit bug reports using the issue tracker of the github repository page I<https://github.com/ftilmann/latexdiff.git>,
+or send them to I<tilmann -- AT -- gfz-potsdam.de>. Include the version number of I<latexdiff>
+(from comments at the top of the source or use B<--version>). If you come across latex
+files that are error-free and conform to the specifications set out
+above, and whose differencing still does not result in error-free
+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<latexrevise>, L<latexdiff-vc>
+
+=head1 PORTABILITY
+
+I<latexdiff> 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<latexdiff> requires installation of the Perl package
+C<Algorithm::Diff> (available from I<www.cpan.org> -
+I<http://search.cpan.org/~nedkonz/Algorithm-Diff-1.15>) but a stand-alone
+version, I<latexdiff-so>, which has this package inlined, is available, too.
+I<latexdiff-fast> requires the I<diff> command to be present.
+
+=head1 AUTHOR
+
+Version 1.3.0
+Copyright (C) 2004-2018 Frederik Tilmann
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License Version 3
+
+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 sent 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
+[Hclbkdruvt]
+[`'^"~=.]
+_
+AMPERSAND
+(SUPER|SUB)SCRIPTNB
+(SUPER|SUB)SCRIPT
+SQRT
+SQRTNB
+PERCENTAGE
+DOLLAR
+%%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
+intertext
+part
+(sub){0,2}section\*?
+(sub)?paragraph\*?
+makebox
+mbox
+opening
+parbox
+raisebox
+savebox
+sbox
+shortintertext
+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. These commands behave like text commands, except when they occur in a deleted section, where they are disabled, but their argument is shown as deleted text.
+caption
+subcaption
+%%END CONTEXT1 COMMANDS
+
+%%BEGIN CONTEXT2 COMMANDS
+% Regex matching commands with a text argument (leave out the \), which will fail out of context. As corresponding commands for context1. The only difference is that context2 commands are completely disabled in deleted sections, including their arguments.
+title
+author
+date
+institute
+%%END CONTEXT2 COMMANDS
+
+%% CONFIGURATION variabe defaults
+%%BEGIN LISTENV CONFIG
+itemize
+description
+enumerate
+%%END LISTENV CONFIG
+
+%%BEGIN FLOATENV CONFIG
+figure[\w\d*@]*
+table[\w\d*@]*
+plate[\w\d*@]*
+%%END FLOATENV CONFIG
+
+%%BEGIN PICTUREENV CONFIG
+picture[\w\d*@]*
+tikzpicture[\w\d*@]*
+DIFnomarkup
+%%END PICTUREENV CONFIG
+
+%%BEGIN MATHENV CONFIG
+equation[*]?
+displaymath
+DOLLARDOLLAR
+%%END MATHENV CONFIG
+
+%%BEGIN MATHARRENV CONFIG
+eqnarray[*]?
+align[*]?
+alignat[*]?
+gather[*]?
+multline[*]?
+flalign[*]?
+%%END MATHARRENV CONFIG
+
+%%BEGIN ARRENV CONFIG
+aligned
+gathered
+array
+[pbvBV]?matrix
+smallmatrix
+cases
+split
+%%END ARRENV CONFIG
+
+%%BEGIN COUNTERCMD CONFIG
+footnote
+part
+chapter
+section
+subsection
+subsubsection
+paragraph
+subparagraph
+%%END COUNTERCMD CONFIG
+
+%%BEGIN VERBATIMENV CONFIG
+comment
+%%END VERBATIMENV CONFIG
+
+%%BEGIN VERBATIMLINEENV CONFIG
+lstlisting
+verbatim[*]?
+%%END VERBATIMLINEENV CONFIG
+
+%%BEGIN CUSTOMDIFCMD CONFIG
+%%END CUSTOMDIFCMD CONFIG
+
+%%% 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}
+\DeclareOldFontCommand{\sf}{\normalfont\sffamily}{\mathsf}
+\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}
+\DeclareOldFontCommand{\sf}{\normalfont\sffamily}{\mathsf}
+\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}
+\DeclareOldFontCommand{\sf}{\normalfont\sffamily}{\mathsf}
+\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}
+\DeclareOldFontCommand{\sf}{\normalfont\sffamily}{\mathsf}
+\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
+
+%DIF BOLD PREAMBLE
+\DeclareOldFontCommand{\bf}{\normalfont\bfseries}{\mathbf}
+\providecommand{\DIFadd}[1]{{\bf #1}}
+\providecommand{\DIFdel}[1]{}
+%DIF END BOLD PREAMBLE
+
+%DIF PDFCOMMENT PREAMBLE
+\RequirePackage{pdfcomment} %DIF PREAMBLE
+\providecommand{\DIFadd}[1]{\pdfmarkupcomment[author=ADD:,markup=Underline]{#1}{}}
+\providecommand{\DIFdel}[1]{\pdfcomment[icon=Insert,author=DEL:,hspace=12pt]{#1}}
+%DIF END PDFCOMMENT PREAMBLE
+
+%% SUBTYPES (Markers for beginning and end of changed blocks)
+
+%DIF SAFE PREAMBLE
+\providecommand{\DIFaddbegin}{}
+\providecommand{\DIFaddend}{}
+\providecommand{\DIFdelbegin}{}
+\providecommand{\DIFdelend}{}
+\providecommand{\DIFmodbegin}{}
+\providecommand{\DIFmodend}{}
+%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{]}}
+\providecommand{\DIFmodbegin}{\protect\marginpar{m[}}
+\providecommand{\DIFmodend}{\protect\marginpar{]}}
+%DIF END MARGIN 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}}
+\providecommand{\DIFmodbegin}{}
+\providecommand{\DIFmodend}{}
+%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}}
+\providecommand{\DIFmodbegin}{}
+\providecommand{\DIFmodend}{}
+%DIF END COLOR PREAMBLE
+
+%DIF LABEL PREAMBLE
+% To show only pages with changes (pdf) (external program pdftk needs to be installed)
+% (only works for simple documents with non-repeated page numbers, otherwise use ZLABEL)
+% pdflatex diff.tex
+% pdflatex diff.tex
+%pdftk diff.pdf cat \
+%`perl -lne '\
+% if (m/\\newlabel{DIFchg[b](\d*)}{{.*}{(.*)}}/) { $start{$1}=$2; print $2}\
+% if (m/\\newlabel{DIFchg[e](\d*)}{{.*}{(.*)}}/) { \
+% if (defined($start{$1})) { \
+% for ($j=$start{$1}; $j<=$2; $j++) {print "$j";}\
+% } else { \
+% print "$2"\
+% }\
+% }' diff.aux \
+% | uniq \
+% | tr \\n ' '` \
+% output diff-changedpages.pdf
+% To show only pages with changes (dvips/dvipdf)
+% dvips -pp `\
+% [ put here the perl script from above]
+% | uniq | tr -s \\n ','`
+\typeout{Check comments in preamble of output for instructions how to show only pages where changes have been made}
+\newcount\DIFcounterb
+\global\DIFcounterb 0\relax
+\newcount\DIFcountere
+\global\DIFcountere 0\relax
+\providecommand{\DIFaddbegin}{\global\advance\DIFcounterb 1\relax\label{DIFchgb\the\DIFcounterb}}
+\providecommand{\DIFaddend}{\global\advance\DIFcountere 1\relax\label{DIFchge\the\DIFcountere}}
+\providecommand{\DIFdelbegin}{\global\advance\DIFcounterb 1\relax\label{DIFchgb\the\DIFcounterb}}
+\providecommand{\DIFdelend}{\global\advance\DIFcountere 1\relax\label{DIFchge\the\DIFcountere}}
+\providecommand{\DIFmodbegin}{\global\advance\DIFcounterb 1\relax\label{DIFchgb\the\DIFcounterb}}
+\providecommand{\DIFmodend}{\global\advance\DIFcountere 1\relax\label{DIFchge\the\DIFcountere}}
+%DIF END LABEL PREAMBLE
+
+%DIF ZLABEL PREAMBLE
+% To show only pages with changes (pdf) (external program pdftk needs to be installed)
+% (uses zref for reference to absolute page numbers)
+% pdflatex diff.tex
+% pdflatex diff.tex
+%pdftk diff.pdf cat \
+%`perl -lne 'if (m/\\zref\@newlabel{DIFchgb(\d*)}{.*\\abspage{(\d*)}}/ ) { $start{$1}=$2; print $2 } \
+% if (m/\\zref\@newlabel{DIFchge(\d*)}{.*\\abspage{(\d*)}}/) { \
+% if (defined($start{$1})) { \
+% for ($j=$start{$1}; $j<=$2; $j++) {print "$j";}\
+% } else { \
+% print "$2"\
+% }\
+% }' diff.aux \
+% | uniq \
+% | tr \\n ' '` \
+% output diff-changedpages.pdf
+% To show only pages with changes (dvips/dvipdf)
+% latex diff.tex
+% latex diff.tex
+% dvips -pp `perl -lne 'if (m/\\newlabel{DIFchg[be]\d*}{{.*}{(.*)}}/) { print $1 }' diff.aux | uniq | tr -s \\n ','` diff.dvi
+\typeout{Check comments in preamble of output for instructions how to show only pages where changes have been made}
+\usepackage[user,abspage]{zref}
+\newcount\DIFcounterb
+\global\DIFcounterb 0\relax
+\newcount\DIFcountere
+\global\DIFcountere 0\relax
+\providecommand{\DIFaddbegin}{\global\advance\DIFcounterb 1\relax\zlabel{DIFchgb\the\DIFcounterb}}
+\providecommand{\DIFaddend}{\global\advance\DIFcountere 1\relax\zlabel{DIFchge\the\DIFcountere}}
+\providecommand{\DIFdelbegin}{\global\advance\DIFcounterb 1\relax\zlabel{DIFchgb\the\DIFcounterb}}
+\providecommand{\DIFdelend}{\global\advance\DIFcountere 1\relax\zlabel{DIFchge\the\DIFcountere}}
+\providecommand{\DIFmodbegin}{\global\advance\DIFcounterb 1\relax\zlabel{DIFchgb\the\DIFcounterb}}
+\providecommand{\DIFmodend}{\global\advance\DIFcountere 1\relax\zlabel{DIFchge\the\DIFcountere}}
+%DIF END ZLABEL PREAMBLE
+
+%DIF ONLYCHANGEDPAGE PREAMBLE
+\RequirePackage{atbegshi}
+\RequirePackage{etoolbox}
+\RequirePackage{zref}
+% redefine label command to write immediately to aux file - page references will be lost
+\makeatletter \let\oldlabel\label% Store \label
+\renewcommand{\label}[1]{% Update \label to write to the .aux immediately
+\zref@wrapper@immediate{\oldlabel{#1}}}
+\makeatother
+\newbool{DIFkeeppage}
+\newbool{DIFchange}
+\boolfalse{DIFkeeppage}
+\boolfalse{DIFchange}
+\AtBeginShipout{%
+ \ifbool{DIFkeeppage}
+ {\global\boolfalse{DIFkeeppage}} % True DIFkeeppage
+ {\ifbool{DIFchange}{\global\boolfalse{DIFkeeppage}}{\global\boolfalse{DIFkeeppage}\AtBeginShipoutDiscard}} % False DIFkeeppage
+}
+\providecommand{\DIFaddbegin}{\global\booltrue{DIFkeeppage}\global\booltrue{DIFchange}}
+\providecommand{\DIFaddend}{\global\booltrue{DIFkeeppage}\global\boolfalse{DIFchange}}
+\providecommand{\DIFdelbegin}{\global\booltrue{DIFkeeppage}\global\booltrue{DIFchange}}
+\providecommand{\DIFdelend}{\global\booltrue{DIFkeeppage}\global\boolfalse{DIFchange}}
+\providecommand{\DIFmodbegin}{\global\booltrue{DIFkeeppage}\global\booltrue{DIFchange}}
+\providecommand{\DIFmodend}{\global\booltrue{DIFkeeppage}\global\boolfalse{DIFchange}}
+%DIF END ONLYCHANGEDPAGE 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 TRADITIONALSAFE PREAMBLE
+
+% see:
+% http://tex.stackexchange.com/questions/47351/can-i-redefine-a-command-to-contain-itself
+
+%DIF HIGHLIGHTGRAPHICS PREAMBLE
+\RequirePackage{settobox}
+\RequirePackage{letltxmacro}
+\newsavebox{\DIFdelgraphicsbox}
+\newlength{\DIFdelgraphicswidth}
+\newlength{\DIFdelgraphicsheight}
+% store original definition of \includegraphics
+\LetLtxMacro{\DIFOincludegraphics}{\includegraphics}
+\newcommand{\DIFaddincludegraphics}[2][]{{\color{blue}\fbox{\DIFOincludegraphics[#1]{#2}}}}
+\newcommand{\DIFdelincludegraphics}[2][]{%
+\sbox{\DIFdelgraphicsbox}{\DIFOincludegraphics[#1]{#2}}%
+\settoboxwidth{\DIFdelgraphicswidth}{\DIFdelgraphicsbox}
+\settoboxtotalheight{\DIFdelgraphicsheight}{\DIFdelgraphicsbox}
+\scalebox{\DIFscaledelfig}{%
+\parbox[b]{\DIFdelgraphicswidth}{\usebox{\DIFdelgraphicsbox}\\[-\baselineskip] \rule{\DIFdelgraphicswidth}{0em}}\llap{\resizebox{\DIFdelgraphicswidth}{\DIFdelgraphicsheight}{%
+\setlength{\unitlength}{\DIFdelgraphicswidth}%
+\begin{picture}(1,1)%
+\thicklines\linethickness{2pt}
+{\color[rgb]{1,0,0}\put(0,0){\framebox(1,1){}}}%
+{\color[rgb]{1,0,0}\put(0,0){\line( 1,1){1}}}%
+{\color[rgb]{1,0,0}\put(0,1){\line(1,-1){1}}}%
+\end{picture}%
+}\hspace*{3pt}}}
+}
+\LetLtxMacro{\DIFOaddbegin}{\DIFaddbegin}
+\LetLtxMacro{\DIFOaddend}{\DIFaddend}
+\LetLtxMacro{\DIFOdelbegin}{\DIFdelbegin}
+\LetLtxMacro{\DIFOdelend}{\DIFdelend}
+\DeclareRobustCommand{\DIFaddbegin}{\DIFOaddbegin \let\includegraphics\DIFaddincludegraphics}
+\DeclareRobustCommand{\DIFaddend}{\DIFOaddend \let\includegraphics\DIFOincludegraphics}
+\DeclareRobustCommand{\DIFdelbegin}{\DIFOdelbegin \let\includegraphics\DIFdelincludegraphics}
+\DeclareRobustCommand{\DIFdelend}{\DIFOaddend \let\includegraphics\DIFOincludegraphics}
+\LetLtxMacro{\DIFOaddbeginFL}{\DIFaddbeginFL}
+\LetLtxMacro{\DIFOaddendFL}{\DIFaddendFL}
+\LetLtxMacro{\DIFOdelbeginFL}{\DIFdelbeginFL}
+\LetLtxMacro{\DIFOdelendFL}{\DIFdelendFL}
+\DeclareRobustCommand{\DIFaddbeginFL}{\DIFOaddbeginFL \let\includegraphics\DIFaddincludegraphics}
+\DeclareRobustCommand{\DIFaddendFL}{\DIFOaddendFL \let\includegraphics\DIFOincludegraphics}
+\DeclareRobustCommand{\DIFdelbeginFL}{\DIFOdelbeginFL \let\includegraphics\DIFdelincludegraphics}
+\DeclareRobustCommand{\DIFdelendFL}{\DIFOaddendFL \let\includegraphics\DIFOincludegraphics}
+%DIF END HIGHLIGHTGRAPHICS 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 PREAMBLE
+
+%DIF LISTINGS PREAMBLE
+\RequirePackage{listings}
+\RequirePackage{color}
+\lstdefinelanguage{DIFcode}{
+ % note that the definitions in the following two lines are overwritten dependent on the markup type selected %DIFCODE TEMPLATE
+ morecomment=[il]{\%DIF\ <\ }, %DIFCODE TEMPLATE
+ moredelim=[il][\bfseries]{\%DIF\ >\ } %DIFCODE TEMPLATE
+}
+\lstdefinestyle{DIFverbatimstyle}{
+ language=DIFcode,
+ basicstyle=\ttfamily,
+ columns=fullflexible,
+ keepspaces=true
+}
+\lstnewenvironment{DIFverbatim}{\lstset{style=DIFverbatimstyle}}{}
+\lstnewenvironment{DIFverbatim*}{\lstset{style=DIFverbatimstyle,showspaces=true}}{}
+%DIF END LISTINGS PREAMBLE
+
+%DIF DIFCODE_UNDERLINE
+ moredelim=[il][\color{red}\sout]{\%DIF\ <\ },
+ moredelim=[il][\color{blue}\uwave]{\%DIF\ >\ }
+%DIF END DIFCODE_UNDERLINE
+
+%DIF DIFCODE_CTRADITIONAL
+ moredelim=[il][\color{red}\scriptsize]{\%DIF\ <\ },
+ moredelim=[il][\color{blue}\sffamily]{\%DIF\ >\ }
+%DIF END DIFCODE_CTRADITIONAL
+
+%DIF DIFCODE_TRADITIONAL
+ moredelim=[il][\color{white}\tiny]{\%DIF\ <\ },
+ moredelim=[il][\sffamily]{\%DIF\ >\ }
+%DIF END DIFCODE_TRADITIONAL
+
+%DIF DIFCODE_CFONT
+ moredelim=[il][\color{red}\scriptsize]{\%DIF\ <\ },
+ moredelim=[il][\color{blue}\sffamily]{\%DIF\ >\ }
+%DIF END DIFCODE_CFONT
+
+%DIF DIFCODE_FONTSTRIKE
+ moredelim=[il][\scriptsize \sout]{\%DIF\ <\ },
+ moredelim=[il][\sffamily]{\%DIF\ >\ }
+%DIF END DIFCODE_FONTSTRIKE
+
+%DIF DIFCODE_INVISIBLE
+ moredelim=[il][\color{white}\tiny]{\%DIF\ <\ },
+ moredelim=[il]{\%DIF\ >\ }
+%DIF END DIFCODE_INVISIBLE
+
+%DIF DIFCODE_CHANGEBAR
+ moredelim=[il][\color{white}\tiny]{\%DIF\ <\ },
+ moredelim=[il]{\%DIF\ >\ }
+%DIF END DIFCODE_CHANGEBAR
+
+%DIF DIFCODE_CCHANGEBAR
+ moredelim=[il][\color{red}]{\%DIF\ <\ },
+ moredelim=[il][\color{blue}]{\%DIF\ >\ }
+%DIF END DIFCODE_CCHANGEBAR
+
+%DIF DIFCODE_CULINECHBAR
+ moredelim=[il][\color{red}\sout]{\%DIF\ <\ },
+ moredelim=[il][\color{blue}\uwave]{\%DIF\ >\ }
+%DIF END DIFCODE_CULINECHBAR
+
+%DIF DIFCODE_CFONTCHBAR
+ moredelim=[il][\color{red}\scriptsize]{\%DIF\ <\ },
+ moredelim=[il][\color{blue}\sffamily]{\%DIF\ >\ }
+%DIF END DIFCODE_CFONTCHBAR
+
+%DIF DIFCODE_BOLD
+ % unfortunately \bfseries cannot be combined with ttfamily without extra packages
+ % also morecomment=[il] is broken as of v1.5b of listings at least
+ % workaround: plot in white with tiny font
+ % morecomment=[il]{\%DIF\ <\ },
+ moredelim=[il][\color{white}\tiny]{\%DIF\ <\ },
+ moredelim=[il][\sffamily\bfseries]{\%DIF\ >\ }
+%DIF END DIFCODE_BOLD
+
+%DIF DIFCODE_PDFCOMMENT
+
+ moredelim=[il][\color{white}\tiny]{\%DIF\ <\ },
+ moredelim=[il][\sffamily\bfseries]{\%DIF\ >\ }
+%DIF END DIFCODE_PDFCOMMENT
+
diff --git a/support/latexdiff/latexdiff-fast b/support/latexdiff/latexdiff-fast
new file mode 100755
index 0000000000..80ae57c743
--- /dev/null
+++ b/support/latexdiff/latexdiff-fast
@@ -0,0 +1,5591 @@
+#!/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-16 F J Tilmann (tilmann@gfz-potsdam.de)
+#
+# Repository/issue tracker: https://github.com/ftilmann/latexdiff
+# CTAN page: http://www.ctan.org/pkg/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 <http://www.gnu.org/licenses/>.
+#
+# Detailed usage information at the end of the file
+#
+
+# Version 1.3.0 (7 October 2018):
+# - treat options to \documentclass as potential package names (some packages allow implicit loading of or imply selected packages
+# - improved pattern matching: now allows nested angular brackets, and is no longer confused by escaped curly braces
+# - improved pattern matching in COARSE mode: occasionally, the closing bracket or some other elements would be matched in an 'unnatural' way due to another sequence being more minimal in the computational sense, sometimes even causing errors due to tokens moving in or out of the scope of math environments. This is now discouraged by adding internal \DIFANCHOR commands (which are removed again in post-processing) (fixes issues reported via email by li_ruomeng .
+# - verbatim and lstlisting environments are marked-up with line-by-line in a similar style to non-verbatim text (requires the listing package to be installed)
+# (see new configuration variable VERBATIMLINEENV) (several issues and pull requests by jprotze)
+# - --flatten: now supports \verbatiminput and \lstlistinput
+# - --flatten: if file is not found, do not fail, simply warn and leave command unexpanded (inspired by issue #112). Don't warn if file name contains #[0-9] as it is then most likely an argument within a command definition rather than an actual file (applies to \input, \subfile, \include commands)
+# - added to textcmds: \intertext
+# - new config variable CUSTOMDIFCMD to allow defining special versions of commands in added or deleted blocks (Pull request by github user jprotze)
+# - added option -no-links (mostly for use by latexdiff-vc in only-changes modes) (Pull request by github user jprotze)
+# Bug fixes:
+# - pattern matching of \verb and \lstinline commands had an error which meant they would trigger on commands beginning with \verb.
+# - In description environments, mark up item descriptions by effectively reating the insides of item commannds as text commands (fixes #161)
+#
+#
+# Version 1.2.1 (22 June 2017)
+# - add "DeclareOldFontCommand" to styles using \bf or \sf old style font commands (fixies issue #92 )
+# - improved markup: process lstinline commands in listings package correctly
+# for styles using colour, \verb and \lstinline arguments are marked up with colour (blue for added, red for deleted)
+# - bug fix: protecting inline math expressions for mbox did not work as intended (see stack exchange question: http://tex.stackexchange.com/questions/359412/compiling-the-latexdiff-when-adding-a-subscript-before-a-pmatrix-environment-cau)
+# - bug fix: when deleted \item commands are followed immediately by unsafe commands, they were not restored properly
+# (thanks to J. Protze for pull request) (pull request #89)
+# - treat lstlisting and comment as equivalent to verbatim environment
+# make environments that are treated like verbatim environments configurable (config variable VERBATIMENV)
+# treat lstinlne as equivalent to verb command
+# partially addresses issue #38
+# - refactoring: set default configuration variables in a hash, and those that correspond to lists
+# - feature: option --add-to-config used to amend configuration variables, which are regex pattern lists
+# - bug fix: deleted figures when endfloat package is activated
+# - bug fix: alignat environment now always processed correctly (fix issues #65)
+# - bug fix: avoid processing of commands as potential files in routine init_regex_arr (fix issue #70 )
+# - minimal feature enhancement: treat '@' as allowed character in commands (strictly speaking requires prior \makeatletter statement, but always assuming it to be
+# @ a letter if it is part of a command name will usually lead to the correct behaviour (see http://tex.stackexchange.com/questions/346651/latexdiff-and-let)
+# - new feature/bug fix: --flatten option \endinput in included files now respected but only if \endinput stands right at the beginning of the line (issue #77)
+# - bug fix: flatten would incorrectly attempt to process commented out \include commands (from discussion in issue #77 )
+# - introduce an invisible space (\hspace{0pt} after \mbox{..} auxiliary commands (not in math mode), to allow line breaks between added and deleted citations (change should not cause adverse behaviour otherwise)
+#
+# Version 1.2.0:
+# - highlight new and deleted figures
+# - bug fix in title mark-up. Previously deleted commands in title (such as \title, \author or \date) were marked up erroneously
+# - (minor) bug fixes in new 1.1.1 features: disabled label was commented out twice, additional spaces were introduced before list environment begin and end commands
+# - depracation fix: left brace in RegEx now needs to be escaped
+# - add type PDFCOMMENT based on issue #49 submitted by github user peci1 (Martin Pecka)
+# - make utf8 the default encoding
+#
+# Version 1.1.1
+# - patch mhchem: allow ce in equations
+# - flatten now also expands \input etc. in the preamble (but not \usepackage!)
+# - Better support for Japanese ( contributed by github user kshramt )
+# - prevent duplicated verbatim hashes (patch contributed by github user therussianjig, issue #36)
+# - disable deleted label commands (fixes issue #31)
+# - introduce post-processing to reinstate most deleted environments and all needed item commands (fixes issue #1)
+#
+# Version 1.1.0
+# - treat diacritics (\",\', etc) as safe commands
+# - treat \_ and \& correctly as safe commands, even if used without spacing to the next word
+# - Add a BOLD markup type that sets added text in bold face (Contribution by Victor Zabalza via pull request )
+# - add append-mboxsafecmd list option to be able to specify special safe commands which need to be surrounded by mbox to avoid breaking (mostly this is needed with ulem package)
+# - support for siunitx and cleveref packages: protect \SI command in siunitx package and \cref,\Cref{range}{*} in cleveref packages (thanks to Stefan Pinnow for testing)
+# - experimental support for chemformula, mhchem packages: define \ch and \ce in packages as safe (but not \ch,\cee in equation array environments) - these unfortunately will not be marked up (thanks to Stefan Pinnow for testing)
+# - bug fix: packages identified correctly even if \usepackage command options extend over several lines (previously \usepackage command needed to be fully contained in one line)
+# - new subtype ONLYCHANGEDPAGE outputs only changed pages (might not work well for floating material)
+# - new subtype ZLABEL operates similarly to LABEL but uses absolute page numbers (needs zref package)
+# - undocumented option --debug/--nodebug to override default setting for debug mode (Default: 0 for release version, 1: for development version
+#
+# Version 1.0.4
+# - introduce list UNSAFEMATHCMD, which holds list of commands which cannot be marked up with \DIFadd or \DIFdel commands (only relevant for WHOLE and COARSE math markup modes)
+# - new subtype LABEL which gives each change a label. This can later be used to only display pages where changes
+# have been made (instructions for that are put as comments into the diff'ed file) inspired by answer on http://tex.stackexchange.com/questions/166049/invisible-markers-in-pdfs-using-pdflatex
+# - Configuration variables take into accout some commands from additional packages:
+# tikzpicture environment now treated as PICTUREENV, and \smallmatrix in ARRENV (amsmath)
+# - --flatten: support for \subfile command (subfiles package) (in response to http://tex.stackexchange.com/questions/167620/latexdiff-with-subfiles )
+# - --flatten: \bibliography commands expand if corresponding bbl file present
+# - angled bracket optional commands now parsed correctly (patch #3570) submitted by Dave Kleinschmidt (thanks)
+# - \RequirePackage now treated as synonym of \usepackage with respect to setting packages
+# - special rules for apacite package (redefine citation commands)
+# - recognise /dev/null as 'file-like' arguments for --preamble and --config options
+# - fix units package incompatibility with ulem for text maths statements $ ..$ (thanks to Stuart Prescott for reporting this)
+# - amsmath environment cases treated correctly (Bug fix #19029) (thanks to Jalar)
+# - {,} in comments no longer confuse latexdiff (Bug fix #19146)
+# - \% in one-letter sub/Superscripts was not converted correctly
+#
+# Version 1.0.3
+# - fix bug in add_safe_commands that made latexdiff hang on DeclareMathOperator
+# command in preamble
+# - \(..\) inline math expressions were not parsed correctly, if they contained a linebreak
+# - applied patch contributed by tomflannaghan via Berlios: [ Patch #3431 ] Adds correct handling of \left< and \right>
+# - \$ is treated correctly as a literal dollar sign (thanks to Reed Cartwright and Joshua Miller for reporting this bug
+# and sketching out the solution)
+# - \^ and \_ are correctly interpreted as accent and underlined space, respectively, not as superscript of subscript
+# (thanks to Wail Yahyaoui for pointing out this bug)
+#
+# 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
+# \<nl> (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, <mario@wolczko.com>
+# 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( <DIFFPIPE> ) {
+ 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)=<<EOF ;
+This is LATEXDIFF 1.3.0 (Algorithm::Diff $Algorithm::Diff::VERSION, Perl $^V)
+ (c) 2004-2018 F J Tilmann
+EOF
+
+# Hash with defaults for configuration variables. These marked undef have default values constructed from list defined in the DATA block
+# (under tag CONFIG)
+my %CONFIG=(
+ MINWORDSBLOCK => 3, # minimum number of tokens to form an independent block
+ # shorter identical blocks will be merged to the previous word
+ SCALEDELGRAPHICS => 0.5, # factor with which deleted figures will be scaled down (i.e. 0.5 implies they are shown at half linear size)
+ # this is only used for --graphics-markup=BOTH option
+ FLOATENV => undef , # Environments in which FL variants of defined commands are used
+ PICTUREENV => undef , # Environments in which all change markup is removed
+ MATHENV => undef , # Environments turning on display math mode (code also knows about \[ and \])
+ MATHREPL => 'displaymath', # Environment introducing deleted maths blocks
+ MATHARRENV => undef , # Environments turning on eqnarray math mode
+ MATHARRREPL => 'eqnarray*', # Environment introducing deleted maths blocks
+ ARRENV => undef , # Environments making arrays in math mode. The underlining style does not cope well with those - as a result in-text math environments are surrounded by \mbox{ } if any of these commands is used in an inline math block
+ COUNTERCMD => undef,
+ # COUNTERCMD textcmds which are associated with a counter
+ # If any of these commands occur in a deleted block
+ # they will be succeeded by an \addtocounter{...}{-1}
+ # for the associated counter such that the overall numbers
+ # should be the same as in the new file
+ LISTENV => undef , # list making environments - they will generally be kept
+ VERBATIMENV => undef, # Environments whose content should be treated as verbatim text and not be touched
+ VERBATIMLINEENV => undef, # Environments whose content should be treated as verbatim text and processed in line diff mode
+ CUSTOMDIFCMD => undef,# Custom dif command. Is defined in the document as a \DELcommand and \ADDcommand version to be replaced by the diff
+ ITEMCMD => 'item' # command marking item in a list environment
+);
+# Configuration variables: these have to be visible from the subroutines
+my ($ARRENV,
+ $COUNTERCMD,
+ $FLOATENV,
+ $ITEMCMD,
+ $LISTENV,
+ $MATHARRENV,
+ $MATHARRREPL,
+ $MATHENV,
+ $MATHREPL,
+ $MINWORDSBLOCK,
+ $PICTUREENV,
+ $SCALEDELGRAPHICS,
+ $VERBATIMENV,
+ $VERBATIMLINEENV,
+ $CUSTOMDIFCMD
+ );
+
+# my $MINWORDSBLOCK=3; # minimum number of tokens to form an independent block
+# # shorter identical blocks will be merged to the previous word
+# my $SCALEDELGRAPHICS=0.5; # factor with which deleted figures will be scaled down (i.e. 0.5 implies they are shown at half linear size)
+# # this is only used for --graphics-markup=BOTH option
+# my $FLOATENV='(?:figure|table|plate)[\w\d*@]*' ; # Environments in which FL variants of defined commands are used
+# my $PICTUREENV='(?:picture|tikzpicture|DIFnomarkup)[\w\d*@]*' ; # Environments in which all change markup is removed
+# my $MATHENV='(?:equation[*]?|displaymath|DOLLARDOLLAR)[*]?' ; # Environments turning on display math mode (code also knows about \[ and \])
+# my $MATHREPL='displaymath'; # Environment introducing deleted maths blocks
+# my $MATHARRENV='(?:eqnarray|align|alignat|gather|multline|flalign)[*]?' ; # Environments turning on eqnarray math mode
+# my $MATHARRREPL='eqnarray*'; # Environment introducing deleted maths blocks
+# my $ARRENV='(?:aligned|gathered|array|[pbvBV]?matrix|smallmatrix|cases|split)'; # Environments making arrays in math mode. The underlining style does not cope well with those - as a result in-text math environments are surrounded by \mbox{ } if any of these commands is used in an inline math block
+# my $COUNTERCMD='(?:footnote|part|chapter|section|subsection|subsubsection|paragraph|subparagraph)'; # textcmds which are associated with a counter
+# # If any of these commands occur in a deleted block
+# # they will be succeeded by an \addtocounter{...}{-1}
+# # for the associated counter such that the overall numbers
+# # should be the same as in the new file
+# my $LISTENV='(?:itemize|description|enumerate)'; # list making environments - they will generally be kept
+# my $ITEMCMD='item'; # command marking item in a list environment
+
+
+
+my $LABELCMD='(?:label)'; # matching commands are disabled within deleted blocks - mostly useful for maths mode, as otherwise it would be fine to just not add those to SAFECMDLIST
+my @UNSAFEMATHCMD=('qedhere'); # Commands which are definitely unsafe for marking up in math mode (amsmath qedhere only tested to not work with UNDERLINE markup) (only affects WHOLE and COARSE math markup modes). Note that unlike text mode (or FINE math mode0 deleted unsafe commands are not deleted but simply taken outside \DIFdel
+my $MBOXINLINEMATH=0; # if set to 1 then surround marked-up inline maths expression with \mbox ( to get around compatibility
+ # problems between some maths packages and ulem package
+
+
+# Markup strings
+# If at all possible, do not change these as parts of the program
+# depend on the actual name (particularly post-processing)
+# At the very least adapt subroutine postprocess to new tokens.
+my $ADDMARKOPEN='\DIFaddbegin '; # Token to mark begin of appended text
+my $ADDMARKCLOSE='\DIFaddend '; # Token to mark end of appended text
+my $ADDOPEN='\DIFadd{'; # To mark begin of added text passage
+my $ADDCLOSE='}'; # To mark end of added text passage
+my $ADDCOMMENT='DIF > '; # To mark added comment line
+my $DELMARKOPEN='\DIFdelbegin '; # Token to mark begin of deleted text
+my $DELMARKCLOSE='\DIFdelend '; # Token to mark end of deleted text
+my $DELOPEN='\DIFdel{'; # To mark begin of deleted text passage
+my $DELCLOSE='}'; # To mark end of deleted text passage
+my $DELCMDOPEN='%DIFDELCMD < '; # To mark begin of deleted commands (must begin with %, i.e., be a comment
+my $DELCMDCLOSE="%%%\n"; # To mark end of deleted commands (must end with a new line)
+my $AUXCMD='%DIFAUXCMD' ; # follows auxiliary commands put in by latexdiff to make difference file legal
+ # auxiliary commands must be on a line of their own
+ # Note that for verbatim environment openings the %DIFAUXCMD cannot be placed in
+ # the same line as this would mean they are shown
+ # so the special form "%DIFAUXCMD NEXT" is used to indicate that the next line
+ # is an auxiliary command
+ # Similarly "%DIFAUXCMD LAST" would indicate the auxiliary command is in previous line (not currently used)
+my $DELCOMMENT='DIF < '; # To mark deleted comment line
+my $VERBCOMMENT='DIFVRB '; # to mark lines which are within a verbatim environment
+
+# main local variables:
+my @TEXTCMDLIST=(); # array containing patterns of commands with text arguments
+my @TEXTCMDEXCL=(); # array containing patterns of commands without text arguments (if a pattern
+ # matches both TEXTCMDLIST and TEXTCMDEXCL it is excluded)
+my @CONTEXT1CMDLIST=(); # array containing patterns of commands with text arguments (subset of text commands),
+ # but which cause confusion if used out of context (e.g. \caption).
+ # In deleted passages, the command will be disabled but its argument is marked up
+ # Otherwise they behave exactly like TEXTCMD's
+my @CONTEXT1CMDEXCL=(); # exclude list for above, but always empty
+my @CONTEXT2CMDLIST=(); # array containing patterns of commands with text arguments, but which fail or cause confusion
+ # if used out of context (e.g. \title). They and their arguments will be disabled in deleted
+ # passages
+my @CONTEXT2CMDEXCL=(); # exclude list for above, but always empty
+my @MATHTEXTCMDLIST=(); # treat like textcmd. If a textcmd is in deleted or added block, just wrap the
+ # whole content with \DIFadd or \DIFdel irrespective of content. This functionality
+ # is useful for pseudo commands \MATHBLOCK.. into which math environments are being
+ # transformed
+my @MATHTEXTCMDEXCL=(); #
+
+# Note I need to declare this with "our" instead of "my" because later in the code I have to "local"ise these
+our @SAFECMDLIST=(); # array containing patterns of safe commands (which do not break when in the argument of DIFadd or DIFDEL)
+our @SAFECMDEXCL=();
+my @MBOXCMDLIST=(); # patterns for commands which are in principle safe but which need to be surrounded by an \mbox
+my @MBOXCMDEXCL=(); # all the patterns in MBOXCMDLIST will be appended to SAFECMDLIST
+
+
+my ($i,$j,$l);
+my ($old,$new);
+my ($line,$key);
+my (@dumlist);
+my ($newpreamble,$oldpreamble);
+my (@newpreamble,@oldpreamble,@diffpreamble,@diffbody);
+my ($latexdiffpreamble);
+my ($oldbody, $newbody, $diffbo);
+my ($oldpost, $newpost);
+my ($diffall);
+# Option names
+my ($type,$subtype,$floattype,$config,$preamblefile,$encoding,$nolabel,$visiblelabel,
+ $showpreamble,$showsafe,$showtext,$showconfig,$showall,
+ $replacesafe,$appendsafe,$excludesafe,
+ $replacetext,$appendtext,$excludetext,
+ $replacecontext1,$appendcontext1,
+ $replacecontext2,$appendcontext2,
+ $help,$verbose,$driver,$version,$ignorewarnings,
+ $enablecitmark,$disablecitmark,$allowspaces,$flatten,$nolinks,$debug,$earlylatexdiffpreamble); ###$disablemathmark,
+my ($mboxsafe);
+# MNEMNONICS for mathmarkup
+my $mathmarkup;
+use constant {
+ OFF => 0,
+ WHOLE => 1,
+ COARSE => 2,
+ FINE => 3
+};
+# MNEMNONICS for graphicsmarkup
+my $graphicsmarkup;
+use constant {
+ NONE => 0,
+ NEWONLY => 1,
+ BOTH => 2
+};
+
+my ($mboxcmd);
+
+my (@configlist,@addtoconfiglist,@labels,
+ @appendsafelist,@excludesafelist,
+ @appendmboxsafelist,@excludemboxsafelist,
+ @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
+$mathmarkup=COARSE;
+$verbose=0;
+# output debug and intermediate files, set to 0 in final distribution
+$debug=0;
+# insert preamble directly after documentclass - experimental feature, set to 0 in final distribution
+# Note that this failed with mini example (or other files, where packages used in latexdiff preamble
+# are called again with incompatible options in preamble of resulting file)
+$earlylatexdiffpreamble=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,
+ 'add-to-config=s' => \@addtoconfiglist,
+ '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,
+ 'exclude-mboxsafecmd=s' => \@excludemboxsafelist,
+ 'append-mboxsafecmd=s' => \@appendmboxsafelist,
+ '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,
+ 'graphics-markup=s' => \$graphicsmarkup,
+ 'enable-citation-markup|enforce-auto-mbox' => \$enablecitmark,
+ 'disable-citation-markup|disable-auto-mbox' => \$disablecitmark,
+ 'verbose|V' => \$verbose,
+ 'ignore-warnings' => \$ignorewarnings,
+ 'driver=s'=> \$driver,
+ 'flatten' => \$flatten,
+ 'no-links' => \$nolinks,
+ 'version' => \$version,
+ 'help|h' => \$help,
+ 'debug!' => \$debug ) or die "Use latexdiff -h to get help.\n" ;
+
+if ( $help ) {
+ usage() ;
+}
+
+
+if ( $version ) {
+ die $versionstring ;
+}
+
+print STDERR $versionstring if $verbose;
+
+if (defined($showall)){
+ $showpreamble=$showsafe=$showtext=$showconfig=1;
+}
+# Default types
+$type='UNDERLINE' unless defined($type);
+$subtype='SAFE' unless defined($subtype);
+# set floattype to IDENTICAL for LABEL and ONLYCHANGEDPAGE subtype, unless it has been set explicitly on the command line
+$floattype=($subtype eq 'LABEL' || $subtype eq 'ONLYCHANGEDPAGE') ? 'IDENTICAL' : 'FLOATSAFE' unless defined($floattype);
+if ( $subtype eq 'LABEL' ) {
+ print STDERR "Note that LABEL subtype is deprecated. If possible, use ZLABEL instead (requires zref package)";
+}
+
+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 "latexdiff Illegal value: ($mathmarkup) for option--math-markup. Possible values: OFF,WHOLE,COARSE,FINE,0-3\n";
+ }
+ # 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);
+}
+# setting up @MBOXCMDLIST and @MBOXCMDEXCL
+foreach $mboxsafe ( @appendmboxsafelist ) {
+ init_regex_arr_ext(\@MBOXCMDLIST, $mboxsafe);
+}
+foreach $mboxsafe ( @excludemboxsafelist ) {
+ init_regex_arr_ext(\@MBOXCMDEXCL, $mboxsafe);
+}
+
+
+
+# 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 || lc $config eq '/dev/null' ) {
+ open(FILE,$config) or die ("Couldn't open configuration file $config: $!");
+ while (<FILE>) {
+ 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)";
+ exists $CONFIG{$1} or die "Unknown configuration variable $1.";
+ $CONFIG{$1}=$2;
+}
+
+my @addtoconfig=();
+foreach $config ( @addtoconfiglist ) {
+ if (-f $config || lc $config eq '/dev/null' ) {
+ open(FILE,$config) or die ("Couldn't open addd-to-config file $config: $!");
+ while (<FILE>) {
+ chomp;
+ next if /^\s*#/ || /^\s*%/ || /^\s*$/ ;
+ push (@addtoconfig,$_);
+ }
+ close(FILE);
+ }
+ else {
+# foreach ( split(",",$config) ) {
+# push @addtoconfig,$_;
+# }
+ push @addtoconfig,split(",",$config)
+ }
+}
+
+# initialise default lists from DATA
+# for those configuration variables, which have not been set explicitly, initiate from list in document
+foreach $key ( keys(%CONFIG) ) {
+ if (!defined $CONFIG{$key}) {
+ @dumlist=();
+ init_regex_arr_data(\@dumlist,"$key CONFIG");
+ $CONFIG{$key}=join(";",@dumlist)
+ }
+}
+
+
+foreach $assign ( @addtoconfig ) {
+ ###print STDERR "assign:|$assign|\n";
+ $assign=~ m/\s*(\w*)\s*=\s*(\S*)\s*$/ or die "Illegal assignment $assign in configuration list (must be variable=value)";
+ exists $CONFIG{$1} or die "Unknown configuration variable $1.";
+ $CONFIG{$1}.=";$2";
+}
+
+# Map from hash to variables (we do this to have more concise code later, change from comma-separated list)
+foreach ( keys(%CONFIG) ) {
+ if ( $_ eq "MINWORDSBLOCK" ) { $MINWORDSBLOCK = $CONFIG{$_}; }
+ elsif ( $_ eq "FLOATENV" ) { $FLOATENV = liststringtoregex($CONFIG{$_}) ; }
+ elsif ( $_ eq "ITEMCMD" ) { $ITEMCMD = $CONFIG{$_} ; }
+ elsif ( $_ eq "LISTENV" ) { $LISTENV = liststringtoregex($CONFIG{$_}) ; }
+ elsif ( $_ eq "PICTUREENV" ) { $PICTUREENV = liststringtoregex($CONFIG{$_}) ; }
+ elsif ( $_ eq "MATHENV" ) { $MATHENV = liststringtoregex($CONFIG{$_}) ; }
+ elsif ( $_ eq "MATHREPL" ) { $MATHREPL = $CONFIG{$_} ; }
+ elsif ( $_ eq "MATHARRENV" ) { $MATHARRENV = liststringtoregex($CONFIG{$_}) ; }
+ elsif ( $_ eq "MATHARRREPL" ) { $MATHARRREPL = $CONFIG{$_} ; }
+ elsif ( $_ eq "ARRENV" ) { $ARRENV = liststringtoregex($CONFIG{$_}) ; }
+ elsif ( $_ eq "VERBATIMENV" ) { $VERBATIMENV = liststringtoregex($CONFIG{$_}) ; }
+ elsif ( $_ eq "VERBATIMLINEENV" ) { $VERBATIMLINEENV = liststringtoregex($CONFIG{$_}) ; }
+ elsif ( $_ eq "CUSTOMDIFCMD" ) { $CUSTOMDIFCMD = liststringtoregex($CONFIG{$_}) ; }
+ elsif ( $_ eq "COUNTERCMD" ) { $COUNTERCMD = liststringtoregex($CONFIG{$_}) ; }
+ elsif ( $_ eq "SCALEDELGRAPHICS" ) { $SCALEDELGRAPHICS = $CONFIG{$_} ; }
+ else { die "Unknown configuration variable $_.";}
+}
+
+if ( $mathmarkup == COARSE || $mathmarkup == WHOLE ) {
+ push(@MATHTEXTCMDLIST,qr/^MATHBLOCK(?:$MATHENV|$MATHARRENV|SQUAREBRACKET)$/);
+}
+
+
+
+foreach $pkg ( @packagelist ) {
+ map { $packages{$_}="" } split(/,/,$pkg) ;
+}
+
+
+
+if ($showconfig || $showtext || $showsafe || $showpreamble) {
+ show_configuration();
+ 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 $pat_n = $pat0;
+# if you get "undefined control sequence MATHBLOCKmath" error, increase the maximum value in this loop
+ for (my $i_pat = 0; $i_pat < 20; ++$i_pat){
+ $pat_n = '(?:[^{}]|\{'.$pat_n.'\}|\\\\\{|\\\\\})*';
+ # Actually within the text body, quoted braces are replaced in pre-processing. The only place where
+ # the last part of the pattern matters is when processing the arguments of context2cmds in the preamble
+ # and these contain a \{ or \} combination, probably rare.
+ # It should thus be fine to use the simpler version below.
+ ### $pat_n = '(?:[^{}]|\{'.$pat_n.'\})*';
+ }
+
+ my $brat0 = '(?:[^\[\]]|\\\[|\\\])*';
+ my $brat_n = $brat0;
+ for (my $i_pat = 0; $i_pat < 4; ++$i_pat){
+ $brat_n = '(?:[^\[\]]|\['.$brat_n.'\]|\\\[|\\\])*';
+ ### $brat_n = '(?:[^\[\]]|\['.$brat_n.'\])*'; # Version not taking into account escaped \[ and \]
+ }
+ my $abrat0 = '(?:[^<>])*';
+
+ my $quotemarks = '(?:\'\')|(?:\`\`)';
+ my $punct='[0.,\/\'\`:;\"\?\(\)\[\]!~\p{IsNonAsciiPunct}\p{IsNonAsciiS}]';
+ my $number='-?\d*\.\d*';
+ my $mathpunct='[+=<>\-\|]';
+ my $and = '&';
+ my $coords= '[\-.,\s\d]*';
+# quoted underscore - this needs special treatment as perl treats _ as a letter (\w) but latex does not
+# such that a\_b is interpreted as a{\_}b by latex but a{\_b} by perl
+ my $quotedunderscore='\\\\_';
+# word: sequence of letters or accents followed by letter
+ my $word_ja='\p{Han}+|\p{InHiragana}+|\p{InKatakana}+';
+ my $word='(?:' . $word_ja . '|(?:(?:[-\w\d*]|\\\\[\"\'\`~^][A-Za-z\*])(?!(?:' . $word_ja . ')))+)';
+ my $cmdleftright='\\\\(?:left|right|[Bb]igg?[lrm]?|middle)\s*(?:[<>()\[\]|\.]|\\\\(?:[|{}]|\w+))';
+ my $cmdoptseq='\\\\[\w\d@\*]+'.$extraspace.'(?:(?:<'.$abrat0.'>|\['.$brat_n.'\]|\{'. $pat_n . '\}|\(' . $coords .'\))'.$extraspace.')*';
+ my $defseq='\\\\def\\\\[\w\d@\*]+(?:#\d+|\[#\d+\])+(?:\{'. $pat_n . '\})?';
+ my $backslashnl='\\\\\n';
+ my $oneletcmd='\\\\.\*?(?:\['.$brat_n.'\]|\{'. $pat_n . '\})*';
+ my $math='\$(?:[^$]|\\\$)*?\$|\\\\[(](?:.|\n)*?\\\\[)]';
+## the current maths command cannot cope with newline within the math expression
+ my $comment='%[^\n]*\n';
+ my $pat=qr/(?:\A\s*)?(?:${and}|${quotemarks}|${number}|${word}|$quotedunderscore|${defseq}|$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
+# first find out which file name is longer for correct alignment
+my ($diff,$oldlabel_n_spaces,$newlabel_n_spaces);
+$oldlabel_n_spaces = 0;
+$newlabel_n_spaces = 0;
+$diff = length($newfile) - length($oldfile);
+if ($diff > 0) {
+ $oldlabel_n_spaces = $diff;
+}
+if ($diff < 0) {
+ $newlabel_n_spaces = abs($diff);
+}
+
+my ($oldtime,$newtime,$oldlabel,$newlabel);
+if (defined($labels[0])) {
+ $oldlabel=$labels[0] ;
+} else {
+ $oldtime=localtime((stat($oldfile))[9]);
+ $oldlabel="$oldfile " . " "x($oldlabel_n_spaces) . $oldtime;
+}
+if (defined($labels[1])) {
+ $newlabel=$labels[1] ;
+} else {
+ $newtime=localtime((stat($newfile))[9]);
+ $newlabel="$newfile " . " "x($newlabel_n_spaces) . $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);
+ # flatten preamble
+ $oldpreamble=flatten($oldpreamble,$oldpreamble,$oldfile,$encoding);
+ $newpreamble=flatten($newpreamble,$newpreamble,$newfile,$encoding);
+
+}
+
+
+
+
+my @auxlines;
+
+# boolean variab
+my ($ulem)=0;
+
+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);
+
+ # get a list of packages from preamble if not predefined
+ %packages=list_packages($newpreamble) unless %packages;
+ if ( %packages && $debug ) { my $key ; foreach $key (keys %packages) { print STDERR "DEBUG \\usepackage[",$packages{$key},"]{",$key,"}\n" ;} }
+}
+
+# have to return to all processing to properly add preamble additions based on packages found
+if (defined($graphicsmarkup)) {
+ $graphicsmarkup=~tr/a-z/A-Z/;
+ if ( $graphicsmarkup eq 'OFF' or $graphicsmarkup eq 'NONE' ) {
+ $graphicsmarkup=NONE;
+ } elsif ( $graphicsmarkup eq 'NEWONLY' or $graphicsmarkup eq 'NEW-ONLY' ) {
+ $graphicsmarkup=NEWONLY;
+ } elsif ( $graphicsmarkup eq 'BOTH' ) {
+ $graphicsmarkup=BOTH;
+ } elsif ( $graphicsmarkup !~ m/^[012]$/ ) {
+ die "latexdiff Illegal value: ($graphicsmarkup) for option --highlight-graphics. Possible values: OFF,WHOLE,COARSE,FINE,0-2\n";
+ }
+ # else use numerical value
+} else {
+ # Default: no explicit setting in menu
+ if ( defined $packages{"graphicx"} or defined $packages{"graphics"} ) {
+ $graphicsmarkup=NEWONLY;
+ } else {
+ $graphicsmarkup=NONE;
+ }
+}
+
+if (defined $packages{"hyperref"} ) {
+ # deleted lines should not generate or appear in link names:
+ print STDERR "hyperref package detected.\n" if $verbose ;
+ $latexdiffpreamble =~ s/\{\\DIFadd\}/{\\DIFaddtex}/g;
+ $latexdiffpreamble =~ s/\{\\DIFdel\}/{\\DIFdeltex}/g;
+ $latexdiffpreamble .= join "\n",(extrapream("HYPERREF"),"");
+ if($nolinks){
+ $latexdiffpreamble .= "\n\\hypersetup{bookmarks=false}";
+ }
+ ### $latexdiffpreamble .= '%DIF PREAMBLE EXTENSION ADDED BY LATEXDIFF FOR HYPERREF PACKAGE' . "\n";
+ ### $latexdiffpreamble .= '\providecommand{\DIFadd}[1]{\texorpdfstring{\DIFaddtex{#1}}{#1}}' . "\n";
+ ### $latexdiffpreamble .= '\providecommand{\DIFdel}[1]{\texorpdfstring{\DIFdeltex{#1}}{}}' . "\n";
+ ### $latexdiffpreamble .= '%DIF END PREAMBLE EXTENSION ADDED BY LATEXDIFF FOR HYPERREF PACKAGE' . "\n";
+}
+
+# add commands for figure highlighting to preamble
+if ($graphicsmarkup != NONE ) {
+ my @matches;
+ # Check if \DIFaddbeginFL definition calls \DIFaddbegin - if so we will issue an error message that graphics highlighting is
+ # is not compatible with this.
+ # (A more elegant solution would be to suppress the redefinitions of the \DIFaddbeginFL etc commands, but for this narrow use case
+ # I currently don't see this as an efficient use of time)
+ ### The foreach loop does not make sense here. I don't know why I put this in - (F Tilmann)
+ ###foreach my $cmd ( "DIFaddbegin","DIFaddend","DIFdelbegin","DIFdelend" ) {
+ @matches=( $latexdiffpreamble =~ m/command\{\\DIFaddbeginFL}\{($pat_n)}/sg ) ;
+ # we look at the last one of the list to take into account possible redefinition but almost always matches should have exactly one element
+ if ( $matches[$#matches] =~ m/\\DIFaddbegin/ ) {
+ die "Cannot combine graphics markup with float styles defining \\DIFaddbeginFL in terms of \\DIFaddbegin. Use --graphics-markup=none option or choose a different float style.";
+ exit 10;
+ }
+ ###}
+ $latexdiffpreamble .= join "\n",("\\newcommand{\\DIFscaledelfig}{$SCALEDELGRAPHICS}",extrapream("HIGHLIGHTGRAPHICS"),"");
+
+ # only change required for highlighting both is to declare \includegraphics safe, as preamble already contains commands for deleted environment
+ if ( $graphicsmarkup == BOTH ) {
+ init_regex_arr_list(\@SAFECMDLIST,'includegraphics');
+ }
+}
+
+$ulem = ($latexdiffpreamble =~ /\\RequirePackage(?:\[$brat_n\])?\{ulem\}/ || defined $packages{"ulem"});
+
+
+# If listings is being used or can be found in the latexdiff search path, add to the preamble auxiliary code to enable line-by-line markup
+if ( defined($packages{"listings"}) or `kpsewhich listings.sty` ne "" ) {
+ my @listingpreamble=extrapream("LISTINGS");
+ my @listingDIFcode=();
+ my $replaced;
+ # note that in case user supplies preamblefile the type might not reflect well the
+ @listingDIFcode=extrapream("-nofail","DIFCODE_" . $type) unless defined($preamblefile);
+ if (!(@listingDIFcode)) {
+ # if listingDIFcode is empty try to guess a suitable one from the preamble
+ if ($latexdiffpreamble =~ /\\RequirePackage(?:\[$brat_n\])?\{color\}/ and $ulem ) {
+ @listingDIFcode=extrapream("DIFCODE_UNDERLINE");
+ } elsif ( $latexdiffpreamble =~ /\\RequirePackage(?:\[$brat_n\])?\{color\}/ ) {
+ # only colour used
+ @listingDIFcode=extrapream("DIFCODE_CFONT");
+ } else {
+ # fall-back solution
+ @listingDIFcode=extrapream("DIFCODE_BOLD");
+ }
+ }
+ # now splice it in
+ $replaced=0;
+ ###print STDERR "DEBUG: listingDIFcode: ",join("\n",@listingDIFcode),"|||\n" if $debug;
+
+ @listingpreamble=grep {
+ # only replace if this has not been done already (use short-circuit property of and)
+ if (!$replaced and $_ =~ s/^.*%DIFCODE TEMPLATE.*$/join("\n",@listingDIFcode)/e ) {
+ ###print STDERR "DEBUG: Replaced text $_\n" if $debug;
+ $replaced=1;
+ 1;
+ } else {
+ # return false for those lines matching %DIFCODE TEMPLATE (so that they are not included in output)
+ not m/%DIFCODE TEMPLATE/;
+ }
+ } @listingpreamble;
+ ### print STDERR "DEBUG: listingpreamble @listingpreamble\n";
+ $latexdiffpreamble .= join "\n",(@listingpreamble,"");
+} else {
+ print STDERR "WARNING: listings package not detected. Disabling mark-up in verbatim environments \n" ;
+ # if listings does not exist disable line-by-line markup and treat all verbatim environments as opaque
+ $VERBATIMENV = liststringtoregex($CONFIG{VERBATIMENV}.";".$CONFIG{VERBATIMLINEENV});
+ $VERBATIMLINEENV = "";
+}
+
+# adding begin and end marker lines to preamble
+$latexdiffpreamble = "%DIF PREAMBLE EXTENSION ADDED BY LATEXDIFF\n" . $ latexdiffpreamble . "%DIF END PREAMBLE EXTENSION ADDED BY LATEXDIFF\n";
+
+# and return to preamble specific processing
+if ( length $oldpreamble && length $newpreamble ) {
+ 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);
+ }
+ if ( $earlylatexdiffpreamble) {
+ # insert latexdiff command directly after documentclass at beginning of preamble
+ # note that grep is only run for its side effect
+ ( grep { s/^([^%]*\\documentclass.*)$/$1$latexdiffpreamble/ } @diffpreamble )==1 or die "Could not find documentclass statement in preamble";
+ } else {
+ # insert latexdiff commands at the end of preamble (default behaviour)
+ push @diffpreamble,$latexdiffpreamble;
+ }
+ push @diffpreamble,'\begin{document}';
+ if (defined $packages{"hyperref"} && $nolinks) {
+ push @diffpreamble, '\begin{NoHyper}';
+ }
+}
+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);
+}
+
+# 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
+# and $packages{"apacite"}!~/natbibpapa/
+
+
+if (defined $packages{"units"} && $ulem ) {
+ # protect inlined maths environments by surrounding with an \mbox
+ # this is done to get around an incompatibility between the ulem and units package
+ # where spaces in the argument to underlined or crossed-out \unit commands cause an error message
+ print STDERR "units package detected at the same time as style using ulem.\n" if $verbose ;
+ $MBOXINLINEMATH=1;
+}
+
+if (defined $packages{"siunitx"} ) {
+ # protect SI command by surrounding them with an \mbox
+ # this is done to get around an incompatibility between the ulem and siunitx package
+ print STDERR "siunitx package detected.\n" if $verbose ;
+ my $mboxcmds='SI,ang,numlist,numrange,SIlist,SIrange';
+ init_regex_arr_list(\@SAFECMDLIST,'num,si');
+ if ( $enablecitmark || ( $ulem && ! $disablecitmark )) {
+ init_regex_arr_list(\@MBOXCMDLIST,$mboxcmds);
+ } else {
+ init_regex_arr_list(\@SAFECMDLIST,$mboxcmds);
+ }
+}
+
+if (defined $packages{"cleveref"} ) {
+ # protect selected command by surrounding them with an \mbox
+ # this is done to get around an incompatibility between ulem and cleveref package
+ print STDERR "cleveref package detected.\n" if $verbose ;
+ my $mboxcmds='[Cc]ref(?:range)?\*?,labelcref,(?:lc)?name[cC]refs?' ;
+ if ( $enablecitmark || ( $ulem && ! $disablecitmark )) {
+ init_regex_arr_list(\@MBOXCMDLIST,$mboxcmds);
+ } else {
+ init_regex_arr_list(\@SAFECMDLIST,$mboxcmds);
+ }
+}
+
+if (defined $packages{"glossaries"} ) {
+ # protect selected command by surrounding them with an \mbox
+ # this is done to get around an incompatibility between ulem and glossaries package
+ print STDERR "glossaries package detected.\n" if $verbose ;
+ my $mboxcmds='[gG][lL][sS](?:|pl|disp|link|first|firstplural|desc|user[iv][iv]?[iv]?),[aA][cC][rR](?:long|longpl|full|fullpl),[aA][cC][lfp]?[lfp]?';
+ init_regex_arr_list(\@SAFECMDLIST,'[gG][lL][sS](?:(?:entry)?(?:text|plural|name|symbol)|displaynumberlist|entryfirst|entryfirstplural|entrydesc|entrydescplural|entrysymbolplural|entryuser[iv][iv]?[iv]?|entrynumberlist|entrydisplaynumberlist|entrylong|entrylongpl|entryshort|entryshortpl|entryfull|entryfullpl),[gG]lossentry(?:name|desc|symbol),[aA][cC][rR](?:short|shortpl),[aA]csp?');
+ if ( $enablecitmark || ( $ulem && ! $disablecitmark )) {
+ init_regex_arr_list(\@MBOXCMDLIST,$mboxcmds);
+ } else {
+ init_regex_arr_list(\@SAFECMDLIST,$mboxcmds);
+ }
+}
+
+if (defined $packages{"chemformula"} or defined $packages{"chemmacros"} ) {
+ print STDERR "chemformula package detected.\n" if $verbose ;
+ init_regex_arr_list(\@SAFECMDLIST,'ch');
+ push(@UNSAFEMATHCMD,'ch');
+ # The next command would be needed to allow highlighting the interior of \ch commands in math environments
+ # but the redefinitions in chemformula are too deep to make this viable
+ # push(@MATHTEXTCMDLIST,'ch');
+}
+
+if (defined $packages{"mhchem"} ) {
+ print STDERR "mhchem package detected.\n" if $verbose ;
+ init_regex_arr_list(\@SAFECMDLIST,'ce');
+ push(@UNSAFEMATHCMD,'ce','cee');
+ # The next command would be needed to allow highlighting the interior of \cee commands in math environments
+ # but the redefinitions in chemformula are too deep to make this viable
+ # push(@MATHTEXTCMDLIST,'cee');
+}
+
+
+my ( $citpat);
+
+if ( defined $packages{"apacite"} ) {
+ print STDERR "apacite package detected.\n" if $verbose ;
+ $citpat='(?:mask)?(?:full|short|no)?cite(?:A|author|year|meta)?(?:NP)?';
+} else {
+ # citation command pattern for all other citation schemes
+ $citpat='(?:cite\w*|nocite)';
+};
+
+if ( ! $ulem ) {
+ # modes not using ulem: citation is safe
+ push (@SAFECMDLIST, $citpat);
+} else {
+ ### Experimental: disable text and emph commands
+ push(@SAFECMDEXCL, qr/^emph$/, qr/^text..$/);
+ # replace \cite{..} by \mbox{\cite{..}} in added or deleted blocks in post-processing
+ push(@MBOXCMDLIST,$citpat) unless $disablecitmark;
+ if ( uc($subtype) eq "COLOR" or uc($subtype) eq "DVIPSCOL" ) {
+ # remove \cite command again from list of safe commands
+ pop @MBOXCMDLIST;
+ # deleted cite commands
+ }
+}
+push(@MBOXCMDLIST,$citpat) if $enablecitmark ;
+
+
+if (defined $packages{"amsmath"} or defined $packages{"amsart"} or defined $packages{"amsbook"} ) {
+ print STDERR "amsmath package detected.\n" if $verbose ;
+ $MATHARRREPL='align*';
+}
+
+# add commands in MBOXCMDLIST to SAFECMDLIST
+foreach $mboxcmd ( @MBOXCMDLIST ) {
+ init_regex_arr_list(\@SAFECMDLIST, $mboxcmd);
+}
+
+# check if \label is in SAFECMDLIST, and if yes replace "label" in $LABELCMD by something that never matches (we hope!)
+if ( iscmd("label",\@SAFECMDLIST,\@SAFECMDEXCL) ) {
+ $LABELCMD=~ s/label/NEVERMATCHLABEL/;
+}
+
+
+
+print STDERR "Preprocessing body. " if $verbose;
+preprocess($oldbody,$newbody);
+
+
+# run difference algorithm
+@diffbody=bodydiff($oldbody, $newbody);
+$diffbo=join("",@diffbody);
+writedebugfile($diffbo,"bodydiff");
+
+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)\{($pat_n)\}/$1\{$2 \\ LATEXDIFF comparison \\ Old: $oldlabel \\ New: $newlabel \}/ or
+ $diffbo = "\\begin{verbatim}LATEXDIFF comparison\nOld: $oldlabel\nNew: $newlabel\\end{verbatim}\n$diffbo" ;
+}
+
+$diffall .= "$diffbo" ;
+if (defined $packages{"hyperref"} && $nolinks) {
+ $diffall .= "\\end{NoHyper}\n";
+}
+$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;
+
+
+# liststringtoregex(liststring)
+# expands string with semi-colon separated list into a regular expression corresponding
+# matching any of the elements
+sub liststringtoregex {
+ my ($liststring)=@_;
+ my @elements=grep /\S/,split(";",$liststring);
+ if ( @elements) {
+ return('(?:(?:' . join(')|(?:',@elements) .'))');
+ } else {
+ return "";
+ }
+}
+
+# show_configuration
+# note that this is not encapsulated but uses variables from the main program
+# It is provided for convenience because in the future it is planned to allow output
+# to be modified based on what packages are read etc - this works only if the input files are actually read
+# whether or not additional files are provided
+sub show_configuration {
+ if ($showpreamble) {
+ print "\nPreamble commands:\n";
+ print $latexdiffpreamble ;
+ }
+
+ if ($showsafe) {
+ print "\nsafecmd: Commands safe within scope of $ADDOPEN $ADDCLOSE and $DELOPEN $DELCLOSE (unless excluded):\n";
+ print_regex_arr(@SAFECMDLIST);
+ print "\nsafecmd-exlude: Commands not safe within scope of $ADDOPEN $ADDCLOSE and $DELOPEN $DELCLOSE :\n";
+ print_regex_arr(@SAFECMDEXCL);
+ print "\nmboxsafecmd: Commands safe only if they are surrounded by \\mbox command:\n";
+ print_regex_arr(@MBOXCMDLIST);
+ print "\nnmboxsafecmd: Commands not safe:\n";
+ print_regex_arr(@MBOXCMDEXCL);
+ }
+
+ 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 "ARRENV=$ARRENV\n";
+ print "COUNTERCMD=$COUNTERCMD\n";
+ print "FLOATENV=$FLOATENV\n";
+ print "ITEMCMD=$ITEMCMD\n";
+ print "LISTENV=$LISTENV\n";
+ print "MATHARRENV=$MATHARRENV\n";
+ print "MATHARRREPL=$MATHARRREPL\n";
+ print "MATHENV=$MATHENV\n";
+ print "MATHREPL=$MATHREPL\n";
+ print "MINWORDSBLOCK=$MINWORDSBLOCK\n";
+ print "PICTUREENV=$PICTUREENV\n";
+ print "SCALEDELGRAPHICS=$SCALEDELGRAPHICS\n";
+ print "VERBATIMENV=$VERBATIMENV\n";
+ print "VERBATIMLINEENV=$VERBATIMLINEENV\n";
+ print "CUSTOMDIFCMD=$CUSTOMDIFCMD\n";
+ }
+}
+
+
+
+## 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 utf8
+sub guess_encoding {
+ my ($filename)=@_;
+ my ($i,$enc);
+ open (FH, $filename) or die("Couldn't open $filename: $!");
+ $i=0;
+ while (<FH>) {
+ 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");
+ return("utf8");
+}
+
+
+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=<FILE>;
+ } 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=<FILE>;
+ } 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=<FILE>;
+ 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,\RequirePackage 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/(?<!\\)%.*$// ;
+# if ( $line =~ m/\\(?:documentclass|usepackage|RequirePackage)(?:\[(.+?)\])?\{(.*?)\}/ ) {
+## print STDERR "Found something: |$line|\n" if $debug;
+# if (defined($1)) {
+# $packages{$2}=$1;
+# } else {
+# $packages{$2}="";
+# }
+# }
+# }
+# return (%packages);
+#}
+
+
+# %packages=list_packages($preamble)
+# scans the arguments for \documentclass,\RequirePackage and \usepackage statements and constructs a hash
+# whose keys are the included packages, and whose values are the associated optional arguments
+# if argument of \usepackage or \RequirePackage is comma separated list, treat as different packages
+sub list_packages {
+ my ($preamble)=@_;
+ my %packages=();
+ my $pkg;
+
+ # remove comments
+ $preamble=~s/(?<!\\)%.*$//mg ;
+
+ while ( $preamble =~ m/\\(?:documentclass|usepackage|RequirePackage)(?:\[($brat_n)\])?\{(.*?)\}/gs ) {
+ if (defined($1)) {
+ foreach $pkg ( split /,/,$2 ) {
+ $packages{$pkg}=$1;
+ }
+ } else {
+ foreach $pkg ( split /,/,$2 ) {
+ $packages{$pkg}="";
+ }
+ }
+ }
+
+ # sometimes, class options are defined in such a way that they imply the loading and/or presence of a package
+ # so we also treat all class options as 'packages.
+ if ( $preamble =~ m/\\documentclass\s*\[($brat_n)\]\s*\{.*?\}/s ) {
+ foreach $pkg ( split /,/,$1 ) {
+ $pkg =~ s/\s//g ; # remove space and newline characters
+ $packages{$pkg}="" unless exists($packages{$pkg});
+ }
+ }
+ return (%packages);
+}
+
+# Subroutine add_safe_commands modified from version provided by S. Gouezel
+# add_safe_commands($preamble)
+# scans the argument for \newcommand and \DeclareMathOperator,
+# and adds the created commands which are clearly safe to @SAFECMDLIST
+sub add_safe_commands {
+ my ($preamble)=@_;
+
+ # get rid of comments
+ $preamble=~s/(?<!\\)%.*$//mg ;
+
+ my $to_test = "";
+ # test for \DeclareMathOperator{\foo}{myoperator}
+ while ( $preamble =~ m/\DeclareMathOperator\s*\*?\{\\(\w*?)\}/osg) {
+ $to_test=$1;
+ if ($to_test ne "" and not iscmd($to_test,\@SAFECMDLIST,\@SAFECMDEXCL) and not iscmd($to_test, \@SAFECMDEXCL, [])) {
+ # one should add $to_test to the list of safe commands.
+ init_regex_arr_list(\@SAFECMDLIST, $to_test);
+ print STDERR "Adding $to_test to the list of safe commands\n" if $verbose;
+ }
+ }
+
+ while ( $preamble =~ m/\\(?:new|renew|provide)command\s*{\\(\w*)\}(?:|\[\d*\])\s*\{(${pat_n})\}/osg ) {
+ my $maybe_to_test = $1;
+ my $should_be_safe = $2;
+ print STDERR "DEBUG Checking new command: maybe_to_test, should_be_safe: $1 $2\n" if $debug;
+ my $success = 0;
+ # test if all latex commands inside it are safe
+ $success = 1;
+ if ($should_be_safe =~ m/\\\\/) {
+ $success = 0;
+ } else {
+ while ($should_be_safe =~ m/\\(\w+)/g) {
+ ### print STDERR "DEBUG: Testing command $1 " if $debug;
+ $success = 0 unless iscmd($1,\@SAFECMDLIST,\@SAFECMDEXCL); ### or $1 eq "";
+ ### print STDERR " success=$success\n" if $debug;
+ }
+ }
+ ### }
+ if ($success) {
+ $to_test = $maybe_to_test;
+ if ( not iscmd($to_test,\@SAFECMDLIST,\@SAFECMDEXCL) and not iscmd($to_test, \@SAFECMDEXCL, [])) {
+ # # one should add $to_test to the list of safe commands.
+ init_regex_arr_list(\@SAFECMDLIST, $to_test);
+ print STDERR "Adding $to_test to the list of safe commands\n" if $verbose;
+ }
+ }
+ }
+}
+
+
+# helper function for flatten
+# remove \endinput at beginning of line and everything
+# following it, # if \endinput is not at the beginning of
+# the line, nothing will be removed. It is assumed that
+# this case is most common when \endinput is part of a
+# conditional clause. The file will only be processed
+# correctly if the conditional is always false,
+# i.e. \endinput # not actually reached
+sub remove_endinput {
+ # s/// operates on default input
+ $_[0] =~ s/^\\endinput.*\Z//ms ;
+ return($_[0]);
+}
+
+# flatten($text,$preamble,$filename,$encoding)
+# expands \input and \include commands within text
+# expands \bibliography command with corresponding bbl file if available
+# expands \subfile command (from subfiles package - not part of standard text distribution)
+# preamble is scanned for includeonly commands
+# encoding is the encoding
+sub flatten {
+ my ($text,$preamble,$filename,$encoding)=@_;
+ my ($includeonly,$dirname,$fname,$newpage,$fullfile,$filecontent,$replacement,$begline,$bblfile,$subfile,$command,$verbenv,$verboptions);
+ my ($subpreamble,$subbody,$subpost);
+ require File::Basename ;
+ require File::Spec ;
+ $dirname = File::Basename::dirname($filename);
+ $bblfile = $filename;
+ $bblfile=~s/\.tex$//;
+ $bblfile.=".bbl";
+
+ if ( ($includeonly) = ($preamble =~ m/\\includeonly\{(.*?)\}/ ) ) {
+ $includeonly =~ s/,/|/g;
+ } else {
+ $includeonly = '.*?';
+ }
+
+ print STDERR "DEBUG: includeonly $includeonly\n" if $debug;
+
+ # recursively replace \\input and \\include files
+ $text =~ s/(^(?:[^%\n]|\\%)*)(\\input\{(.*?)\}|\\include\{(${includeonly}(?:\.tex)?)\})/{
+ $begline=(defined($1)? $1 : "") ;
+ $fname = $3 if defined($3) ;
+ $fname = $4 if defined($4) ;
+ # # add tex extension unless there is a three or four letter extension already
+ $fname .= ".tex" unless $fname =~ m|\.\w{3,4}$|;
+ $fullfile = File::Spec->catfile($dirname,$fname);
+ print STDERR "DEBUG Beg of line match |$1|\n" if defined($1) && $debug ;
+ print STDERR "Include file $fname\n" if $verbose;
+ print STDERR "DEBUG looking for file ",$fullfile, "\n" if $debug;
+ # content of file becomes replacement value (use recursion), add \newpage if the command was include
+ if ( -f $fullfile ) {
+ # If file exists, replace input or include command with expanded input
+ $replacement=flatten(read_file_with_encoding($fullfile, $encoding), $preamble,$filename,$encoding) or die "Could not open file ",$fullfile,": $!";
+ $replacement = remove_endinput($replacement);
+ # \include always starts a new page; use explicit \newpage command to simulate this
+ $newpage=(defined($4)? " \\newpage " : "") ;
+ } else {
+ # if file does not exist, do not expand include or input command (do not warn if fname contains #[0-9] as it is then likely part of a command definition
+ # and is not meant to be expanded directly
+ print STDERR "WARNING: Could not find included file ",$fullfile,". I will continue but not expand |$2|\n" unless $fname =~ m(#[0-9]) ;
+ $replacement = $2 ; # i.e. just the original command again -> make no change file does not exist
+ $newpage="";
+ }
+ "$begline$newpage$replacement$newpage";
+ }/exgm;
+
+ # replace bibliography with bbl file if it exists
+ $text=~s/(^(?:[^%\n]|\\%)*)\\bibliography\{(.*?)\}/{
+ if ( -f $bblfile ){
+ $replacement=read_file_with_encoding(File::Spec->catfile($bblfile), $encoding);
+ } else {
+ warn "Bibliography file $bblfile cannot be found. No flattening of \\bibliography done. Run bibtex on old and new files first";
+ $replacement="\\bibliography{$2}";
+ }
+ $begline=(defined($1)? $1 : "") ;
+ "$begline$replacement";
+ }/exgm;
+
+ # replace subfile with contents (subfile package)
+ $text=~s/(^(?:[^%\n]|\\%)*)\\subfile\{(.*?)\}/{
+ $begline=(defined($1)? $1 : "") ;
+ $fname = $2;
+ # # add tex extension unless there is a three or four letter extension already
+ $fname .= ".tex" unless $fname =~ m|\.\w{3,4}|;
+ print STDERR "Include file as subfile $fname\n" if $verbose;
+ # content of file becomes replacement value (use recursion)
+ # now strip away everything outside and including \begin{document} and \end{document} pair#
+ # # note: no checking for comments is made
+ $fullfile=File::Spec->catfile($dirname,$fname);
+ if ( -f $fullfile) {
+ # if file exists, expand \subfile command by contents of file
+ $subfile=read_file_with_encoding($fullfile,$encoding) or die "Could not open included subfile ",$fullfile,": $!";
+ ($subpreamble,$subbody,$subpost)=splitdoc($subfile,'\\\\begin\{document\}','\\\\end\{document\}');
+ ### $subfile=~s|^.*\\begin{document}||s;
+ ### $subfile=~s|\\end{document}.*$||s;
+ $replacement=flatten($subbody, $preamble,$filename,$encoding);
+ ### $replacement = remove_endinput($replacement);
+ } else {
+ # if file does not exist, do not expand subfile
+ print STDERR "WARNING: Could not find subfile ",$fullfile,". I will continue but not expand |$2|\n" unless $fname =~ m(#[0-9]) ;
+ $replacement = "\\subfile\{$2\}" ; # i.e. just the original command again -> make no change file does not exist
+ }
+
+ "$begline$replacement";
+ }/exgm;
+
+ # replace \verbatiminput and \lstlistinginput
+ $text=~s/(^(?:[^%\n]|\\%)*)\\(verbatiminput\*?|lstinputlisting)$extraspace(\[$brat_n\])?$extraspace\{(.*?)\}/{
+ $begline=(defined($1)? $1 : "") ;
+ $command = $2 ;
+ $fname = $4 ;
+ $verboptions = defined($3)? $3 : "" ;
+ if ($command eq 'verbatiminput' ) {
+ $verbenv = "verbatim" ;
+ } elsif ($command eq 'verbatiminput*' ) {
+ $verbenv = "verbatim*" ;
+ } elsif ($command eq 'lstinputlisting' ) {
+ $verbenv = "lstlisting" ;
+ } else {
+ die "Internal errorL Unexpected verbatim input type $command.\n";
+ }
+ print STDERR "DEBUG Beg of line match |$begline|\n" if $debug ;
+ print STDERR "Include file $fname verbatim\n" if $verbose;
+ print STDERR "DEBUG looking for file ",File::Spec->catfile($dirname,$fname), "\n" if $debug;
+ # content of file becomes replacement value (do not 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=read_file_with_encoding(File::Spec->catfile($dirname,$fname), $encoding) or die "Couldn't find file ",File::Spec->catfile($dirname,$fname),": $!";
+ # Add a new line if it not already there (note that the matching operator needs to use different delimiters, as we are still inside an outer scope that takes precedence
+ $replacement .= "\n" unless $replacement =~ m(\n$) ;
+ "$begline\\begin{$verbenv}$verboptions\n$replacement\\end{$verbenv}\n";
+ }/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 or external file
+# (end of file after __END__ token)
+# if $type is a filename, it will read the file instead of reading from the appendix
+# otherwise it will screen appendix for line "%DIF $TYPE" and copy everything up to line
+# '%DIF END $TYPE' (where $TYPE is upcased version of $type)
+# extrapream('-nofail',$type) will---instead of failing---simply return nothing if
+# it does not find the matching line in a appendix (do not use -nofail option with multiple types!)
+sub extrapream {
+ my @types=@_;
+ my ($type,$arg);
+ my $nofail=0;
+ ###my @retval=("%DIF PREAMBLE EXTENSION ADDED BY LATEXDIFF") ;
+ my @retval=();
+ my ($copy);
+
+ foreach $arg ( @types ) {
+ if ( $arg eq '-nofail' ) {
+ $nofail=1;
+ next;
+ }
+ $type=$arg;
+ $copy=0;
+ if ( -f $type || lc $type eq '/dev/null' ) {
+ open (FILE,$type) or die "Cannot open preamble file $type: $!";
+ print STDERR "Reading preamble file $type\n" if $verbose ;
+ while (<FILE>) {
+ 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;
+ # save filehandle position (before first read this points to line after __END__)
+ # but seek DATA,0,0 resets it to the beginning of the file
+ # see https://stackoverflow.com/questions/4459601/how-can-i-use-data-twice
+ my $data_start = tell DATA;
+ while (<DATA>) {
+ if ( m/^%DIF $type/ ) {
+ $copy=1;
+ } elsif ( m/^%DIF END $type/ ) {
+ last;
+ }
+ chomp;
+ push (@retval,"$_ %DIF PREAMBLE") if $copy;
+ }
+ if ( $copy == 0 ) {
+ unless ($nofail) {
+ print STDERR "\nPreamble style $type not implemented.\n";
+ print STDERR "Write latexdiff -h to get help with available styles\n";
+ exit(2);
+ }
+ }
+ seek DATA,$data_start,0; # rewind DATA handle to beginning of data record
+ }
+ }
+ ###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");
+ print TOKENOLD join("***\n",@oldwords);
+ close(TOKENOLD);
+ open(TOKENNEW,">","latexdiff.debug.tokennew2");
+ 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
+# if there is white space in the beginning return that as first token
+sub splitlatex {
+ my ($inputstring) = @_ ;
+ my $string=$inputstring ;
+ # if input is empty, return empty list
+ length($string)>0 or return ();
+ $string=~s/^(\s*)//s;
+ my $leadin=$1;
+ length($string)>0 or return ($leadin);
+
+ 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;
+ }
+
+ }
+ unshift(@retval,$leadin) if (length($leadin)>0);
+ 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@*]+))((?:\[$brat_n\]|\{$pat_n\})*)/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;
+
+ # make a list of all TEXTCMDLIST commands in deleted and added blocks
+ $delcmds = extractcommands($delblock);
+ $addcmds = extractcommands($addblock);
+ # now find those text commands, which are found in both deleted and added blocks, and expand them
+ # 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}\[$brat_n\]${extraspace}|${extraspace}\{$pat_n\})*)/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}\[$brat_n\]|${extraspace}\{$pat_n\})*${extraspace}\{)($pat_n)(\}\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;
+ print STDERR "DEBUG: iscmd($cmd)=" if $debug;
+ foreach $pat ( @$regexar ) {
+ if ( $cmd =~ m/^${pat}$/ ) {
+ $ret=1 ;
+ last;
+ }
+ }
+ print STDERR "0\n" if ($debug && !$ret) ;
+ return 0 unless $ret;
+ foreach $pat ( @$regexexcl ) {
+ print STDERR "0\n" if ( $debug && $cmd =~ m/^${pat}$/) ;
+ return 0 if ( $cmd =~ m/^${pat}$/ );
+ }
+ print STDERR "1\n" if $debug;
+ 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 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);
+ ### print STDERR "DEBUG: marktags $openmark,$closemark,$open,$close,$opencmd,$closecmd,$comment\n" if $debug;
+ ### print STDERR "DEBUG: marktags blocksplit ",join("|",@$block),"\n" if $debug;
+ foreach (@$block) {
+ $word=$_;
+ ### print STDERR "DEBUG MARKTAGS: |$word|\n" if $debug;
+ if ( $word =~ s/^%/%$comment/ ) {
+ # a comment
+ if ($cmd==1) {
+ push (@$retval,$closecmd) ;
+ $cmd=-1;
+ }
+ push (@$retval,$word);
+ next;
+ }
+ if ( $word =~ m/^\s*$/ ) {
+ ### print STDERR "DEBUG MARKTAGS: whitespace detected |$word| cmdcom |$cmdcomment| |$opencmd|\n" if $debug;
+ # a sequence of white-space characters - this should only ever happen for the first element of block.
+ # in deleted block, omit, otherwise just copy it in
+ if ( ! $cmdcomment) { # ignore in deleted blocks
+ push(@$retval,$word);
+ }
+ next;
+ }
+ if (! $noncomment) {
+ push (@$retval,$openmark);
+ $noncomment=1;
+ }
+ # negative lookahead pattern (?!) in second clause is put in to avoid matching \( .. \) patterns
+ # also note that second pattern will match \\
+ print STDERR "DEBUG marktags: Considering word |$word|\n" if $debug;
+ if ( $word =~ /^[&{}\[\]]/ || ( $word =~ /^\\(?!\()(\\|[`'^"~=.]|[\w*@]+)/ && !iscmd($1,\@SAFECMDLIST,\@SAFECMDEXCL)) ) {
+ ###print STDERR "DEBUG MARKTAGS is a non-safe command ($1)\n" if $debug;
+ ### 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\]|\{$pat_n\})*\{)($pat_n)(\}\s*)$/so )
+ if ( ( $word =~ m/^(\\([\w\d\*]+)(?:${extraspace}\[$brat_n\]|${extraspace}\{$pat_n\})*${extraspace}\{)($pat_n)(\}\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=('\\','\\\\',@UNSAFEMATHCMD);
+ 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
+ ### print STDERR "MARKTAGS: Add command |$word|\n";
+ push (@$retval,$word);
+ $cmd=1;
+ }
+ } else {
+ ###print STDERR "DEBUG MARKTAGS is an ordinary word or SAFECMD command \n" if $debug;
+ # just an ordinary word or command in SAFECMD
+ push (@$retval,$open) if $cmd==-1 ;
+ push (@$retval,$closecmd,$open) if $cmd==1 ;
+ ###TODO: check here if it is a command in MBOXCMD list, and surround it with \mbox{...}
+ ### $word =~ /^\\(?!\()(\\|[`'^"~=.]|[\w*@]+)/ && iscmd($1,\@MBOXCMDLIST,\@MBOXCMDEXCL))
+ ### but actually this check has been carried out already so can simply check if word begins with backslash
+ if ( $word =~ /^\\(?!\()(\\|[`'^"~=.]|[\w*@]+)(.*?)(\s*)$/s && iscmd($1,\@MBOXCMDLIST,\@MBOXCMDEXCL)) {
+ # $word is a safe command in MBOXCMDLIST
+ ###print STDERR "DEBUG Mboxsafecmd detected:$word:\n" if $debug ;
+ push(@$retval,"\\mbox{$AUXCMD\n\\" . $1 . $2 . $3 ."}\\hspace{0pt}$AUXCMD\n" );
+ } else {
+ # $word is a normal word or a safe command (not in MBOXCMDLIST)
+ push (@$retval,$word);
+ }
+ $cmd=0;
+ }
+ }
+ push (@$retval,$close) if $cmd==0;
+ push (@$retval,$closecmd) if $cmd==1;
+
+ push (@$retval,$closemark) if ($noncomment);
+ return @$retval;
+}
+
+#used in preprocess
+sub take_comments_and_enter_from_frac() {
+ #*************take the \n and % between frac and {}***********
+ #notice all of the substitution are made none global
+ while( m/\\begin\{($MATHENV|$MATHARRENV|SQUAREBRACKET)}(.*?)\\frac(([\s]*%[^\n]*?)*[\r\n|\r|\n])+\{(.*?)\\end\{\1}/s ) {
+ # if there isn't any % or \n in the pattern $2 then there should be an \\end{...} in $2
+ ### print STDERR "Match the following in take_comments and_enter_from_frac(1):\n****$&****\n" if $debug;
+ if( $2 !~ m/\\end\{$1}/s ) {
+ # take out % and \n from the next match only (none global)
+ s/\\begin\{($MATHENV|$MATHARRENV|SQUAREBRACKET)}(.*?)\\frac(([\s]*%[^\n]*?)*[\r\n|\r|\n])+\{(.*?)\\end\{\1}/\\begin{$1}$2\\frac{$5\\end{$1}/s;
+ }
+ else{
+ #there are no more % and \n in $2, we want to find the next one so we clear the begin-end from the pattern
+ s/\\begin\{($MATHENV|$MATHARRENV|SQUAREBRACKET)}(.*?)\\end\{\1}/MATHBLOCK$1\{$2\}MATHBLOCKEND/s;
+ }
+ }
+ ###cleaning up
+ while( s/MATHBLOCK($MATHENV|$MATHARRENV|SQUAREBRACKET)\{(.*?)\}MATHBLOCKEND/\\begin{$1}$2\\end{$1}/s ){}
+ ###*************take the \n and % between frac and {}***********
+
+ ###**********take the \n and % between {} and {} of the frac***************
+ while( m/\\begin\{($MATHENV|$MATHARRENV|SQUAREBRACKET)\}(.*?)\\frac\{(.*?)\\end\{\1\}/s ) {
+ # if there isn't any more //frac before the first //end in the pattern $2 then there should be an \\end{...} in $2
+ ###print STDERR "Match the following in take_comments and_enter_from_frac(2):\n****$&****\n" if $debug;
+ if( $2 !~ m/\\end\{$1\}/s ) {
+ # from now on CURRFRAC is the frac we are looking at
+ s/\\begin\{($MATHENV|$MATHARRENV|SQUAREBRACKET)\}(.*?)\\frac\{(.*?)\\end\{\1\}/\\begin\{$1\}$2CURRFRAC\{$3\\end\{$1\}/s;
+ while( m/\\begin\{($MATHENV|$MATHARRENV|SQUAREBRACKET)\}(.*?)CURRFRAC\{(.*?)\\end\{\1\}/s ) {
+ if( m/\\begin\{($MATHENV|$MATHARRENV|SQUAREBRACKET)\}(.*?)CURRFRAC\{($pat_n)\}([\s]*(%[^\n]*?)*[\r\n|\r|\n])+[\s]*\{(.*?)\\end\{\1}/s ) {
+ s/\\begin\{($MATHENV|$MATHARRENV|SQUAREBRACKET)\}(.*?)CURRFRAC\{($pat_n)\}([\s]*(%[^\n]*?)*[\r\n|\r|\n])+[\s]*\{(.*?)\\end\{\1\}/\\begin\{$1\}$2CURRFRAC\{$3\}\{$6\\end\{$1\}/s;
+ }
+ else { # there is no comment or \n between the two brackets {}{}
+ # change CURRFRAC to FRACSTART so we can change them all back to //frac{ when we finish
+ s/\\begin\{($MATHENV|$MATHARRENV|SQUAREBRACKET)}(.*?)CURRFRAC\{(.*?)\\end\{\1}/\\begin{$1}$2FRACSTART\{$3\\end{$1}/s;
+ }
+ }
+ }
+ else{
+ ###there are no more frac in $2, we want to find the next one so we clear the begin-end from the pattern
+ s/\\begin\{($MATHENV|$MATHARRENV|SQUAREBRACKET)}(.*?)\\end\{\1}/MATHBLOCK$1\{$2\}MATHBLOCKEND/s;
+ }
+
+ }
+ ###cleaning up
+ while( s/MATHBLOCK($MATHENV|$MATHARRENV|SQUAREBRACKET)\{(.*?)\}MATHBLOCKEND/\\begin{$1}$2\\end{$1}/s ){}
+ s/FRACSTART/\\frac/g;
+ ###***************take the \n and % between {} and {} of the frac*********************
+}
+
+# preprocess($string, ..)
+# carry out the following pre-processing steps for all arguments:
+# 1. Remove leading white-space
+# Change \{ to \QLEFTBRACE and \} to \QRIGHTBRACE and \& to \AMPERSAND
+# #. Change {,} in comments to \CLEFTBRACE, \CRIGHTBRACE
+# 2. mark all first empty line (in block of several) with \PAR tokens
+# 3. Convert all '\%' into '\PERCENTAGE ' and all '\$' into \DOLLAR to make parsing regular expressions easier
+# 4. Convert all \verb|some verbatim text| commands (where | can be an arbitrary character)
+# into \verb{hash} (also lstinline)
+# 5. Convert \begin{verbatim} some verbatim text \end{verbatim} into \verbatim{hash} (not only verbatim, all patterns matching VERBATIMENV)
+# 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 math-mode COARSE,WHOLE or NONE 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 {
+ for (@_) {
+
+
+ # change in \verb and similar commands - note that I introduce an extra space here so that the
+ # already hashed variants do not trigger again
+ # transform \lstinline{...}
+# s/\\lstinline(\[$brat0\])?(\{(?:.*?)\})/"\\DIFlstinline". $1 ."{". tohash(\%verbhash,"$2") ."}"/esg;
+# s/\\lstinline(\[$brat0\])?((\S).*?\2)/"\\DIFlstinline". $1 ."{". tohash(\%verbhash,"$2") ."}"/esg;
+ s/\\lstinline((?:\[$brat_n\])?)(\{(?:.*?)\})/"\\DIFlstinline". $1 ."{". tohash(\%verbhash,"$2") ."}"/esg;
+ s/\\lstinline((?:\[$brat_n\])?)(([^\s\w]).*?\3)/"\\DIFlstinline". $1 ."{". tohash(\%verbhash,"$2") ."}"/esg;
+ s/\\(verb\*?|lstinline)([^\s\w])(.*?)\2/"\\DIF${1}{". tohash(\%verbhash,"${2}${3}${2}") ."}"/esg;
+
+ # Change \{ to \QLEFTBRACE, \} to \QRIGHTBRACE, and \& to \AMPERSAND
+ s/(?<!\\)\\\{/\\QLEFTBRACE /sg;
+ s/(?<!\\)\\\}/\\QRIGHTBRACE /sg;
+ s/(?<!\\)\\&/\\AMPERSAND /sg;
+# replace {,} in comments with \\CLEFTBRACE,\\CRIGHTBRACE
+ 1 while s/((?<!\\)%.*)\{(.*)$/$1\\CLEFTBRACE $2/mg ;
+ 1 while s/((?<!\\)%.*)\}(.*)$/$1\\CRIGHTBRACE $2/mg ;
+ s/(?<!\\)\\%/\\PERCENTAGE /g ; # (?<! is negative lookbehind assertion to prevent \\% from being converted
+ s/(?<!\\)\\\$/\\DOLLAR /g ; # (?<! is negative lookbehind assertion to prevent \\$ from being converted
+ s/\\begin\{($VERBATIMENV)\}(.*?)\\end\{\1\}/"\\${1}{". tohash(\%verbhash,"${2}") . "}"/esg;
+ s/\\begin\{($VERBATIMLINEENV)\}(.*?)\\end\{\1\}/"\\begin{$1}". linecomment($2) . "\\end{$1}"/esg;
+
+ # mark all first empty line (in block of several) with \PAR tokens
+ s/\n(\s*?)\n((?:\s*\n)*)/\n$1\\PAR\n$2/g ;
+ # Convert _n or _\cmd into \SUBSCRIPTNB{n} or \SUBSCRIPTNB{\cmd} and _{nnn} into \SUBSCRIPT{nn}
+ 1 while s/(?<!\\)_(\s*([^{\\\s]|\\\w+))/\\SUBSCRIPTNB{$1}/g ;
+ 1 while s/(?<!\\)_(\s*{($pat_n)})/\\SUBSCRIPT$1/g ;
+ # Convert ^n into \SUPERSCRIPTNB{n} and ^{nnn} into \SUPERSCRIPT{nn}
+ 1 while s/(?<!\\)\^(\s*([^{\\\s]|\\\w+))/\\SUPERSCRIPTNB{$1}/g ;
+ 1 while s/(?<!\\)\^(\s*{($pat_n)})/\\SUPERSCRIPT$1/g ;
+ # Convert \sqrt{n} into \SQRT{n} and \sqrt nn into SQRTNB{nn}
+ 1 while s/(?<!\\)\\sqrt(\s*([^{\\\s]|\\\w+))/\\SQRTNB{$1}/g ;
+ 1 while s/(?<!\\)\\sqrt(\s*{($pat_n)})/\\SQRT$1/g ;
+ # Convert $$ $$ into \begin{DOLLARDOLLAR} \end{DOLLARDOLLAR}
+ s/\$\$(.*?)\$\$/\\begin{DOLLARDOLLAR}$1\\end{DOLLARDOLLAR}/sg;
+ # Convert \[ \] into \begin{SQUAREBRACKET} \end{SQUAREBRACKET}
+ s/(?<!\\)\\\[/\\begin{SQUAREBRACKET}/sg;
+ s/\\\]/\\end{SQUAREBRACKET}/sg;
+ # Convert all picture environmentent (\begin{PICTUREENV} .. \end{PICTUREENV} \PICTUREBLOCKenv
+ s/\\begin\{($PICTUREENV)}(.*?)\\end\{\1}/\\PICTUREBLOCK$1\{$2\}/sg;
+ # For math-mode COARSE,WHOLE or NONE option -convert all \begin{MATH} .. \end{MATH}
+ # into \MATHBLOCKMATH{...} commands, where MATH is any valid math environment
+ # Also convert all array environments into ARRAYBLOCK environments
+
+ if ( $mathmarkup != FINE ) {
+ # DIFANCHORARRB and DIFANCHORARRE, DIFANCHORMATHB and DIFANCHORMATHE markers are inserted here to encourage the matching algorithm
+ # to always match up the closing brace. Otherwise sometimes one ends up with a situation where
+ # the closing brace is deleted and added at another point. The deleted closing brace is then
+ # prevented by a %DIFDELCMD, leading to material leaking in or out of the math environment.
+ # The anchors are removed in post-processing again. (note that they are simple text to cause least amount of complications
+ # Admittedly, this is something of a hack and will not always work. If it does not, then one needs to
+ # resort to WHOLE or FINE, or NONE math mode processing.
+ s/\\begin\{($ARRENV)}(.*?)\\end\{\1}/\\ARRAYBLOCK$1\{$2\\DIFANCHORARRB \}\\DIFANCHORARRE /sg;
+
+ take_comments_and_enter_from_frac();
+
+ s/\\begin\{($MATHENV|$MATHARRENV|SQUAREBRACKET)\}(.*?)\\end\{\1\}/\\MATHBLOCK$1\{$2\\DIFANCHORMATHB \}\\DIFANCHORMATHE /sg;
+ }
+
+ # add final token " STOP"
+ $_ .= " STOP"
+ }
+}
+
+
+# $expanded=linecomment($string)
+#preface all lines with verbatim marker (usually DIFVRB)
+sub linecomment {
+ my @verbatimlines=split("\n",$_[0]);
+ # the first line needs special treatment - we do want to retain optional arguments as is but wrap the remainder also with VERBCOMMENT
+ ### print STDERR "DEBUG: before verbatimlines[0] = ",$verbatimlines[0],"\n";
+ $verbatimlines[0]=~s/^((?:\s*\[$brat_n\])?\s*)([^\s\[].*)/ defined($2) ? ( "$1\%$VERBCOMMENT$2" ) : ( $1 )/e;
+ ### print STDERR "DEBUG: after verbatimlines[0] = ",$verbatimlines[0],"\n";
+ return(join("\n%$VERBCOMMENT",@verbatimlines)."\n");
+}
+
+# $simple=reverselinecomment($env $string)
+# remove DIFVRB comments but leave changed lines marked
+sub reverselinecomment {
+ my ($environment, $verbatimtext)=@_;
+ ###print STDERR "OLD VERBATIMTEXT: |$verbatimtext|\n";
+ # remove markup added by latexdiff
+ # (this should occur only if the type of verbatim environment was changed)
+ # (note that this destroys some information in old file)
+ # in theory I could save it by moving it out of the verbatim environment
+ # but this requires more bookkeeping and is probably not necessary)
+ $verbatimtext =~ s/\\DIFaddbegin //g;
+ $verbatimtext =~ s/\\DIFaddend //g;
+ $verbatimtext =~ s/\\DIFdelbegin //g;
+ $verbatimtext =~ s/\\DIFdelend //g;
+ $verbatimtext =~ s/$DELCMDOPEN.*//g;
+
+ # remove DIFVRB mark
+ $verbatimtext=~ s/%$VERBCOMMENT//g;
+
+ # remove part of the markup in changed lines
+ # if any of these substitution was made, then there was at least
+ # one changed line, and we have to extend the style
+ if ( $verbatimtext=~ s/$VERBCOMMENT//g ) {
+ # in the next line we add ~alsolanguage~ modifier, but also deletes the rest of the line after the optional argument, as lstlisting commands gets sometimes
+ # very confused by what is there (and othertimes seems to ignore this anyway)
+ unless ( $verbatimtext =~ s/^(\s*)\[($brat_n)\](.*)\n/$1\[$2,alsolanguage=DIFcode\]\n/ ) {
+ if ( $verbatimtext =~ m/^\s*\n/ ) {
+ $verbatimtext = "[alsolanguage=DIFcode]" . $verbatimtext;
+ } else {
+ $verbatimtext = "[alsolanguage=DIFcode]\n" . $verbatimtext;
+ }
+ }
+ # There is a bug in listings package (at least v1.5b) for empty comments where the actual comment command is not made invisible
+ # I therefore have to introduce an artificial '-' character at the end of empty added or deleted lines
+ $verbatimtext =~ s/($DELCOMMENT\s*)$/$1-/mg;
+ $verbatimtext = "\\DIFmodbegin\n\\begin{${environment}}${verbatimtext}\\end{${environment}}\n\\DIFmodend"
+ } else {
+ $verbatimtext = "\\begin{${environment}}${verbatimtext}\\end{${environment}}"
+ }
+ ###print STDERR "NEW VERBATIMTEXT: |$verbatimtext|\n";
+ return($verbatimtext);
+}
+
+
+#hashstring=tohash(\%hash,$string)
+# creates a hash value based on string and stores in %hash
+sub tohash {
+ my ($hash,$string)=@_;
+ my (@arr,$val);
+ my ($sum,$i)=(0,1);
+ my ($hstr);
+
+ @arr=unpack('c*',$string);
+
+ while (1) {
+ foreach $val (@arr) {
+ $sum += $i*$val;
+ $i++;
+ }
+ $hstr= "$sum";
+ last unless (defined($hash->{$hstr}) && $string ne $hash->{$hstr});
+ # else found a duplicate HASH need to repeat for a higher hash value
+ }
+ $hash->{$hstr}=$string;
+ ### print STDERR "Hash:$hstr: Content:$string:\n";
+ 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;
+}
+
+# writedebugfile(string, label)
+# if $debug set writes <string> to file latexdiff.debug.<label>
+# otherwise do nothing
+sub writedebugfile {
+ my ($string,$label)=@_;
+ if ( $debug ) {
+ open(RAWDIFF,">","latexdiff.debug." . $label);
+ print RAWDIFF $string;
+ close(RAWDIFF);
+ }
+}
+
+
+# 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 math-mode COARSE,WHOLE or NONE option set: Convert \MATHBLOCKmath{..} commands back to environments
+#
+# Convert all PICTUREblock{..} commands back to the appropriate environments
+# 3. Convert DIFadd, DIFdel, DIFaddbegin , ... 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 '\%' and '\DOLLAR ' 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, \end,{,} in comments
+# Change \QLEFTBRACE, \QRIGHTBRACE,\AMPERSAND 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);
+
+ my (@textparts,@newtextparts,@liststack,$listtype,$listlast);
+
+ my (@itemargs, $itemarg);
+
+
+ for (@_) {
+ # change $'s in comments to something harmless
+ 1 while s/(%.*)\$/$1DOLLARDIF/mg ;
+
+ # Remove final STOP token
+ s/ STOP$//;
+ # Replace \RIGHTBRACE in comments by \MBLOCKRIGHTBRACE
+ # the only way to get these is as %DIFDELCMD < \RIGHTBRACE construction
+ # This essentially marks closing right braces of MATHBLOCK environments, which did not get matched
+ # up. This case should be rare, so I just leave this in the diff file output. Not really elegant
+ # but can still be dealt with later if it results in problems.
+ s/%DIFDELCMD < \\RIGHTBRACE/%DIFDELCMD < \\MBLOCKRIGHTBRACE/g ;
+ # Replace \RIGHTBRACE by }
+ s/\\RIGHTBRACE/}/g;
+
+ # 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 ) {
+ ### while ( m/\\DIFdelbegin.*?\\DIFdelend/sg ) {
+ ### print STDERR "DEBUG Match delblock \n||||$&||||\n at ",pos,"\n";
+ $cnt=0;
+ $len=length($&);
+ $begin=pos($_) - $len;
+ $delblock=$&;
+ ### A much simpler method for math replacement might follow this strategy (can recycle part of the commands below for following
+ ### this strategy:
+ ### 1. a Insert aux commands \begin{MATHMODE} or \end{MATHMODE} for all deleted commands opening or closing displayed math mode
+ ### b Insert aux commands \begin{MATHARRMODE} or \end{MATHARRMODE} for all deleted commands opening or closing math array mode
+ ### 2 Replace MATHMODE and MATHARRMODE by correct pairing if appropriate partner math command is found in text
+ ### 3 a Replace remaining \begin{MATHMODE}...\end{MATHMODE} pairs with \begin{$MATHREPL}..\end{$MATHREPL}
+ ### b Replace remaining \begin{MATHARRMODE}...\end{MATHARRMODE} pairs with \begin{$MATHREPL}..\end{$MATHREPL}
+ ### 4 Delete all aux command math mode pairs which have simply comments or empty lines between them
+ ### As written this won't actually work!
+
+
+ ### Most general case: allow all included environments
+ ### $delblock=~ s/(\%DIFDELCMD < \s*\\begin\{(\w*\*?)\}\s*?\n)(.*?)(\%DIFDELCMD < \s*\\end\{\2\})/$1\\begin{$2}$AUXCMD\n$3\n\\end{$2}$AUXCMD\n$4/sg;
+ ### (.*?[^\n]?)\n? construct is necessary to avoid empty lines in math mode, which result in
+ ### an error
+ # displayed math environments
+ ###0.5: $delblock=~ s/(\%DIFDELCMD < \s*\\begin\{((?:$MATHENV)|SQUAREBRACKET)\}\s*?(?:$DELCMDCLOSE|\n))(.*?[^\n]?)\n?(\%DIFDELCMD < \s*\\end\{\2\})/\\begin{$MATHREPL}$AUXCMD\n$1$3\n\\end{$MATHREPL}$AUXCMD\n$4/sg;
+ 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/(?<!${AUXCMD}\n)(\%DIFDELCMD < \s*\\end\{($MATHENV)\}\s*?\n)(.*?[^\n]?)\n?(?<!${AUXCMD}\n)(\%DIFDELCMD < \s*\\begin\{\2\})/$1\\end{$MATHREPL}$AUXCMD\n$3\n\\begin{$MATHREPL}$AUXCMD\n$4/sg;
+ ###0.5: $delblock=~ s/(?<!${AUXCMD}\n)(\%DIFDELCMD < \s*\\end\{((?:$MATHENV)|SQUAREBRACKET)\}\s*?(?:$DELCMDCLOSE|\n))(.*?[^\n]?)\n?(?<!${AUXCMD}\n)(\%DIFDELCMD < \s*\\begin\{\2\})/\\end{MATHMODE}$AUXCMD\n$1$3\n\\begin{MATHMODE}$AUXCMD\n$4/sg;
+ $delblock=~ s/(?<!${AUXCMD}\n)(\%DIFDELCMD < \s*\\end\{((?:$MATHENV)|SQUAREBRACKET)\}.*?(?:$DELCMDCLOSE|\n))(.*?[^\n]?)\n?(?<!${AUXCMD}\n)(\%DIFDELCMD < \s*\\begin\{\2\})/\\end\{MATHMODE\}$AUXCMD\n$1$3\n\\begin\{MATHMODE\}$AUXCMD\n$4/sg;
+
+ # now look for unpaired %DIFDELCMD < \begin{MATHENV}; if found add \begin{$MATHREPL} and insert \end{$MATHREPL}
+ # just before end of block; again we use look-behind assertion to avoid matching constructions which have already been converted
+ if ($delblock=~ s/(?<!${AUXCMD}\n)(\%DIFDELCMD < \s*\\begin\{((?:$MATHENV)|SQUAREBRACKET)\}\s*?(?:$DELCMDCLOSE|\n))/$1\\begin{$MATHREPL}$AUXCMD\n/sg ) {
+ $delblock =~ s/(\\DIFdelend$)/\\end{$MATHREPL}$AUXCMD\n$1/s ;
+ }
+ # now look for unpaired %DIFDELCMD < \end{MATHENV}; if found add \end{MATHMODE} and insert \begin{MATHMODE}
+ # just before end of block; again we use look-behind assertion to avoid matching constructions which have already been converted
+ if ($delblock=~ s/(?<!${AUXCMD}\n)(\%DIFDELCMD < \s*\\end\{((?:$MATHENV)|SQUAREBRACKET)\}\s*?(?:$DELCMDCLOSE|\n))/$1\\end\{MATHMODE\}$AUXCMD\n/sg ) {
+ $delblock =~ s/(\\DIFdelend$)/\\begin\{MATHMODE\}$AUXCMD\n$1/s ;
+ }
+
+
+ ### pre-0.42 # same as above for special case \[.\] (latex abbreviation for displaymath)
+ ### pre-0.42 $delblock=~ s/(\%DIFDELCMD < \s*\\\[\s*?\n())(.*?[^\n]?)\n?(\%DIFDELCMD < \s*\\\])/$1\\\[$AUXCMD\n$3\n\\\]$AUXCMD\n$4/sg;
+ ### pre-0.42 $delblock=~ s/(?<!${AUXCMD}\n)(\%DIFDELCMD < \s*\\\]\s*?\n())(.*?[^\n]?)\n?(?<!${AUXCMD}\n)(\%DIFDELCMD < \s*\\\[)/$1\\\]$AUXCMD\n$3\n\\\[$AUXCMD\n$4/sg;
+ # equation array environment
+ ###pre-0.3 $delblock=~ s/(\%DIFDELCMD < \s*\\begin\{($MATHARRENV)\}\s*?\n)(.*?)(\%DIFDELCMD < \s*\\end\{\2\})/$1\\begin{$MATHARRREPL}$AUXCMD\n$3\n\\end{$MATHARRREPL}$AUXCMD\n$4/sg;
+ ###0.5 $delblock=~ s/(\%DIFDELCMD < \s*\\begin\{($MATHARRENV)\}\s*?(?:$DELCMDCLOSE|\n))(.*?[^\n]?)\n?(\%DIFDELCMD < \s*\\end\{\2\})/\\begin{$MATHARRREPL}$AUXCMD\n$1$3\n\\end{$MATHARRREPL}$AUXCMD\n$4/sg;
+ $delblock=~ s/(\%DIFDELCMD < \s*\\begin\{($MATHARRENV)\}.*?(?:$DELCMDCLOSE|\n))(.*?[^\n]?)\n?(\%DIFDELCMD < \s*\\end\{\2\})/\\begin{$MATHARRREPL}$AUXCMD\n$1$3\n\\end{$MATHARRREPL}$AUXCMD\n$4/sg;
+ ### pre-0.42 obsolete version which did not work on eqnarray test $delblock=~ s/(?<!${AUXCMD}\n)(\%DIFDELCMD < \s*\\end\{($MATHARRENV)\}\s*?\n)(.*?[^\n]?)\n?(?<!${AUXCMD}\n)(\%DIFDELCMD < \s*\\begin\{\2\})/$1\\end{$MATHARRREPL}$AUXCMD\n$3\n\\begin{$MATHARRREPL}$AUXCMD\n$4/sg;
+ $delblock=~ s/(?<!${AUXCMD}\n)(\%DIFDELCMD < \s*\\end\{($MATHARRENV)\}\s*?(?:$DELCMDCLOSE|\n))(.*?[^\n]?)\n?(?<!${AUXCMD}\n)(\%DIFDELCMD < \s*\\begin\{\2\})/\\end{MATHMODE}$AUXCMD\n$1$3\n\\begin{MATHMODE}$AUXCMD\n$4/sg;
+
+ # now look for unpaired %DIFDELCMD < \begin{MATHARRENV}; if found add \begin{$MATHARRREPL} and insert \end{$MATHARRREPL}
+ # just before end of block; again we use look-behind assertion to avoid matching constructions which have already been converted
+ if ($delblock=~ s/(?<!${AUXCMD}\n)(\%DIFDELCMD < \s*\\begin\{($MATHARRENV)\}\s*?(?:$DELCMDCLOSE|\n))/$1\\begin{$MATHARRREPL}$AUXCMD\n/sg ) {
+ $delblock =~ s/(\\DIFdelend$)/\\end{$MATHARRREPL}$AUXCMD\n$1/s ;
+ }
+ # now look for unpaired %DIFDELCMD < \end{MATHENV}; if found add \end{MATHMODE} and insert \begin{MATHMODE}
+ # just before end of block; again we use look-behind assertion to avoid matching constructions which have already been converted
+ if ($delblock=~ s/(?<!${AUXCMD}\n)(\%DIFDELCMD < \s*\\end\{($MATHARRENV)\}\s*?(?:$DELCMDCLOSE|\n))/$1\\end{MATHMODE}$AUXCMD\n/sg ) {
+ $delblock =~ s/(\\DIFdelend$)/\\begin{MATHMODE}$AUXCMD\n$1/s ;
+ }
+
+ # parse $delblock for deleted and reinstated eqnarray* environments - within those reinstate \\ and & commands
+ ### while ( $delblock =~ m/\\begin{$MATHARRREPL}$AUXCMD\n.*?\n\\end{$MATHARRREPL}$AUXCMD\n/sg ) {
+ while ( $delblock =~ m/\\begin\Q{$MATHARRREPL}$AUXCMD\E\n.*?\n\\end\Q{$MATHARRREPL}$AUXCMD\E\n/sg ) {
+ ### print STDERR "DEBUG Match eqarrayblock $& at ",pos,"\n";
+ $cnt2=0;
+ $len2=length($&);
+ $begin2=pos($delblock) - $len2;
+ $eqarrayblock=$&;
+ # reinstate deleted & and \\ commands
+ $eqarrayblock=~ s/(\%DIFDELCMD < \s*(\&|\\\\)\s*?(?:$DELCMDCLOSE|\n))/$1$2$AUXCMD\n/sg ;
+
+ substr($delblock,$begin2,$len2)=$eqarrayblock;
+ pos($delblock) = $begin2 + length($eqarrayblock);
+ }
+ } elsif ( $mathmarkup == COARSE || $mathmarkup == WHOLE ) {
+ # 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
+ $delblock=~ s/\\MATHBLOCK($MATHENV)\{($pat_n)\}/\\MATHBLOCK$MATHREPL\{$2\}/sg;
+ $delblock=~ s/\\MATHBLOCK($MATHARRENV)\{($pat_n)\}/\\MATHBLOCK$MATHARRREPL\{$2\}/sg;
+ }
+ # Reinstate completely deleted list environments. note that items within the
+ # environment will still be commented out. They will be restored later
+ $delblock=~ s/(\%DIFDELCMD < \s*\\begin\{($LISTENV)\}\s*?(?:\n|$DELCMDCLOSE))(.*?)(\%DIFDELCMD < \s*\\end\{\2\})/{
+ ### # block within the search; replacement environment
+ ### "$1\\begin{$2}$AUXCMD\n". restore_item_commands($3). "\n\\end{$2}$AUXCMD\n$4";
+ "$1\\begin{$2}$AUXCMD\n$3\n\\end{$2}$AUXCMD\n$4";
+ }/esg;
+
+ ### $delblock=~ s/\\begin\{$MATHENV}$AUXCMD/\\begin{$MATHREPL}$AUXCMD/g;
+ ### $delblock=~ s/\\end\{$MATHENV}$AUXCMD/\\end{$MATHREPL}$AUXCMD/g;
+ ### $delblock=~ s/\\begin\{$MATHARRENV}$AUXCMD/\\begin{$MATHARRREPL}$AUXCMD/g;
+ ### $delblock=~ s/\\end\{$MATHARRENV}$AUXCMD/\\end{$MATHARRREPL}$AUXCMD/g;
+
+ # 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}\[$brat_n\]${extraspace}|${extraspace}\{$pat_n\})*\s*${AUXCMD}\n)/\\$1$2\\addtocounter{$1}{-1}${AUXCMD}\n/sg ;
+
+ # bb. disable active labels within deleted blocks (i.e. those not commented out) (as these are not safe commands, this should normally only
+ # happen within deleted maths blocks
+ ### $delblock=~ s/(?<!$DELCMDOPEN)(\\$LABELCMD(?:${extraspace})\{(?:[^{}])*\}[\t ]*)\n?/${DELCMDOPEN}$1${DELCMDCLOSE}/smg ;
+ ### previous line caused trouble as by issue #90 I might need to modify this
+ $delblock=~ s/^([^%]*)(\\$LABELCMD(?:${extraspace})\{(?:[^{}])*\}[\t ]*)\n?/$1${DELCMDOPEN}$2${DELCMDCLOSE}/smg ;
+ ### print STDERR "<<<$delblock>>>\n" if $debug;
+
+
+ # c. If in-line math mode contains array environment, enclose the whole environment in \mbox'es
+ while ( $delblock =~ m/($math)(\s*)/sg ) {
+ # print STDERR "DEBUG Delblock Match math $& at ",pos,"\n";
+ $cnt2=0;
+ $len2=length($&);
+ $begin2=pos($delblock) - $len2;
+ $mathblock="%\n\\mbox{$AUXCMD\n$1\n}$AUXCMD\n";
+ next unless ( $mathblock =~ /ARRAYBLOCK/ or $mathblock =~ m/\{$ARRENV\}/ );
+ substr($delblock,$begin2,$len2)=$mathblock;
+ pos($delblock) = $begin2 + length($mathblock);
+ }
+ ### if ($CITE2CMD) {
+ ###### ${extraspace}(?:\[$brat0\]${extraspace}){0,2}\{$pat_n\})) .*?%%%\n
+ ### $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}\{$pat_n\})(\s*)/\\mbox{$AUXCMD\n$1\n}$AUXCMD\n/msg ;
+ ### $delblock=~s/(\\($CITECMD)${extraspace}(?:<$abrat0>${extraspace})?(?:\[$brat0\]${extraspace}){0,2}\{$pat_n\})(\s*)/\\mbox{$AUXCMD\n$1\n}$AUXCMD\n/msg ;
+ ### }
+ # if MBOXINLINEMATH is set, protect inlined math environments with an extra mbox
+ if ( $MBOXINLINEMATH ) {
+ # note additional \newline after command is omitted from output if right at the end of deleted block (otherwise a spurious empty line is generated)
+ $delblock=~s/($math)(?:[\s\n]*)?/\\mbox{$AUXCMD\n$1\n}$AUXCMD\n/sg;
+ }
+ ###if ( defined($packages{"listings"} and $latexdiffpreamble =~ /\\RequirePackage(?:\[$brat_n\])?\{color\}/)) {
+ ### # change included verbatim environments
+ ### $delblock =~ s/\\DIFverb\{/\\DIFDIFdelverb\{/g;
+ ### $delblock =~ s/\\DIFlstinline/\\DIFDIFdellstinline/g;
+ ###}
+ # Mark deleted verbose commands
+ $delblock =~ s/(${DELCMDOPEN}\\DIF((?:verb\*?|lstinline(?:\[$brat_n\])?)\{([-\d]*?)\}\s*).*)$/%\n\\DIFDIFdel$2${AUXCMD}\n$1/gm;
+ if ( $CUSTOMDIFCMD ) {
+ $delblock =~ s/(${DELCMDOPEN}.*)\\($CUSTOMDIFCMD)/$1${DELCMDCLOSE}\\DEL$2/gm;
+ }
+
+ # splice in modified delblock
+ substr($_,$begin,$len)=$delblock;
+ pos = $begin + length($delblock);
+ }
+ ###writedebugfile($_,'postprocess');
+
+ ### print STDERR "<<<$_>>>\n" if $debug;
+
+
+ # 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 =~ /ARRAYBLOCK/ or $mathblock =~ m/\{$ARRENV\}/) ;
+ substr($addblock,$begin2,$len2)=$mathblock;
+ pos($addblock) = $begin2 + length($mathblock);
+ }
+ # if MBOXINLINEMATH is set, protect inlined math environments with an extra mbox
+ if ( $MBOXINLINEMATH ) {
+ ##$addblock=~s/($math)/\\mbox{$AUXCMD\n$1\n}$AUXCMD\n/sg;
+ $addblock=~s/($math)(?:[\s\n]*)?/\\mbox{$AUXCMD\n$1\n}$AUXCMD\n/sg;
+ }
+ ###if ( defined($packages{"listings"} and $latexdiffpreamble =~ /\\RequirePackage(?:\[$brat0\])?\{color\}/)) {
+ # mark added verbatim commands
+ $addblock =~ s/\\DIFverb/\\DIFDIFaddverb/g;
+ $addblock =~ s/\\DIFlstinline/\\DIFDIFaddlstinline/g;
+ if( $CUSTOMDIFCMD ) {
+ $addblock =~ s/\\($CUSTOMDIFCMD)/\\ADD$1/g;
+ }
+ # markup the optional arguments of \item
+ $addblock =~ s/(\\$ITEMCMD$extraspace(?:<$abrat0>)?$extraspace)\[($brat_n)\]/
+ @itemargs=splitlatex(substr($2,0,length($2)));
+ $itemarg="[".join("",marktags("","",$ADDOPEN,$ADDCLOSE,"","",$ADDCOMMENT,\@itemargs))."]";
+ "$1$itemarg"/sge; # old substitution: $1\[$ADDOPEN$2$ADDCLOSE\]
+ ###}
+# splice in modified addblock
+ substr($_,$begin,$len)=$addblock;
+ pos = $begin + length($addblock);
+ }
+
+ # Go through whole text, and by counting list environment commands, find out when we are within a list environment.
+ # Within those restore deleted \item commands
+ @textparts=split /(?<!$DELCMDOPEN)(\\(?:begin|end)\{$LISTENV\})/ ;
+ @liststack=();
+ @newtextparts=map {
+ ### print STDERR ":::::::: $_\n";
+ if ( ($listtype) = m/^\\begin\{($LISTENV)\}$/ ) {
+ print STDERR "DEBUG: postprocess \\begin{$listtype}\n" if $debug;
+ push @liststack,$listtype;
+ } elsif ( ($listtype) = m/^\\end\{($LISTENV)\}$/ ) {
+ print STDERR "DEBUG: postprocess \\end{$listtype}\n" if $debug;
+ if (scalar @liststack > 0) {
+ $listlast=pop(@liststack);
+ ($listtype eq $listlast) or warn "Invalid nesting of list environments: $listlast environment closed by \\end{$listtype}.";
+ } else {
+ warn "WARNING: Invalid nesting of list environments: \\end{$listtype} encountered without matching \\begin{$listtype}.\n";
+ }
+ } else {
+ print STDERR "DEBUG: postprocess \@liststack=(",join(",",@liststack),")\n" if $debug;
+ if (scalar @liststack > 0 ) {
+ # we are within a list environment and should replace all item commands
+ $_=restore_item_commands($_);
+ }
+ # else: we are outside a list environment and do not need to do anything
+ }
+ $_ } @textparts; # end of map command
+ # replace the main text with the modified version
+ $_= join("",@newtextparts);
+
+
+
+
+ # 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\}((?:(.(?!(?<!\\)\&|\\\\))*)?)\\end\{MATHMODE\}/\\begin{$MATHREPL}$1\\end{$MATHREPL}/sg;
+ # others into MATHARRREPL
+ s/\\begin\{MATHMODE\}(.*?)\\end\{MATHMODE\}/\\begin{$MATHARRREPL}$1\\end{$MATHARRREPL}/sg;
+
+ # now look for AUXCMD math-mode pairs which have only comments (or empty lines between them), and remove the added commands
+ s/\\begin\{((?:$MATHENV)|(?:$MATHARRENV)|SQUAREBRACKET)\}$AUXCMD\n((?:\s*%.[^\n]*\n)*)\\end\{\1\}$AUXCMD\n/$2/sg;
+ } else {
+ # math modes OFF,WHOLE,COARSE: Convert \MATHBLOCKmath{..} commands back to environments
+ s/\\MATHBLOCK($MATHENV|$MATHARRENV|SQUAREBRACKET)\{($pat_n)\}/\\begin{$1}$2\\end{$1}/sg;
+ # convert ARRAYBLOCK.. commands back to environments
+ s/\\ARRAYBLOCK($ARRENV)\{($pat_n)\}/\\begin{$1}$2\\end{$1}/sg;
+ # get rid of the DIFANCHOR markers, first the delete comments, then everywhere
+ s/%DIFDELCMD < \\DIFANCHOR(?:MATH|ARR)[BE] (?:\n%DIFDELCMD < )?%%%\n//g ;
+ s/\\DIFANCHOR(?:MATH|ARR)[BE] //g;
+ }
+
+ # Convert all PICTUREblock{..} commands back to the appropriate environments
+ s/\\PICTUREBLOCK($PICTUREENV)\{($pat_n)\}/\\begin{$1}$2\\end{$1}/sg;
+#0.5: # Remove all mark up within picture environments
+# while ( m/\\begin\{($PICTUREENV)\}.*?\\end\{\1\}/sg ) {
+# $cnt=0;
+# $len=length($&);
+# $begin=pos($_) - $len;
+# $float=$&;
+# $float =~ s/\\DIFaddbegin //g;
+# $float =~ s/\\DIFaddend //g;
+# $float =~ s/\\DIFadd\{($pat_n)\}/$1/g;
+# $float =~ s/\\DIFdelbegin //g;
+# $float =~ s/\\DIFdelend //g;
+# $float =~ s/\\DIFdel\{($pat_n)\}//g;
+# $float =~ s/$DELCMDOPEN.*//g;
+# substr($_,$begin,$len)=$float;
+# pos = $begin + length($float);
+# }
+ # Convert DIFadd, DIFdel, DIFFaddbegin , ... into varieties
+ # within floats (currently recognised float environments: plate,table,figure
+ # plus starred varieties).
+ while ( m/\\begin\{($FLOATENV)\}.*?\\end\{\1\}/sg ) {
+ $cnt=0;
+ $len=length($&);
+ $begin=pos($_) - $len;
+ $float=$&;
+ $float =~ s/\\DIFaddbegin /\\DIFaddbeginFL /g;
+ $float =~ s/\\DIFaddend /\\DIFaddendFL /g;
+ $float =~ s/\\DIFadd\{/\\DIFaddFL{/g;
+ $float =~ s/\\DIFdelbegin /\\DIFdelbeginFL /g;
+ $float =~ s/\\DIFdelend /\\DIFdelendFL /g;
+ $float =~ s/\\DIFdel\{/\\DIFdelFL{/g;
+ substr($_,$begin,$len)=$float;
+ pos = $begin + length($float);
+ }
+ ### former location of undo renaming of \begin and \end in comments
+
+ # remove empty DIFCMD < lines
+ s/^\Q${DELCMDOPEN}\E\n//msg;
+
+ # Expand hashes of verb and verbatim environments (note negative look behind assertion to not leak out of DIFDELCMD comments
+ s/${DELCMDOPEN}\\($VERBATIMENV)\{([-\d]*?)\}/"${DELCMDOPEN}\\begin{${1}}".fromhash(\%verbhash,$2,$DELCMDOPEN)."${DELCMDOPEN}\\end{${1}}"/esg;
+ # revert changes to verbatim environments for line diffs (and add code to mark up changes)
+ s/(?<!$DELCMDOPEN)\\begin\{($VERBATIMLINEENV)\}(.*?)\\end\{\1\}/"". reverselinecomment($1, $2) .""/esg;
+# # we do the same for deleted environments but additionally reinstate the framing commands
+# s/$DELCMDOPEN\\begin\{($VERBATIMLINEENV)\}$extraspace(?:\[$brat0\])?$DELCMDCLOSE(.*?)$DELCMDOPEN\\end\{\1\}$DELCMDCLOSE/"\\begin{$1}". reverselinecomment($2) . "\\end{$1}"/esg;
+## s/$DELCMDOPEN\\begin\{($VERBATIMLINEENV)\}($extraspace(?:\[$brat0\])?\s*)(?:\n|$DELCMDOPEN)*$DELCMDCLOSE((?:\%$DELCOMMENT$VERBCOMMENT.*?\n)*)($DELCMDOPEN\\end\{\1\}(?:\n|\s|$DELCMDOPEN)*$DELCMDCLOSE)/"SUBSTITUTION: \\begin{$1}$2 INTERIOR: |$3| END: |$4|"/esg;
+ s/ # Deleted \begin command of verbatim environment (Captures $1: whole deleted command, $2: environment, $3: optional arguments with white space
+ (\Q$DELCMDOPEN\E\\begin\{($VERBATIMLINEENV)\}(\Q$extraspace\E(?:\[$brat_n\])?\s*)(?:\n|\Q$DELCMDOPEN\E)*\Q$DELCMDCLOSE\E)
+ # Interior of deleted verbatim environment should consist entirely of delete DIFVRB comments, i.e. match only lines beginning with % DIF < DIFVRB
+ # Captures: $4: all lines combined
+ ((?:\%\Q$DELCOMMENT$VERBCOMMENT\E[^\n]*?\n)*)
+ # Deleted \end command of verbatim environment. Note that the type is forced to match the opening. Captures: $5: Whole deleted environment (previous way this line was written: (\Q$DELCMDOPEN\E\\end\{\2\}(?:\n|\s|\Q$DELCMDOPEN\E)*\Q$DELCMDCLOSE\E)
+ (\Q$DELCMDOPEN\E\\end\{\2\})
+ / # Substitution part
+ $1 # Leave expression as is
+ . "$AUXCMD NEXT\n" # Mark the following line as an auxiliary command
+ . "" # reinstate the original environment without options
+ . reverselinecomment($2, "$3$4") # modify the body to change the markup; reverselinecomment parses for options
+ . " $AUXCMD\n" # close the auxiliary environment
+ . $5 # and again leave the original deleted closing environment as is
+ /esgx; # Modifiers of substitution command
+ # where changes have occurred in verbatim environment, change verbatim to DIFverbatim to allow mark-up
+ # (I use the presence of optional paramater to verbatim environment as the marker - normal verbatim
+ # environment does not take optional arguments)
+ s/(?<!$DELCMDOPEN)\\begin\{(verbatim[*]?)\}(\[$brat_n\].*?)\\end\{\1\}/\\begin{DIF$1}$2\\end{DIF$1}/sg;
+
+ s/\\($VERBATIMENV)\{([-\d]*?)\}/"\\begin{${1}}".fromhash(\%verbhash,$2)."\\end{${1}}"/esg;
+
+
+ # remove all \PAR tokens (taking care to properly keep commented out PAR's
+ # from introducing uncommented newlines - next line)
+ s/(%DIF < )([^\n]*?)\\PAR\n/$1$2\n$1\n/sg;
+ # convert PAR commands which are on a line by themselves
+ s/\n(\s*?)\\PAR\n/\n\n/sg;
+ # convert remaining PAR commands (which are preceded by non-white space characters, usually "}" ($ADDCLOSE)
+ s/\\PAR\n/\n\n/sg;
+
+ # package specific processing:
+ if ( defined($packages{"endfloat"})) {
+ #endfloat: make sure \begin{figure} and \end{figure} are always
+ # on a line by themselves, similarly for table environment
+ print STDERR "endfloat package detected.\n" if $verbose ;
+ # eliminate whitespace before and after
+ s/^(\s*)(\\(?:end|begin)\{(?:figure|table)\})(\s*?)$/$2/mg;
+ # split lines with remaining characters before float environment conmmand
+ s/^([^%]+)(\\(?:begin|end)\{(?:figure|table)\})/$1\n$2/mg;
+ # split lines with remaining characters after float environment conmmand
+ s/^((?:[^%]+)\\(?:begin|end)\{(?:figure|table)\}(?:\[[a-zA-Z]+\])?)(.+)((?:%.*)?)$/$1\n$2$3/mg;
+ }
+
+ # Convert '\PERCENTAGE ' back into '\%' (the final question mark catches a special situation where due to a latter pre-processing step the ' ' becomes separated
+ s/\\PERCENTAGE ?/\\%/g;
+ # Convert '\DOLLAR ' back into '\$'
+ s/\\DOLLAR /\\\$/g;
+
+ # undo renaming of the \begin and \end,{,} and dollars in comments
+
+ # although we only renamed $ in comments to DOLLARDIFF, we might have lost the % in unchanged verbatim blocks, so rename all
+ s/DOLLARDIF/\$/g;
+# Convert \begin{SQUAREBRACKET} \end{SQUAREBRACKET} into \[ \]
+ s/\\end\{SQUAREBRACKET\}/\\\]/sg;
+ s/\\begin\{SQUAREBRACKET\}/\\\[/sg;
+# 4. Convert \begin{DOLLARDOLLAR} \end{DOLLARDOLLAR} into $$ $$
+ s/\\begin\{DOLLARDOLLAR\}(.*?)\\end\{DOLLARDOLLAR\}/\$\$$1\$\$/sg;
+# 5. Convert \SUPERSCRIPTNB{n} into ^n and \SUPERSCRIPT{nn} into ^{nnn}
+ 1 while s/\\SUPERSCRIPT(\s*\{($pat_n)\})/^$1/g ;
+ 1 while s/\\SUPERSCRIPTNB\{(\s*$pat0)\}/^$1/g ;
+ # Convert \SUBSCRIPNB{n} into _n and \SUBCRIPT{nn} into _{nnn}
+ 1 while s/\\SUBSCRIPT(\s*\{($pat_n)\})/_$1/g ;
+ 1 while s/\\SUBSCRIPTNB\{(\s*$pat0)\}/_$1/g ;
+ # Convert \SQRT{n} into \sqrt{n} and \SQRTNB{nn} into \sqrt nn
+ 1 while s/\\SQRT(\s*\{($pat_n)\})/\\sqrt$1/g ;
+ 1 while s/\\SQRTNB\{(\s*$pat0)\}/\\sqrt$1/g ;
+
+ 1 while s/(%.*)\\CRIGHTBRACE (.*)$/$1\}$2/mg ;
+ 1 while s/(%.*)\\CLEFTBRACE (.*)$/$1\{$2/mg ;
+
+
+# Change \QLEFTBRACE, \QRIGHTBRACE to \{,\}
+ s/\\QLEFTBRACE /\\\{/sg;
+ s/\\QRIGHTBRACE /\\\}/sg;
+ s/\\AMPERSAND /\\&/sg;
+ # Highligh added inline verbatim commands if possible
+ if ( $latexdiffpreamble =~ /\\RequirePackage(?:\[$brat_n\])?\{color\}/ ) {
+ # wrap added verb commands with color commands
+ s/\\DIFDIFadd((?:verb\*?|lstinline(?:\[$brat_n\])?)\{[-\d]*?\}[\s\n]*)/\{\\color{blue}$AUXCMD\n\\DIF$1%\n\}$AUXCMD\n/sg;
+ s/\\DIFDIFdel((?:verb\*?|lstinline(?:\[$brat_n\])?)\{[-\d]*?\}[\s\n]*$AUXCMD)/\{\\color{red}${AUXCMD}\n\\DIF$1\n\}${AUXCMD}/sg;
+ } else {
+ # currently if colour markup is not used just remove the added mark
+ s/\\DIFDIFadd(verb\*?|lstinline)/\\DIF$1/sg;
+ s/\\DIFDIFdel((?:verb\*?|lstinline(?:\[$brat_n\])?)\{[-\d]*?\}[\s\n]*$AUXCMD\n)//sg;
+ }
+ # expand \verb and friends inline arguments
+ s/\\DIF((?:DIFadd|DIFdel)?(?:verb\*?|lstinline(?:\[$brat_n\])?))\{([-\d]*?)\}/"\\${1}". fromhash(\%verbhash,$2)/esg;
+ # add basicstyle color{blue} to added lstinline commands
+ # finally add the comment to the ones not having an optional argument before
+ ###s/\\DIFaddlstinline(?!\[)/\\lstinline\n[basicstyle=\\color{blue}]$AUXCMD\n/g;
+
+ return;
+ }
+}
+
+# $out = restore_item_commands($listenviron)
+# short helper function for post-process, which restores deleted \item commands in its argument (as DIFAUXCMDs)
+sub restore_item_commands {
+ my ($string)=@_ ;
+ my ($itemarg,@itemargs);
+ $string =~ s/(\%DIFDELCMD < \s*(\\$ITEMCMD$extraspace)((?:<$abrat0>)?$extraspace)((?:\[$brat_n\])?)\s*((?:${cmdoptseq}\s*?)*)(?:\n|$DELCMDCLOSE))/
+ # if \item has an []argument, then mark up the argument as deleted)
+ if (length($4)>0) {
+ # use substr to exclude square brackets at end points
+ @itemargs=splitlatex(substr($4,1,length($4)-2));
+ $itemarg="[".join("",marktags("","",$DELOPEN,$DELCLOSE,$DELCMDOPEN,$DELCMDCLOSE,$DELCOMMENT,\@itemargs))."]";
+ } else {
+ $itemarg="";
+ }
+ "$1$2$3$itemarg$AUXCMD\n"; ###.((length($5)>0) ? "%DIFDELCMD $5 $DELCMDCLOSE\n" : "")
+ /sge;
+ return($string);
+}
+
+
+# @auxlines=preprocess_preamble($oldpreamble,$newpreamble);
+ # pre-process preamble by looking for commands used in \maketitle (title, author, date etc commands)
+ # the list of commands is defined in CONTEXT2CMD
+ # if found then use a bodydiff to mark up content, and replace the corresponding commands
+ # in both preambles by marked up version to 'fool' the linediff (such that only body is marked
+ # up.
+ # A special case are e.g. author commands being added (or removed)
+ # 1. If commands are added, then the entire content is marked up as new, but also the lines are marked as new in the linediff
+ # 2. If commands are removed, then the linediff will mark the line as deleted. The program returns
+ # with $auxlines a text to be appended at the end of the preamble, which shows the respective fields as deleted
+sub preprocess_preamble {
+ my ($oldpreambleref,$newpreambleref)=(\$_[0],\$_[1]) ;
+ my @auxlines=();
+ # Remember to use $$oldpreambleref to refer to oldpreamble
+ my ($titlecmd,$titlecmdpat);
+ my (@oldtitlecommands,@newtitlecommands );
+ my %oldhash = ();
+ my %newhash = ();
+ my ($line,$cmd,$optarg,$arg,$optargnew,$optargold,$optargdiff,$argold,$argnew,$argdiff,$auxline);
+
+ my $warnmsgdetail = <<EOF ;
+ This should not occur for standard styles, but can occur for some specifiy styles, document classes,
+ e.g. journal house styles.
+ Workaround: Use --replace-context2cmd option to specifically set those commands, which are not repeated.
+EOF
+
+ # resuse context2cmdlist to define these commands to look out for in preamble
+ $titlecmd = "(?:".join("|",@CONTEXT2CMDLIST).")";
+ # as context2cmdlist is stored as regex, e.g. ((?-xism:^title$), we need to remove ^- fo
+ # resue in a more complex regex
+ $titlecmd =~ s/[\$\^]//g;
+ # make sure to not match on comment lines:
+ $titlecmdpat=qr/^(?:[^%\n]|\\%)*(\\($titlecmd)$extraspace(?:\[($brat_n)\])?(?:\{($pat_n)\}))/ms;
+ ###print STDERR "DEBUG:",$titlecmdpat,"\n";
+ @oldtitlecommands= ( $$oldpreambleref =~ m/$titlecmdpat/g );
+ @newtitlecommands= ( $$newpreambleref =~ m/$titlecmdpat/g );
+
+
+ while ( @oldtitlecommands ) {
+ $line=shift @oldtitlecommands;
+ $cmd=shift @oldtitlecommands;
+ $optarg=shift @oldtitlecommands;
+ $arg=shift @oldtitlecommands;
+
+ if ( defined($oldhash{$cmd})) {
+ warn "WARNING: $cmd is used twice in preamble of old file. Reverting to pure line diff mode for preamble.\n";
+ print STDERR $warnmsgdetail;
+ return;
+ }
+ $oldhash{$cmd}=[ $line, $optarg, $arg ];
+ }
+ while ( @newtitlecommands ) {
+ $line=shift @newtitlecommands;
+ $cmd=shift @newtitlecommands;
+ $optarg=shift @newtitlecommands;
+ $arg=shift @newtitlecommands;
+
+ if ( defined($newhash{$cmd})) {
+ warn "$cmd is used twice in preamble of new file. Reverting to pure line diff mode for preamble.\n";
+ print STDERR $warnmsgdetail;
+ return;
+ }
+ $newhash{$cmd}=[ $line, $optarg, $arg ];
+ }
+ foreach $cmd ( keys %newhash ) {
+ if ( defined($newhash{$cmd}->[1])) {
+ $optargnew=$newhash{$cmd}->[1];
+ } else {
+ $optargnew="";
+ }
+ if ( defined($oldhash{$cmd}->[1])) {
+ $optargold=$oldhash{$cmd}->[1];
+ } else {
+ $optargold="";
+ }
+
+ if ( defined($oldhash{$cmd}->[2]) ) {
+ $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}) ;
+ $argold=$oldhash{$cmd}->[2];
+ $argdiff="{" . join("",bodydiff($argold,"")) ."}";
+ 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="";
+ }
+ $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)
+# This is used for command lists and configuration variables, but the processing is slightly
+# different:
+# For lists, the regular expression is extended to include beginning (^) and end ($) markers, to require full-string matching
+# For configuration variables (and all others), simply an unadorned list is copied
+sub init_regex_arr_data {
+ my ($arr,$token)=@_;
+ my $copy=0;
+ my ($mode);
+ if ($token =~ m/COMMANDS/ ) {
+ $mode=0; # Reading command list
+ } else {
+ $mode=1; # Reading configuration variables
+ }
+
+ while (<DATA>) {
+ if ( m/^%%BEGIN $token\s*$/ ) {
+ $copy=1;
+ next;
+ } elsif ( m/^%%END $token\s*$/ ) {
+ last; }
+ chomp;
+ if ( $mode==0 ) {
+# print STDERR "DEBUG init_regex_arr_data regex >$_<\n" if ($debug && $copy);
+ push (@$arr,qr/^$_$/) if ( $copy && !/^%/ ) ;
+ } elsif ($mode==1) {
+ push (@$arr,"$_") if ( $copy && !/^%/ ) ;
+ }
+ }
+ seek DATA,0,0; # rewind DATA handle to file begin
+}
+
+
+# init_regex_arr_ext(\@array,$arg)
+# appends 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)=@_;
+ if ( -f $arg ) {
+ init_regex_arr_file($arr,$arg);
+ } else {
+ init_regex_arr_list($arr,$arg);
+ }
+}
+
+# init_regex_arr_file(\@array,$fname)
+# appends array with regular expressions.
+# Read in list of regular expressions from $fname
+# (one expression per line)
+sub init_regex_arr_file {
+ my ($arr,$fname)=@_;
+ open(FILE,"$fname") or die ("Couldn't open $fname: $!");
+ while (<FILE>) {
+ chomp;
+ next if /^\s*#/ || /^\s*%/ || /^\s*$/ ;
+ push (@$arr,qr/^$_$/);
+ }
+ close(FILE);
+}
+
+# init_regex_arr_list(\@array,$arg)
+# appends array with regular expressions.
+# read from comma separated list of regular expressions ($arg)
+sub init_regex_arr_list {
+ my ($arr,$arg)=@_;
+ my $regex;
+ ### print STDERR "DEBUG init_regex_arr_list arg >$arg<\n" if $debug;
+ foreach $regex (split(qr/(?<!\\),/,$arg)) {
+ $regex =~ s/\\,/,/g;
+ print STDERR "DEBUG init_regex_arr_list regex >$regex<\n" if $debug;
+ push (@$arr,qr/^$regex$/);
+ }
+}
+
+
+#exetime() returns time since last execution of this command
+#exetime(1) resets this time
+my $lasttime=-1; # global variable for persistence
+sub exetime {
+ my $reset=0;
+ my $retval;
+ if ((scalar @_) >=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. Note that old.tex and new.tex need to
+be real files (not pipes or similar) as they are opened twice.
+
+--type=markupstyle
+-t markupstyle Add code to preamble for selected markup style
+ Available styles: UNDERLINE CTRADITIONAL TRADITIONAL CFONT FONTSTRIKE INVISIBLE
+ CHANGEBAR CCHANGEBAR CULINECHBAR CFONTCHBAR BOLD PDFCOMMENT
+ [ 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 MARGIN DVIPSCOL COLOR ZLABEL ONLYCHANGEDPAGE (LABEL)*
+ [ Default: SAFE ]
+ * LABEL subtype is deprecated
+
+--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.
+ context2 commands are also the only commands in the preamble, whose argument will
+ be processed in word-by-word mode (which only works, if they occur no more than
+ once in the preamble).
+
+--exclude-mboxsafecmd=exclude-file
+--exclude-mboxsafecmd="cmd1,cmd2,..."
+--append-mboxsafecmd=append-file
+--append-mboxsafecmd="cmd1,cmd2,..."
+ Define safe commands, which additionally need to be protected by encapsulating
+ in an \\mbox{..}. This is sometimes needed to get around incompatibilities
+ between external packages and the ulem package, which is used for highlighting
+ in the default style UNDERLINE as well as CULINECHBAR CFONTSTRIKE
+
+
+
+--config var1=val1,var2=val2,...
+-c var1=val1,.. Set configuration variables.
+-c configfile Available variables:
+ ARRENV (RegEx)
+ COUNTERCMD (RegEx)
+ FLOATENV (RegEx)
+ ITEMCMD (RegEx)
+ LISTENV (RegEx)
+ MATHARRENV (RegEx)
+ MATHARRREPL (String)
+ MATHENV (RegEx)
+ MATHREPL (String)
+ MINWORDSBLOCK (Integer)
+ PICTUREENV (RegEx)
+ SCALEDELGRAPHICS (Float)
+ VERBATIMENV (RegEx)
+ VERBATIMLINEENV (RegEx)
+ CUSTOMDIFCMD (RegEx)
+ This option can be repeated.
+
+--add-to-config varenv1=pattern1,varenv2=pattern2
+ For configuration variables containing a regular expression (essentially those ending
+ in ENV, and COUNTERCMD) this provides an alternative way to modify the configuration
+ variables. Instead of setting the complete pattern, with this option it is possible to add an
+ alternative pattern. varenv must be one of the variables listed above that take a regular
+ expression as argument, and pattern is any regular expression (which might need to be
+ protected from the shell by quotation). Several patterns can be added at once by using semi-colons
+ to separate them, e.g. --add-to-config "LISTENV=myitemize;myenumerate,COUNTERCMD=endnote"
+
+--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 apacite siunitx cleveref glossaries mhchem chemformula/chemmacros
+ [ 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.
+
+--graphics-markup=level Change highlight style for graphics embedded with \\includegraphics commands
+ Possible values for level:
+ none,off or 0: no highlighting for figures
+ new-only or 1: surround newly added or changed figures with a blue frame [Default]
+ both or 2: highlight new figures with a blue frame and show deleted figures
+ at reduced scale, and crossed out with a red diagonal cross. Use configuration
+ variable SCALEDELGRAPHICS to set size of deleted figures.
+ Note that changes to the optional parameters will make the figure appear as changed
+ to latexdiff, and this figure will thus be highlighted.
+
+--disable-citation-markup
+--disable-auto-mbox Suppress citation markup and markup of other vulnerable commands in styles
+ using ulem (UNDERLINE,FONTSTRIKE, CULINECHBAR)
+ (the two options are identical and are simply aliases)
+
+--enable-citation-markup
+--enforce-auto-mbox Protect citation commands and other vulnerable commands in changed sections
+ with \\mbox command, i.e. use default behaviour for ulem package for other packages
+ (the two options are identical and are simply aliases)
+
+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
+
+--visible-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.
+
+Internal options:
+These options are mostly for automated use by latexdiff-vc. They can be used directly, but
+the API should be considered less stable than for the other options.
+
+--no-links Suppress generation of hyperreferences, used for minimal diffs
+ (option --only-changes of latexdiff-vc).
+EOF
+}
+
+=head1 NAME
+
+latexdiff - determine and markup differences between two latex files
+
+=head1 SYNOPSIS
+
+B<latexdiff> [ B<OPTIONS> ] F<old.tex> F<new.tex> > F<diff.tex>
+
+=head1 DESCRIPTION
+
+Briefly, I<latexdiff> is a utility program to aid in the management of
+revisions of latex documents. It compares two valid latex files, here
+called C<old.tex> and C<new.tex>, 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. Note that old.tex and new.tex need to
+be real files (not pipes or similar) as they are opened twice (unless C<--encoding> option is used)
+
+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<C<%DIF E<gt>>>" is appended to each added line, i.e. a
+line present in C<new.tex> but not in C<old.tex>. Discarded lines
+ are deactivated by prepending "S<C<%DIF E<lt>>>". 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<diff.tex> will be similar to
+C<new.tex>. At the end of the preamble, the definitions for I<latexdiff> markup commands are inserted.
+In differencing the main body of the text, I<latexdiff> attempts to
+satisfy the following guidelines (in order of priority):
+
+=over 3
+
+=item 1
+
+If both C<old.tex> and C<new.tex> are valid LaTeX, then the resulting
+C<diff.tex> should also be valid LateX. (NB If a few plain TeX commands
+are used within C<old.tex> or C<new.tex> then C<diff.tex> 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<diff.tex>.
+
+=item 3
+
+If a changed passage contains text or text-producing commands, then
+running C<diff.tex> 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<diff.tex> should follow the formatting of C<new.tex>
+
+=back
+
+For differencing the same algorithm as I<diff> 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<picture> and C<DIFnomarkup> environments; see B<--config>
+option). The latter environment (C<DIFnomarkup>) 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<latexdiff> begin with "C<\DIF>". Added
+blocks containing words, commands or comments which are in C<new.tex>
+but not in C<old.tex> 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<C<%DIF E<gt> >>".
+
+Within deleted blocks text is highlighted with C<\DIFdel>. Deleted
+comments are marked by prepending "S<C<%DIF E<lt> >>". Non-safe command
+and curly braces within deleted blocks are commented out with
+"S<C<%DIFDELCMD E<lt> >>".
+
+
+
+=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<UNDERLINE CTRADITIONAL TRADITIONAL CFONT FONTSTRIKE INVISIBLE
+CHANGEBAR CCHANGEBAR CULINECHBAR CFONTCHBAR BOLD PDFCOMMENT>
+
+[ Default: C<UNDERLINE> ]
+
+=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<SAFE MARGIN COLOR DVIPSCOL ZLABEL ONLYCHANGEDPAGE (LABEL)*>
+
+[ Default: C<SAFE> ]
+* Subtype C<LABEL> is deprecated
+
+=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<FLOATSAFE TRADITIONALSAFE IDENTICAL>
+
+[ Default: C<FLOATSAFE> ]
+
+=item B<--encoding=enc> or
+B<-e enc>
+
+Specify encoding of old.tex and new.tex. Typical encodings are
+C<ascii>, C<utf8>, C<latin1>, C<latin9>. A list of available encodings can be
+obtained by executing
+
+C<perl -MEncode -e 'print join ("\n",Encode->encodings( ":all" )) ;' >
+
+If this option is used, then old.tex, new.tex are only opened once.
+[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<amsmath>
+
+Configuration variable MATHARRREPL is set to C<align*> (Default: C<eqnarray*>). (Note that many of the
+amsmath array environments are already recognised by default as such)
+
+=item C<endfloat>
+
+Ensure that C<\begin{figure}> and C<\end{figure}> always appear by themselves on a line.
+
+=item C<hyperref>
+
+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).
+
+=item C<apacite>
+
+Redefine the commands recognised as citation commands.
+
+=item C<siunitx>
+
+Treat C<\SI> as equivalent to citation commands (i.e. protect with C<\mbox> if markup style uses ulem package.
+
+=item C<cleveref>
+
+Treat C<\cref,\Cref>, etc as equivalent to citation commands (i.e. protect with C<\mbox> if markup style uses ulem package.
+
+=item C<glossaries>
+
+Define most of the glossaries commands as safe, protecting them with \mbox'es where needed
+
+=item C<mhchem>
+
+Treat C<\ce> as a safe command, i.e. it will be highlighted (note that C<\cee> will not be highlighted in equations as this leads to processing errors)
+
+=item C<chemformula> or C<chemmacros>
+
+Treat C<\ch> as a safe command outside equations, i.e. it will be highlighted (note that C<\ch> will not be highlighted in equations as this leads to processing 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. C<\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.
+
+context2 commands are also the only commands in the preamble, whose argument will be processed in
+word-by-word mode (which only works, if they occur no more than once in the preamble). The algorithm currently cannot cope with repeated context2 commands in the preamble, as they occur e.g. for the C<\author> argument in some journal styles (not in the standard styles, though
+If such a repetition is detected, the whole preamble will be processed in line-by-line mode. In such a case, use C<--replace-context2cmd> option to just select the commands, which should be processed and are not used repeatedly in the preamble.
+
+
+
+=item B<--exclude-mboxsafecmd=exclude-file> or B<--exclude-mboxsafecmd="cmd1,cmd2,...">
+
+=item B<--append-mboxsafecmd=append-file> or B<--append-mboxsafecmd="cmd1,cmd2,...">
+
+Define safe commands, which additionally need to be protected by encapsulating
+in an C<\mbox{..}>. This is sometimes needed to get around incompatibilities
+between external packages and the ulem package, which is used for highlighting
+in the default style UNDERLINE as well as CULINECHBAR CFONTSTRIKE
+
+
+
+
+
+=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<ARRENV> (RegEx)
+
+C<COUNTERCMD> (RegEx)
+
+C<CUSTODIFCMD> (RegEx)
+
+C<FLOATENV> (RegEx)
+
+C<ITEMCMD> (RegEx)
+
+C<LISTENV> (RegEx)
+
+C<MATHARRENV> (RegEx)
+
+C<MATHARRREPL> (String)
+
+C<MATHENV> (RegEx)
+
+C<MATHREPL> (String)
+
+C<MINWORDSBLOCK> (Integer)
+
+C<PICTUREENV> (RegEx)
+
+C<SCALEDELGRAPHICS> (Float)
+
+
+=item B<--add-to-config varenv1=pattern1,varenv2=pattern2,...>
+
+For configuration variables, which are a regular expression (essentially those ending
+in ENV, COUNTERCMD and CUSTOMDIFCMD, see list above) this option provides an alternative way to modify the configuration
+variables. Instead of setting the complete pattern, with this option it is possible to add an
+alternative pattern. C<varenv> must be one of the variables listed above that take a regular
+expression as argument, and pattern is any regular expression (which might need to be
+protected from the shell by quotation). Several patterns can be added at once by using semi-colons
+to separate them, e.g. C<--add-to-config "LISTENV=myitemize;myenumerate,COUNTERCMD=endnote">
+
+=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<old.tex> or C<new.tex> 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<off> 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<whole> 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<coarse> 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<fine> 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<--graphics-markup=level>
+
+ Change highlight style for graphics embedded with C<\includegraphics> commands.
+
+Possible values for level:
+
+C<none>, C<off> or C<0>: no highlighting for figures
+
+C<new-only> or C<1>: surround newly added or changed figures with a blue frame [Default if graphicx package loaded]
+
+C<both> or C<2>: highlight new figures with a blue frame and show deleted figures at reduced
+scale, and crossed out with a red diagonal cross. Use configuration
+variable SCALEDELGRAPHICS to set size of deleted figures.
+
+Note that changes to the optional parameters will make the figure appear as changed
+to latexdiff, and this figure will thus be highlighted
+
+=item B<--disable-citation-markup> or B<--disable-auto-mbox>
+
+Suppress citation markup and markup of other vulnerable commands in styles
+using ulem (UNDERLINE,FONTSTRIKE, CULINECHBAR)
+(the two options are identical and are simply aliases)
+
+=item B<--enable-citation-markup> or B<--enforce-auto-mbox>
+
+Protect citation commands and other vulnerable commands in changed sections
+with C<\mbox> command, i.e. use default behaviour for ulem package for other packages
+(the two options are identical and are simply aliases)
+
+=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<latexdiff> 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<--visible-label>
+
+Include old and new filenames (or labels set with C<--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 Internal options
+
+These options are mostly for automated use by latexdiff-vc. They can be used directly, but the API should be considered less stable than for the other options.
+
+=over 4
+
+=item B<--no-links>
+
+Suppress generation of hyperreferences, used for minimal diffs (option --only-changes of latexdiff-vc)
+
+=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<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).
+
+=item C<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)
+
+=item C<TRADITIONAL>
+
+Like C<CTRADITIONAL> but without the use of color.
+
+=item C<CFONT>
+
+Added text is blue and set in sans-serif, and discarded text is red and very small size.
+
+=item C<FONTSTRIKE>
+
+Added tex is set in sans-serif, discarded text small and struck out
+
+=item C<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).
+
+=item C<CFONTCHBAR>
+
+Like C<CFONT> but with additional changebars (Requires color and changebar packages).
+
+=item C<CULINECHBAR>
+
+Like C<UNDERLINE> but with additional changebars (Requires color, ulem and changebar packages).
+
+=item C<CHANGEBAR>
+
+No mark up of text, but mark margins with changebars (Requires changebar package).
+
+=item C<INVISIBLE>
+
+No visible markup (but generic markup commands will still be inserted.
+
+=item C<BOLD>
+
+Added text is set in bold face, discarded is not shown.
+
+=item C<PDFCOMMENT>
+
+The pdfcomment package is used to underline new text, and mark deletions with a PDF comment. Note that this markup might appear differently or not at all based on the pdf viewer used. The viewer with best support for pdf markup is probably acroread. This style is only recommended if the number of differences is small.
+
+=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<SAFE>
+
+No additional markup (Recommended choice)
+
+=item C<MARGIN>
+
+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<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).
+
+=item C<DVIPSCOL>
+
+An alternative way of marking added passages in blue, and deleted ones in red. Note
+that C<DVIPSCOL> 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).
+
+
+=item C<ZLABEL>
+
+can be used to highlight only changed pages, but requires post-processing. It is recommend to not call this option manually but use C<latexdiff-vc> with C<--only-changes> option. Alternatively, use the script given within preamble of diff files made using this style.
+
+=item C<ONLYCHANGEDPAGE>
+
+also highlights changed pages, without the need for post-processing, but might not work reliably if
+there is floating material (figures, tables).
+
+=item C<LABEL>
+
+is similar to C<ZLABEL>, but does not need the zref package and works less reliably (deprecated).
+
+=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<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 C<MARGIN> as C<\marginpar> does not work properly within floats.
+
+=item C<TRADITIONALSAFE>
+
+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<TRADITIONAL> and C<CTRADITIONAL> markup types as the \footnote command does not work properly in floating environments.
+
+=item C<IDENTICAL>
+
+Make no difference between the main text and floats.
+
+=back
+
+
+=head2 Configuration Variables
+
+=over 10
+
+=item C<ARRENV>
+
+If a match to C<ARRENV> is found within an inline math environment within a deleted or added block, then the inlined math
+is surrounded by C<\mbox{>...C<}>. This is necessary as underlining does not work within inlined array environments.
+
+[ Default: C<ARRENV>=S<C<(?:array|[pbvBV]matrix)> >
+
+=item C<COUNTERCMD>
+
+If a command in a deleted block which is also in the textcmd list matches C<COUNTERCMD> then an
+additional command C<\addtocounter{>F<cntcmd>C<}{-1}>, where F<cntcmd> is the matching command, is appended in the diff file such that the numbering in the diff file remains synchronized with the
+numbering in the new file.
+
+[ Default: C<COUNTERCMD>=C<(?:footnote|part|section|subsection> ...
+
+C<|subsubsection|paragraph|subparagraph)> ]
+
+=item C<CUSTOMDIFCMD>
+
+This option is for advanced users and allows definition of special versions of commands, which do not work as safe commands.
+
+Commands in C<CUSTOMDIFCMD> that occur in added or deleted blocks will be given an ADD or DEL prefix.
+The prefixed versions of the command must be defined in the preamble, either by putting them
+in the preamble of at least the new file, or by creating a custom preamble file (Option --preamble).
+For example the command C<\blindtext> (from package blindtext) does not interact well with underlining, so that
+for the standard markup type, it is not satisfactory to define it as a safe command. Instead, a customised versions
+without underlining can be defined in the preamble:
+
+C<\newcommand{\DELblindtext}{{\color{red}\blindtext}}>
+
+C<\newcommand{\ADDblindtext}{{\color{blue}\blindtext}}>
+
+and then latexdiff should be invoked with the option C<-c CUSTOMDIFCMD=blindtext>.
+
+[ Default: none ]
+
+=item C<FLOATENV>
+
+Environments whose name matches the regular expression in C<FLOATENV> are
+considered floats. Within these environments, the I<latexdiff> markup commands
+are replaced by their FL variaties.
+
+[ Default: S<C<(?:figure|table|plate)[\w\d*@]*> >]
+
+=item C<ITEMCMD>
+
+Commands representing new item line with list environments.
+
+[ Default: \C<item> ]
+
+=item C<LISTENV>
+
+Environments whose name matches the regular expression in C<LISTENV> are list environments.
+
+[ Default: S<C<(?:itemize|enumerate|description)> >]
+
+=item C<MATHENV>,C<MATHREPL>
+
+If both \begin and \end for a math environment (environment name matching C<MATHENV> or \[ and \])
+are within the same deleted block, they are replaced by a \begin and \end commands for C<MATHREPL>
+rather than being commented out.
+
+[ Default: C<MATHENV>=S<C<(?:displaymath|equation)> >, C<MATHREPL>=S<C<displaymath> >]
+
+=item C<MATHARRENV>,C<MATHARRREPL>
+
+as C<MATHENV>,C<MATHREPL> but for equation arrays
+
+[ Default: C<MATHARRENV>=S<C<eqnarray\*?> >, C<MATHREPL>=S<C<eqnarray> >]
+
+=item C<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 C<MINWORDSBLOCK> to the preceding added and discarded parts.
+
+[ Default: 3 ]
+
+=item C<PICTUREENV>
+
+Within environments whose name matches the regular expression in C<PICTUREENV>
+all latexdiff markup is removed (in pathologic cases this might lead to
+inconsistent markup but this situation should be rare).
+
+[ Default: S<C<(?:picture|DIFnomarkup)[\w\d*@]*> >]
+
+=item C<SCALEDELGRAPHICS>
+
+If C<--graphics-markup=both> is chosen, C<SCALEDELGRAPHICS> is the factor, by which deleted figures will be scaled (i.e. 0.5 implies they are shown at half linear size).
+
+[ Default: 0.5 ]
+
+=item C<VERBATIMENV>
+
+RegEx describing environments like verbatim, whose contents should be taken verbatim. The content of these environments will not be processed in any way:
+deleted content is commented out, new content is not marked up
+
+[ Default: S<C<comment> > ]
+
+=item C<VERBATIMLINEENV>
+
+RegEx describing environments like verbatim, whose contents should be taken verbatim. The content of environments described by VERBATIMLINEENV are compared in
+line mode, and changes are marked up using the listings package. The markup style is set based on the chosen mains markup type (Option -t), or on an analysis
+of the preamble.
+Note that "listings.sty" must be installed. If this file is not found the fallback solution is to
+treat VERBATIMLINEENV environments treated exactly the same way as VERBATIMENV environments.
+
+[ Default: S<C<(?:verbatim[*]?|lstlisting> > ]
+
+=back
+
+=head1 COMMON PROBLEMS AND FAQ
+
+=over 10
+
+=item Citations result in overfull boxes
+
+There is an incompatibility between the C<ulem> package, which C<latexdiff> uses for underlining and striking out in the UNDERLINE style,
+the default style, and the way citations are generated. In order to be able to mark up citations properly, they are enclosed with an C<\mbox>
+command. 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. The same occurs for some other packages (e.g., siunitx). If this is a problem, you have two possibilities.
+
+1. Use C<CFONT> type markup (option C<-t CFONT>): 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, and deleted text is shown with a different font. Other styles not using the C<ulem> package will also work.
+
+2. Choose option C<--disable-citation-markup> which turns off the marking up of citations: deleted citations are no longer shown, and
+added citations are shown without markup. (This was the default behaviour of latexdiff at versions 0.6 and older)
+
+For custom packages you can define the commands which need to be protected by C<\mbox> with C<--append-mboxsafecmd> and C<--excludemboxsafecmd> options
+(submit your lists of command as feature request at github page to set the default behaviour of future versions, see section 6)
+
+=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>.
+
+=item How can I just show the pages where changes had been made
+
+Use options -C<-s ZLABEL> (some postprocessing required) or C<-s ONLYCHANGEDPAGE>. C<latexdiff-vc --ps|--pdf> with C<--only-changes> option takes care of
+the post-processing for you (requires zref package to be installed).
+
+=back
+
+=head1 BUGS
+
+=over 10
+
+=item 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.
+
+=back
+
+Please submit bug reports using the issue tracker of the github repository page I<https://github.com/ftilmann/latexdiff.git>,
+or send them to I<tilmann -- AT -- gfz-potsdam.de>. Include the version number of I<latexdiff>
+(from comments at the top of the source or use B<--version>). If you come across latex
+files that are error-free and conform to the specifications set out
+above, and whose differencing still does not result in error-free
+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<latexrevise>, L<latexdiff-vc>
+
+=head1 PORTABILITY
+
+I<latexdiff> 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<latexdiff> requires installation of the Perl package
+C<Algorithm::Diff> (available from I<www.cpan.org> -
+I<http://search.cpan.org/~nedkonz/Algorithm-Diff-1.15>) but a stand-alone
+version, I<latexdiff-so>, which has this package inlined, is available, too.
+I<latexdiff-fast> requires the I<diff> command to be present.
+
+=head1 AUTHOR
+
+Version 1.3.0
+Copyright (C) 2004-2018 Frederik Tilmann
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License Version 3
+
+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 sent 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
+[Hclbkdruvt]
+[`'^"~=.]
+_
+AMPERSAND
+(SUPER|SUB)SCRIPTNB
+(SUPER|SUB)SCRIPT
+SQRT
+SQRTNB
+PERCENTAGE
+DOLLAR
+%%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
+intertext
+part
+(sub){0,2}section\*?
+(sub)?paragraph\*?
+makebox
+mbox
+opening
+parbox
+raisebox
+savebox
+sbox
+shortintertext
+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. These commands behave like text commands, except when they occur in a deleted section, where they are disabled, but their argument is shown as deleted text.
+caption
+subcaption
+%%END CONTEXT1 COMMANDS
+
+%%BEGIN CONTEXT2 COMMANDS
+% Regex matching commands with a text argument (leave out the \), which will fail out of context. As corresponding commands for context1. The only difference is that context2 commands are completely disabled in deleted sections, including their arguments.
+title
+author
+date
+institute
+%%END CONTEXT2 COMMANDS
+
+%% CONFIGURATION variabe defaults
+%%BEGIN LISTENV CONFIG
+itemize
+description
+enumerate
+%%END LISTENV CONFIG
+
+%%BEGIN FLOATENV CONFIG
+figure[\w\d*@]*
+table[\w\d*@]*
+plate[\w\d*@]*
+%%END FLOATENV CONFIG
+
+%%BEGIN PICTUREENV CONFIG
+picture[\w\d*@]*
+tikzpicture[\w\d*@]*
+DIFnomarkup
+%%END PICTUREENV CONFIG
+
+%%BEGIN MATHENV CONFIG
+equation[*]?
+displaymath
+DOLLARDOLLAR
+%%END MATHENV CONFIG
+
+%%BEGIN MATHARRENV CONFIG
+eqnarray[*]?
+align[*]?
+alignat[*]?
+gather[*]?
+multline[*]?
+flalign[*]?
+%%END MATHARRENV CONFIG
+
+%%BEGIN ARRENV CONFIG
+aligned
+gathered
+array
+[pbvBV]?matrix
+smallmatrix
+cases
+split
+%%END ARRENV CONFIG
+
+%%BEGIN COUNTERCMD CONFIG
+footnote
+part
+chapter
+section
+subsection
+subsubsection
+paragraph
+subparagraph
+%%END COUNTERCMD CONFIG
+
+%%BEGIN VERBATIMENV CONFIG
+comment
+%%END VERBATIMENV CONFIG
+
+%%BEGIN VERBATIMLINEENV CONFIG
+lstlisting
+verbatim[*]?
+%%END VERBATIMLINEENV CONFIG
+
+%%BEGIN CUSTOMDIFCMD CONFIG
+%%END CUSTOMDIFCMD CONFIG
+
+%%% 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}
+\DeclareOldFontCommand{\sf}{\normalfont\sffamily}{\mathsf}
+\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}
+\DeclareOldFontCommand{\sf}{\normalfont\sffamily}{\mathsf}
+\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}
+\DeclareOldFontCommand{\sf}{\normalfont\sffamily}{\mathsf}
+\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}
+\DeclareOldFontCommand{\sf}{\normalfont\sffamily}{\mathsf}
+\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
+
+%DIF BOLD PREAMBLE
+\DeclareOldFontCommand{\bf}{\normalfont\bfseries}{\mathbf}
+\providecommand{\DIFadd}[1]{{\bf #1}}
+\providecommand{\DIFdel}[1]{}
+%DIF END BOLD PREAMBLE
+
+%DIF PDFCOMMENT PREAMBLE
+\RequirePackage{pdfcomment} %DIF PREAMBLE
+\providecommand{\DIFadd}[1]{\pdfmarkupcomment[author=ADD:,markup=Underline]{#1}{}}
+\providecommand{\DIFdel}[1]{\pdfcomment[icon=Insert,author=DEL:,hspace=12pt]{#1}}
+%DIF END PDFCOMMENT PREAMBLE
+
+%% SUBTYPES (Markers for beginning and end of changed blocks)
+
+%DIF SAFE PREAMBLE
+\providecommand{\DIFaddbegin}{}
+\providecommand{\DIFaddend}{}
+\providecommand{\DIFdelbegin}{}
+\providecommand{\DIFdelend}{}
+\providecommand{\DIFmodbegin}{}
+\providecommand{\DIFmodend}{}
+%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{]}}
+\providecommand{\DIFmodbegin}{\protect\marginpar{m[}}
+\providecommand{\DIFmodend}{\protect\marginpar{]}}
+%DIF END MARGIN 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}}
+\providecommand{\DIFmodbegin}{}
+\providecommand{\DIFmodend}{}
+%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}}
+\providecommand{\DIFmodbegin}{}
+\providecommand{\DIFmodend}{}
+%DIF END COLOR PREAMBLE
+
+%DIF LABEL PREAMBLE
+% To show only pages with changes (pdf) (external program pdftk needs to be installed)
+% (only works for simple documents with non-repeated page numbers, otherwise use ZLABEL)
+% pdflatex diff.tex
+% pdflatex diff.tex
+%pdftk diff.pdf cat \
+%`perl -lne '\
+% if (m/\\newlabel{DIFchg[b](\d*)}{{.*}{(.*)}}/) { $start{$1}=$2; print $2}\
+% if (m/\\newlabel{DIFchg[e](\d*)}{{.*}{(.*)}}/) { \
+% if (defined($start{$1})) { \
+% for ($j=$start{$1}; $j<=$2; $j++) {print "$j";}\
+% } else { \
+% print "$2"\
+% }\
+% }' diff.aux \
+% | uniq \
+% | tr \\n ' '` \
+% output diff-changedpages.pdf
+% To show only pages with changes (dvips/dvipdf)
+% dvips -pp `\
+% [ put here the perl script from above]
+% | uniq | tr -s \\n ','`
+\typeout{Check comments in preamble of output for instructions how to show only pages where changes have been made}
+\newcount\DIFcounterb
+\global\DIFcounterb 0\relax
+\newcount\DIFcountere
+\global\DIFcountere 0\relax
+\providecommand{\DIFaddbegin}{\global\advance\DIFcounterb 1\relax\label{DIFchgb\the\DIFcounterb}}
+\providecommand{\DIFaddend}{\global\advance\DIFcountere 1\relax\label{DIFchge\the\DIFcountere}}
+\providecommand{\DIFdelbegin}{\global\advance\DIFcounterb 1\relax\label{DIFchgb\the\DIFcounterb}}
+\providecommand{\DIFdelend}{\global\advance\DIFcountere 1\relax\label{DIFchge\the\DIFcountere}}
+\providecommand{\DIFmodbegin}{\global\advance\DIFcounterb 1\relax\label{DIFchgb\the\DIFcounterb}}
+\providecommand{\DIFmodend}{\global\advance\DIFcountere 1\relax\label{DIFchge\the\DIFcountere}}
+%DIF END LABEL PREAMBLE
+
+%DIF ZLABEL PREAMBLE
+% To show only pages with changes (pdf) (external program pdftk needs to be installed)
+% (uses zref for reference to absolute page numbers)
+% pdflatex diff.tex
+% pdflatex diff.tex
+%pdftk diff.pdf cat \
+%`perl -lne 'if (m/\\zref\@newlabel{DIFchgb(\d*)}{.*\\abspage{(\d*)}}/ ) { $start{$1}=$2; print $2 } \
+% if (m/\\zref\@newlabel{DIFchge(\d*)}{.*\\abspage{(\d*)}}/) { \
+% if (defined($start{$1})) { \
+% for ($j=$start{$1}; $j<=$2; $j++) {print "$j";}\
+% } else { \
+% print "$2"\
+% }\
+% }' diff.aux \
+% | uniq \
+% | tr \\n ' '` \
+% output diff-changedpages.pdf
+% To show only pages with changes (dvips/dvipdf)
+% latex diff.tex
+% latex diff.tex
+% dvips -pp `perl -lne 'if (m/\\newlabel{DIFchg[be]\d*}{{.*}{(.*)}}/) { print $1 }' diff.aux | uniq | tr -s \\n ','` diff.dvi
+\typeout{Check comments in preamble of output for instructions how to show only pages where changes have been made}
+\usepackage[user,abspage]{zref}
+\newcount\DIFcounterb
+\global\DIFcounterb 0\relax
+\newcount\DIFcountere
+\global\DIFcountere 0\relax
+\providecommand{\DIFaddbegin}{\global\advance\DIFcounterb 1\relax\zlabel{DIFchgb\the\DIFcounterb}}
+\providecommand{\DIFaddend}{\global\advance\DIFcountere 1\relax\zlabel{DIFchge\the\DIFcountere}}
+\providecommand{\DIFdelbegin}{\global\advance\DIFcounterb 1\relax\zlabel{DIFchgb\the\DIFcounterb}}
+\providecommand{\DIFdelend}{\global\advance\DIFcountere 1\relax\zlabel{DIFchge\the\DIFcountere}}
+\providecommand{\DIFmodbegin}{\global\advance\DIFcounterb 1\relax\zlabel{DIFchgb\the\DIFcounterb}}
+\providecommand{\DIFmodend}{\global\advance\DIFcountere 1\relax\zlabel{DIFchge\the\DIFcountere}}
+%DIF END ZLABEL PREAMBLE
+
+%DIF ONLYCHANGEDPAGE PREAMBLE
+\RequirePackage{atbegshi}
+\RequirePackage{etoolbox}
+\RequirePackage{zref}
+% redefine label command to write immediately to aux file - page references will be lost
+\makeatletter \let\oldlabel\label% Store \label
+\renewcommand{\label}[1]{% Update \label to write to the .aux immediately
+\zref@wrapper@immediate{\oldlabel{#1}}}
+\makeatother
+\newbool{DIFkeeppage}
+\newbool{DIFchange}
+\boolfalse{DIFkeeppage}
+\boolfalse{DIFchange}
+\AtBeginShipout{%
+ \ifbool{DIFkeeppage}
+ {\global\boolfalse{DIFkeeppage}} % True DIFkeeppage
+ {\ifbool{DIFchange}{\global\boolfalse{DIFkeeppage}}{\global\boolfalse{DIFkeeppage}\AtBeginShipoutDiscard}} % False DIFkeeppage
+}
+\providecommand{\DIFaddbegin}{\global\booltrue{DIFkeeppage}\global\booltrue{DIFchange}}
+\providecommand{\DIFaddend}{\global\booltrue{DIFkeeppage}\global\boolfalse{DIFchange}}
+\providecommand{\DIFdelbegin}{\global\booltrue{DIFkeeppage}\global\booltrue{DIFchange}}
+\providecommand{\DIFdelend}{\global\booltrue{DIFkeeppage}\global\boolfalse{DIFchange}}
+\providecommand{\DIFmodbegin}{\global\booltrue{DIFkeeppage}\global\booltrue{DIFchange}}
+\providecommand{\DIFmodend}{\global\booltrue{DIFkeeppage}\global\boolfalse{DIFchange}}
+%DIF END ONLYCHANGEDPAGE 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 TRADITIONALSAFE PREAMBLE
+
+% see:
+% http://tex.stackexchange.com/questions/47351/can-i-redefine-a-command-to-contain-itself
+
+%DIF HIGHLIGHTGRAPHICS PREAMBLE
+\RequirePackage{settobox}
+\RequirePackage{letltxmacro}
+\newsavebox{\DIFdelgraphicsbox}
+\newlength{\DIFdelgraphicswidth}
+\newlength{\DIFdelgraphicsheight}
+% store original definition of \includegraphics
+\LetLtxMacro{\DIFOincludegraphics}{\includegraphics}
+\newcommand{\DIFaddincludegraphics}[2][]{{\color{blue}\fbox{\DIFOincludegraphics[#1]{#2}}}}
+\newcommand{\DIFdelincludegraphics}[2][]{%
+\sbox{\DIFdelgraphicsbox}{\DIFOincludegraphics[#1]{#2}}%
+\settoboxwidth{\DIFdelgraphicswidth}{\DIFdelgraphicsbox}
+\settoboxtotalheight{\DIFdelgraphicsheight}{\DIFdelgraphicsbox}
+\scalebox{\DIFscaledelfig}{%
+\parbox[b]{\DIFdelgraphicswidth}{\usebox{\DIFdelgraphicsbox}\\[-\baselineskip] \rule{\DIFdelgraphicswidth}{0em}}\llap{\resizebox{\DIFdelgraphicswidth}{\DIFdelgraphicsheight}{%
+\setlength{\unitlength}{\DIFdelgraphicswidth}%
+\begin{picture}(1,1)%
+\thicklines\linethickness{2pt}
+{\color[rgb]{1,0,0}\put(0,0){\framebox(1,1){}}}%
+{\color[rgb]{1,0,0}\put(0,0){\line( 1,1){1}}}%
+{\color[rgb]{1,0,0}\put(0,1){\line(1,-1){1}}}%
+\end{picture}%
+}\hspace*{3pt}}}
+}
+\LetLtxMacro{\DIFOaddbegin}{\DIFaddbegin}
+\LetLtxMacro{\DIFOaddend}{\DIFaddend}
+\LetLtxMacro{\DIFOdelbegin}{\DIFdelbegin}
+\LetLtxMacro{\DIFOdelend}{\DIFdelend}
+\DeclareRobustCommand{\DIFaddbegin}{\DIFOaddbegin \let\includegraphics\DIFaddincludegraphics}
+\DeclareRobustCommand{\DIFaddend}{\DIFOaddend \let\includegraphics\DIFOincludegraphics}
+\DeclareRobustCommand{\DIFdelbegin}{\DIFOdelbegin \let\includegraphics\DIFdelincludegraphics}
+\DeclareRobustCommand{\DIFdelend}{\DIFOaddend \let\includegraphics\DIFOincludegraphics}
+\LetLtxMacro{\DIFOaddbeginFL}{\DIFaddbeginFL}
+\LetLtxMacro{\DIFOaddendFL}{\DIFaddendFL}
+\LetLtxMacro{\DIFOdelbeginFL}{\DIFdelbeginFL}
+\LetLtxMacro{\DIFOdelendFL}{\DIFdelendFL}
+\DeclareRobustCommand{\DIFaddbeginFL}{\DIFOaddbeginFL \let\includegraphics\DIFaddincludegraphics}
+\DeclareRobustCommand{\DIFaddendFL}{\DIFOaddendFL \let\includegraphics\DIFOincludegraphics}
+\DeclareRobustCommand{\DIFdelbeginFL}{\DIFOdelbeginFL \let\includegraphics\DIFdelincludegraphics}
+\DeclareRobustCommand{\DIFdelendFL}{\DIFOaddendFL \let\includegraphics\DIFOincludegraphics}
+%DIF END HIGHLIGHTGRAPHICS 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 PREAMBLE
+
+%DIF LISTINGS PREAMBLE
+\RequirePackage{listings}
+\RequirePackage{color}
+\lstdefinelanguage{DIFcode}{
+ % note that the definitions in the following two lines are overwritten dependent on the markup type selected %DIFCODE TEMPLATE
+ morecomment=[il]{\%DIF\ <\ }, %DIFCODE TEMPLATE
+ moredelim=[il][\bfseries]{\%DIF\ >\ } %DIFCODE TEMPLATE
+}
+\lstdefinestyle{DIFverbatimstyle}{
+ language=DIFcode,
+ basicstyle=\ttfamily,
+ columns=fullflexible,
+ keepspaces=true
+}
+\lstnewenvironment{DIFverbatim}{\lstset{style=DIFverbatimstyle}}{}
+\lstnewenvironment{DIFverbatim*}{\lstset{style=DIFverbatimstyle,showspaces=true}}{}
+%DIF END LISTINGS PREAMBLE
+
+%DIF DIFCODE_UNDERLINE
+ moredelim=[il][\color{red}\sout]{\%DIF\ <\ },
+ moredelim=[il][\color{blue}\uwave]{\%DIF\ >\ }
+%DIF END DIFCODE_UNDERLINE
+
+%DIF DIFCODE_CTRADITIONAL
+ moredelim=[il][\color{red}\scriptsize]{\%DIF\ <\ },
+ moredelim=[il][\color{blue}\sffamily]{\%DIF\ >\ }
+%DIF END DIFCODE_CTRADITIONAL
+
+%DIF DIFCODE_TRADITIONAL
+ moredelim=[il][\color{white}\tiny]{\%DIF\ <\ },
+ moredelim=[il][\sffamily]{\%DIF\ >\ }
+%DIF END DIFCODE_TRADITIONAL
+
+%DIF DIFCODE_CFONT
+ moredelim=[il][\color{red}\scriptsize]{\%DIF\ <\ },
+ moredelim=[il][\color{blue}\sffamily]{\%DIF\ >\ }
+%DIF END DIFCODE_CFONT
+
+%DIF DIFCODE_FONTSTRIKE
+ moredelim=[il][\scriptsize \sout]{\%DIF\ <\ },
+ moredelim=[il][\sffamily]{\%DIF\ >\ }
+%DIF END DIFCODE_FONTSTRIKE
+
+%DIF DIFCODE_INVISIBLE
+ moredelim=[il][\color{white}\tiny]{\%DIF\ <\ },
+ moredelim=[il]{\%DIF\ >\ }
+%DIF END DIFCODE_INVISIBLE
+
+%DIF DIFCODE_CHANGEBAR
+ moredelim=[il][\color{white}\tiny]{\%DIF\ <\ },
+ moredelim=[il]{\%DIF\ >\ }
+%DIF END DIFCODE_CHANGEBAR
+
+%DIF DIFCODE_CCHANGEBAR
+ moredelim=[il][\color{red}]{\%DIF\ <\ },
+ moredelim=[il][\color{blue}]{\%DIF\ >\ }
+%DIF END DIFCODE_CCHANGEBAR
+
+%DIF DIFCODE_CULINECHBAR
+ moredelim=[il][\color{red}\sout]{\%DIF\ <\ },
+ moredelim=[il][\color{blue}\uwave]{\%DIF\ >\ }
+%DIF END DIFCODE_CULINECHBAR
+
+%DIF DIFCODE_CFONTCHBAR
+ moredelim=[il][\color{red}\scriptsize]{\%DIF\ <\ },
+ moredelim=[il][\color{blue}\sffamily]{\%DIF\ >\ }
+%DIF END DIFCODE_CFONTCHBAR
+
+%DIF DIFCODE_BOLD
+ % unfortunately \bfseries cannot be combined with ttfamily without extra packages
+ % also morecomment=[il] is broken as of v1.5b of listings at least
+ % workaround: plot in white with tiny font
+ % morecomment=[il]{\%DIF\ <\ },
+ moredelim=[il][\color{white}\tiny]{\%DIF\ <\ },
+ moredelim=[il][\sffamily\bfseries]{\%DIF\ >\ }
+%DIF END DIFCODE_BOLD
+
+%DIF DIFCODE_PDFCOMMENT
+
+ moredelim=[il][\color{white}\tiny]{\%DIF\ <\ },
+ moredelim=[il][\sffamily\bfseries]{\%DIF\ >\ }
+%DIF END DIFCODE_PDFCOMMENT
+
diff --git a/support/latexdiff/latexdiff-so b/support/latexdiff/latexdiff-so
new file mode 100755
index 0000000000..6d07c9a88f
--- /dev/null
+++ b/support/latexdiff/latexdiff-so
@@ -0,0 +1,5487 @@
+#!/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-16 F J Tilmann (tilmann@gfz-potsdam.de)
+#
+# Repository/issue tracker: https://github.com/ftilmann/latexdiff
+# CTAN page: http://www.ctan.org/pkg/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 <http://www.gnu.org/licenses/>.
+#
+# Detailed usage information at the end of the file
+#
+
+# Version 1.3.0 (7 October 2018):
+# - treat options to \documentclass as potential package names (some packages allow implicit loading of or imply selected packages
+# - improved pattern matching: now allows nested angular brackets, and is no longer confused by escaped curly braces
+# - improved pattern matching in COARSE mode: occasionally, the closing bracket or some other elements would be matched in an 'unnatural' way due to another sequence being more minimal in the computational sense, sometimes even causing errors due to tokens moving in or out of the scope of math environments. This is now discouraged by adding internal \DIFANCHOR commands (which are removed again in post-processing) (fixes issues reported via email by li_ruomeng .
+# - verbatim and lstlisting environments are marked-up with line-by-line in a similar style to non-verbatim text (requires the listing package to be installed)
+# (see new configuration variable VERBATIMLINEENV) (several issues and pull requests by jprotze)
+# - --flatten: now supports \verbatiminput and \lstlistinput
+# - --flatten: if file is not found, do not fail, simply warn and leave command unexpanded (inspired by issue #112). Don't warn if file name contains #[0-9] as it is then most likely an argument within a command definition rather than an actual file (applies to \input, \subfile, \include commands)
+# - added to textcmds: \intertext
+# - new config variable CUSTOMDIFCMD to allow defining special versions of commands in added or deleted blocks (Pull request by github user jprotze)
+# - added option -no-links (mostly for use by latexdiff-vc in only-changes modes) (Pull request by github user jprotze)
+# Bug fixes:
+# - pattern matching of \verb and \lstinline commands had an error which meant they would trigger on commands beginning with \verb.
+# - In description environments, mark up item descriptions by effectively reating the insides of item commannds as text commands (fixes #161)
+#
+#
+# Version 1.2.1 (22 June 2017)
+# - add "DeclareOldFontCommand" to styles using \bf or \sf old style font commands (fixies issue #92 )
+# - improved markup: process lstinline commands in listings package correctly
+# for styles using colour, \verb and \lstinline arguments are marked up with colour (blue for added, red for deleted)
+# - bug fix: protecting inline math expressions for mbox did not work as intended (see stack exchange question: http://tex.stackexchange.com/questions/359412/compiling-the-latexdiff-when-adding-a-subscript-before-a-pmatrix-environment-cau)
+# - bug fix: when deleted \item commands are followed immediately by unsafe commands, they were not restored properly
+# (thanks to J. Protze for pull request) (pull request #89)
+# - treat lstlisting and comment as equivalent to verbatim environment
+# make environments that are treated like verbatim environments configurable (config variable VERBATIMENV)
+# treat lstinlne as equivalent to verb command
+# partially addresses issue #38
+# - refactoring: set default configuration variables in a hash, and those that correspond to lists
+# - feature: option --add-to-config used to amend configuration variables, which are regex pattern lists
+# - bug fix: deleted figures when endfloat package is activated
+# - bug fix: alignat environment now always processed correctly (fix issues #65)
+# - bug fix: avoid processing of commands as potential files in routine init_regex_arr (fix issue #70 )
+# - minimal feature enhancement: treat '@' as allowed character in commands (strictly speaking requires prior \makeatletter statement, but always assuming it to be
+# @ a letter if it is part of a command name will usually lead to the correct behaviour (see http://tex.stackexchange.com/questions/346651/latexdiff-and-let)
+# - new feature/bug fix: --flatten option \endinput in included files now respected but only if \endinput stands right at the beginning of the line (issue #77)
+# - bug fix: flatten would incorrectly attempt to process commented out \include commands (from discussion in issue #77 )
+# - introduce an invisible space (\hspace{0pt} after \mbox{..} auxiliary commands (not in math mode), to allow line breaks between added and deleted citations (change should not cause adverse behaviour otherwise)
+#
+# Version 1.2.0:
+# - highlight new and deleted figures
+# - bug fix in title mark-up. Previously deleted commands in title (such as \title, \author or \date) were marked up erroneously
+# - (minor) bug fixes in new 1.1.1 features: disabled label was commented out twice, additional spaces were introduced before list environment begin and end commands
+# - depracation fix: left brace in RegEx now needs to be escaped
+# - add type PDFCOMMENT based on issue #49 submitted by github user peci1 (Martin Pecka)
+# - make utf8 the default encoding
+#
+# Version 1.1.1
+# - patch mhchem: allow ce in equations
+# - flatten now also expands \input etc. in the preamble (but not \usepackage!)
+# - Better support for Japanese ( contributed by github user kshramt )
+# - prevent duplicated verbatim hashes (patch contributed by github user therussianjig, issue #36)
+# - disable deleted label commands (fixes issue #31)
+# - introduce post-processing to reinstate most deleted environments and all needed item commands (fixes issue #1)
+#
+# Version 1.1.0
+# - treat diacritics (\",\', etc) as safe commands
+# - treat \_ and \& correctly as safe commands, even if used without spacing to the next word
+# - Add a BOLD markup type that sets added text in bold face (Contribution by Victor Zabalza via pull request )
+# - add append-mboxsafecmd list option to be able to specify special safe commands which need to be surrounded by mbox to avoid breaking (mostly this is needed with ulem package)
+# - support for siunitx and cleveref packages: protect \SI command in siunitx package and \cref,\Cref{range}{*} in cleveref packages (thanks to Stefan Pinnow for testing)
+# - experimental support for chemformula, mhchem packages: define \ch and \ce in packages as safe (but not \ch,\cee in equation array environments) - these unfortunately will not be marked up (thanks to Stefan Pinnow for testing)
+# - bug fix: packages identified correctly even if \usepackage command options extend over several lines (previously \usepackage command needed to be fully contained in one line)
+# - new subtype ONLYCHANGEDPAGE outputs only changed pages (might not work well for floating material)
+# - new subtype ZLABEL operates similarly to LABEL but uses absolute page numbers (needs zref package)
+# - undocumented option --debug/--nodebug to override default setting for debug mode (Default: 0 for release version, 1: for development version
+#
+# Version 1.0.4
+# - introduce list UNSAFEMATHCMD, which holds list of commands which cannot be marked up with \DIFadd or \DIFdel commands (only relevant for WHOLE and COARSE math markup modes)
+# - new subtype LABEL which gives each change a label. This can later be used to only display pages where changes
+# have been made (instructions for that are put as comments into the diff'ed file) inspired by answer on http://tex.stackexchange.com/questions/166049/invisible-markers-in-pdfs-using-pdflatex
+# - Configuration variables take into accout some commands from additional packages:
+# tikzpicture environment now treated as PICTUREENV, and \smallmatrix in ARRENV (amsmath)
+# - --flatten: support for \subfile command (subfiles package) (in response to http://tex.stackexchange.com/questions/167620/latexdiff-with-subfiles )
+# - --flatten: \bibliography commands expand if corresponding bbl file present
+# - angled bracket optional commands now parsed correctly (patch #3570) submitted by Dave Kleinschmidt (thanks)
+# - \RequirePackage now treated as synonym of \usepackage with respect to setting packages
+# - special rules for apacite package (redefine citation commands)
+# - recognise /dev/null as 'file-like' arguments for --preamble and --config options
+# - fix units package incompatibility with ulem for text maths statements $ ..$ (thanks to Stuart Prescott for reporting this)
+# - amsmath environment cases treated correctly (Bug fix #19029) (thanks to Jalar)
+# - {,} in comments no longer confuse latexdiff (Bug fix #19146)
+# - \% in one-letter sub/Superscripts was not converted correctly
+#
+# Version 1.0.3
+# - fix bug in add_safe_commands that made latexdiff hang on DeclareMathOperator
+# command in preamble
+# - \(..\) inline math expressions were not parsed correctly, if they contained a linebreak
+# - applied patch contributed by tomflannaghan via Berlios: [ Patch #3431 ] Adds correct handling of \left< and \right>
+# - \$ is treated correctly as a literal dollar sign (thanks to Reed Cartwright and Joshua Miller for reporting this bug
+# and sketching out the solution)
+# - \^ and \_ are correctly interpreted as accent and underlined space, respectively, not as superscript of subscript
+# (thanks to Wail Yahyaoui for pointing out this bug)
+#
+# 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
+# \<nl> (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, <mario@wolczko.com>
+# 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)=<<EOF ;
+This is LATEXDIFF 1.3.0 (Algorithm::Diff $Algorithm::Diff::VERSION, Perl $^V)
+ (c) 2004-2018 F J Tilmann
+EOF
+
+# Hash with defaults for configuration variables. These marked undef have default values constructed from list defined in the DATA block
+# (under tag CONFIG)
+my %CONFIG=(
+ MINWORDSBLOCK => 3, # minimum number of tokens to form an independent block
+ # shorter identical blocks will be merged to the previous word
+ SCALEDELGRAPHICS => 0.5, # factor with which deleted figures will be scaled down (i.e. 0.5 implies they are shown at half linear size)
+ # this is only used for --graphics-markup=BOTH option
+ FLOATENV => undef , # Environments in which FL variants of defined commands are used
+ PICTUREENV => undef , # Environments in which all change markup is removed
+ MATHENV => undef , # Environments turning on display math mode (code also knows about \[ and \])
+ MATHREPL => 'displaymath', # Environment introducing deleted maths blocks
+ MATHARRENV => undef , # Environments turning on eqnarray math mode
+ MATHARRREPL => 'eqnarray*', # Environment introducing deleted maths blocks
+ ARRENV => undef , # Environments making arrays in math mode. The underlining style does not cope well with those - as a result in-text math environments are surrounded by \mbox{ } if any of these commands is used in an inline math block
+ COUNTERCMD => undef,
+ # COUNTERCMD textcmds which are associated with a counter
+ # If any of these commands occur in a deleted block
+ # they will be succeeded by an \addtocounter{...}{-1}
+ # for the associated counter such that the overall numbers
+ # should be the same as in the new file
+ LISTENV => undef , # list making environments - they will generally be kept
+ VERBATIMENV => undef, # Environments whose content should be treated as verbatim text and not be touched
+ VERBATIMLINEENV => undef, # Environments whose content should be treated as verbatim text and processed in line diff mode
+ CUSTOMDIFCMD => undef,# Custom dif command. Is defined in the document as a \DELcommand and \ADDcommand version to be replaced by the diff
+ ITEMCMD => 'item' # command marking item in a list environment
+);
+# Configuration variables: these have to be visible from the subroutines
+my ($ARRENV,
+ $COUNTERCMD,
+ $FLOATENV,
+ $ITEMCMD,
+ $LISTENV,
+ $MATHARRENV,
+ $MATHARRREPL,
+ $MATHENV,
+ $MATHREPL,
+ $MINWORDSBLOCK,
+ $PICTUREENV,
+ $SCALEDELGRAPHICS,
+ $VERBATIMENV,
+ $VERBATIMLINEENV,
+ $CUSTOMDIFCMD
+ );
+
+# my $MINWORDSBLOCK=3; # minimum number of tokens to form an independent block
+# # shorter identical blocks will be merged to the previous word
+# my $SCALEDELGRAPHICS=0.5; # factor with which deleted figures will be scaled down (i.e. 0.5 implies they are shown at half linear size)
+# # this is only used for --graphics-markup=BOTH option
+# my $FLOATENV='(?:figure|table|plate)[\w\d*@]*' ; # Environments in which FL variants of defined commands are used
+# my $PICTUREENV='(?:picture|tikzpicture|DIFnomarkup)[\w\d*@]*' ; # Environments in which all change markup is removed
+# my $MATHENV='(?:equation[*]?|displaymath|DOLLARDOLLAR)[*]?' ; # Environments turning on display math mode (code also knows about \[ and \])
+# my $MATHREPL='displaymath'; # Environment introducing deleted maths blocks
+# my $MATHARRENV='(?:eqnarray|align|alignat|gather|multline|flalign)[*]?' ; # Environments turning on eqnarray math mode
+# my $MATHARRREPL='eqnarray*'; # Environment introducing deleted maths blocks
+# my $ARRENV='(?:aligned|gathered|array|[pbvBV]?matrix|smallmatrix|cases|split)'; # Environments making arrays in math mode. The underlining style does not cope well with those - as a result in-text math environments are surrounded by \mbox{ } if any of these commands is used in an inline math block
+# my $COUNTERCMD='(?:footnote|part|chapter|section|subsection|subsubsection|paragraph|subparagraph)'; # textcmds which are associated with a counter
+# # If any of these commands occur in a deleted block
+# # they will be succeeded by an \addtocounter{...}{-1}
+# # for the associated counter such that the overall numbers
+# # should be the same as in the new file
+# my $LISTENV='(?:itemize|description|enumerate)'; # list making environments - they will generally be kept
+# my $ITEMCMD='item'; # command marking item in a list environment
+
+
+
+my $LABELCMD='(?:label)'; # matching commands are disabled within deleted blocks - mostly useful for maths mode, as otherwise it would be fine to just not add those to SAFECMDLIST
+my @UNSAFEMATHCMD=('qedhere'); # Commands which are definitely unsafe for marking up in math mode (amsmath qedhere only tested to not work with UNDERLINE markup) (only affects WHOLE and COARSE math markup modes). Note that unlike text mode (or FINE math mode0 deleted unsafe commands are not deleted but simply taken outside \DIFdel
+my $MBOXINLINEMATH=0; # if set to 1 then surround marked-up inline maths expression with \mbox ( to get around compatibility
+ # problems between some maths packages and ulem package
+
+
+# Markup strings
+# If at all possible, do not change these as parts of the program
+# depend on the actual name (particularly post-processing)
+# At the very least adapt subroutine postprocess to new tokens.
+my $ADDMARKOPEN='\DIFaddbegin '; # Token to mark begin of appended text
+my $ADDMARKCLOSE='\DIFaddend '; # Token to mark end of appended text
+my $ADDOPEN='\DIFadd{'; # To mark begin of added text passage
+my $ADDCLOSE='}'; # To mark end of added text passage
+my $ADDCOMMENT='DIF > '; # To mark added comment line
+my $DELMARKOPEN='\DIFdelbegin '; # Token to mark begin of deleted text
+my $DELMARKCLOSE='\DIFdelend '; # Token to mark end of deleted text
+my $DELOPEN='\DIFdel{'; # To mark begin of deleted text passage
+my $DELCLOSE='}'; # To mark end of deleted text passage
+my $DELCMDOPEN='%DIFDELCMD < '; # To mark begin of deleted commands (must begin with %, i.e., be a comment
+my $DELCMDCLOSE="%%%\n"; # To mark end of deleted commands (must end with a new line)
+my $AUXCMD='%DIFAUXCMD' ; # follows auxiliary commands put in by latexdiff to make difference file legal
+ # auxiliary commands must be on a line of their own
+ # Note that for verbatim environment openings the %DIFAUXCMD cannot be placed in
+ # the same line as this would mean they are shown
+ # so the special form "%DIFAUXCMD NEXT" is used to indicate that the next line
+ # is an auxiliary command
+ # Similarly "%DIFAUXCMD LAST" would indicate the auxiliary command is in previous line (not currently used)
+my $DELCOMMENT='DIF < '; # To mark deleted comment line
+my $VERBCOMMENT='DIFVRB '; # to mark lines which are within a verbatim environment
+
+# main local variables:
+my @TEXTCMDLIST=(); # array containing patterns of commands with text arguments
+my @TEXTCMDEXCL=(); # array containing patterns of commands without text arguments (if a pattern
+ # matches both TEXTCMDLIST and TEXTCMDEXCL it is excluded)
+my @CONTEXT1CMDLIST=(); # array containing patterns of commands with text arguments (subset of text commands),
+ # but which cause confusion if used out of context (e.g. \caption).
+ # In deleted passages, the command will be disabled but its argument is marked up
+ # Otherwise they behave exactly like TEXTCMD's
+my @CONTEXT1CMDEXCL=(); # exclude list for above, but always empty
+my @CONTEXT2CMDLIST=(); # array containing patterns of commands with text arguments, but which fail or cause confusion
+ # if used out of context (e.g. \title). They and their arguments will be disabled in deleted
+ # passages
+my @CONTEXT2CMDEXCL=(); # exclude list for above, but always empty
+my @MATHTEXTCMDLIST=(); # treat like textcmd. If a textcmd is in deleted or added block, just wrap the
+ # whole content with \DIFadd or \DIFdel irrespective of content. This functionality
+ # is useful for pseudo commands \MATHBLOCK.. into which math environments are being
+ # transformed
+my @MATHTEXTCMDEXCL=(); #
+
+# Note I need to declare this with "our" instead of "my" because later in the code I have to "local"ise these
+our @SAFECMDLIST=(); # array containing patterns of safe commands (which do not break when in the argument of DIFadd or DIFDEL)
+our @SAFECMDEXCL=();
+my @MBOXCMDLIST=(); # patterns for commands which are in principle safe but which need to be surrounded by an \mbox
+my @MBOXCMDEXCL=(); # all the patterns in MBOXCMDLIST will be appended to SAFECMDLIST
+
+
+my ($i,$j,$l);
+my ($old,$new);
+my ($line,$key);
+my (@dumlist);
+my ($newpreamble,$oldpreamble);
+my (@newpreamble,@oldpreamble,@diffpreamble,@diffbody);
+my ($latexdiffpreamble);
+my ($oldbody, $newbody, $diffbo);
+my ($oldpost, $newpost);
+my ($diffall);
+# Option names
+my ($type,$subtype,$floattype,$config,$preamblefile,$encoding,$nolabel,$visiblelabel,
+ $showpreamble,$showsafe,$showtext,$showconfig,$showall,
+ $replacesafe,$appendsafe,$excludesafe,
+ $replacetext,$appendtext,$excludetext,
+ $replacecontext1,$appendcontext1,
+ $replacecontext2,$appendcontext2,
+ $help,$verbose,$driver,$version,$ignorewarnings,
+ $enablecitmark,$disablecitmark,$allowspaces,$flatten,$nolinks,$debug,$earlylatexdiffpreamble); ###$disablemathmark,
+my ($mboxsafe);
+# MNEMNONICS for mathmarkup
+my $mathmarkup;
+use constant {
+ OFF => 0,
+ WHOLE => 1,
+ COARSE => 2,
+ FINE => 3
+};
+# MNEMNONICS for graphicsmarkup
+my $graphicsmarkup;
+use constant {
+ NONE => 0,
+ NEWONLY => 1,
+ BOTH => 2
+};
+
+my ($mboxcmd);
+
+my (@configlist,@addtoconfiglist,@labels,
+ @appendsafelist,@excludesafelist,
+ @appendmboxsafelist,@excludemboxsafelist,
+ @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
+$mathmarkup=COARSE;
+$verbose=0;
+# output debug and intermediate files, set to 0 in final distribution
+$debug=0;
+# insert preamble directly after documentclass - experimental feature, set to 0 in final distribution
+# Note that this failed with mini example (or other files, where packages used in latexdiff preamble
+# are called again with incompatible options in preamble of resulting file)
+$earlylatexdiffpreamble=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,
+ 'add-to-config=s' => \@addtoconfiglist,
+ '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,
+ 'exclude-mboxsafecmd=s' => \@excludemboxsafelist,
+ 'append-mboxsafecmd=s' => \@appendmboxsafelist,
+ '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,
+ 'graphics-markup=s' => \$graphicsmarkup,
+ 'enable-citation-markup|enforce-auto-mbox' => \$enablecitmark,
+ 'disable-citation-markup|disable-auto-mbox' => \$disablecitmark,
+ 'verbose|V' => \$verbose,
+ 'ignore-warnings' => \$ignorewarnings,
+ 'driver=s'=> \$driver,
+ 'flatten' => \$flatten,
+ 'no-links' => \$nolinks,
+ 'version' => \$version,
+ 'help|h' => \$help,
+ 'debug!' => \$debug ) or die "Use latexdiff -h to get help.\n" ;
+
+if ( $help ) {
+ usage() ;
+}
+
+
+if ( $version ) {
+ die $versionstring ;
+}
+
+print STDERR $versionstring if $verbose;
+
+if (defined($showall)){
+ $showpreamble=$showsafe=$showtext=$showconfig=1;
+}
+# Default types
+$type='UNDERLINE' unless defined($type);
+$subtype='SAFE' unless defined($subtype);
+# set floattype to IDENTICAL for LABEL and ONLYCHANGEDPAGE subtype, unless it has been set explicitly on the command line
+$floattype=($subtype eq 'LABEL' || $subtype eq 'ONLYCHANGEDPAGE') ? 'IDENTICAL' : 'FLOATSAFE' unless defined($floattype);
+if ( $subtype eq 'LABEL' ) {
+ print STDERR "Note that LABEL subtype is deprecated. If possible, use ZLABEL instead (requires zref package)";
+}
+
+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 "latexdiff Illegal value: ($mathmarkup) for option--math-markup. Possible values: OFF,WHOLE,COARSE,FINE,0-3\n";
+ }
+ # 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);
+}
+# setting up @MBOXCMDLIST and @MBOXCMDEXCL
+foreach $mboxsafe ( @appendmboxsafelist ) {
+ init_regex_arr_ext(\@MBOXCMDLIST, $mboxsafe);
+}
+foreach $mboxsafe ( @excludemboxsafelist ) {
+ init_regex_arr_ext(\@MBOXCMDEXCL, $mboxsafe);
+}
+
+
+
+# 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 || lc $config eq '/dev/null' ) {
+ open(FILE,$config) or die ("Couldn't open configuration file $config: $!");
+ while (<FILE>) {
+ 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)";
+ exists $CONFIG{$1} or die "Unknown configuration variable $1.";
+ $CONFIG{$1}=$2;
+}
+
+my @addtoconfig=();
+foreach $config ( @addtoconfiglist ) {
+ if (-f $config || lc $config eq '/dev/null' ) {
+ open(FILE,$config) or die ("Couldn't open addd-to-config file $config: $!");
+ while (<FILE>) {
+ chomp;
+ next if /^\s*#/ || /^\s*%/ || /^\s*$/ ;
+ push (@addtoconfig,$_);
+ }
+ close(FILE);
+ }
+ else {
+# foreach ( split(",",$config) ) {
+# push @addtoconfig,$_;
+# }
+ push @addtoconfig,split(",",$config)
+ }
+}
+
+# initialise default lists from DATA
+# for those configuration variables, which have not been set explicitly, initiate from list in document
+foreach $key ( keys(%CONFIG) ) {
+ if (!defined $CONFIG{$key}) {
+ @dumlist=();
+ init_regex_arr_data(\@dumlist,"$key CONFIG");
+ $CONFIG{$key}=join(";",@dumlist)
+ }
+}
+
+
+foreach $assign ( @addtoconfig ) {
+ ###print STDERR "assign:|$assign|\n";
+ $assign=~ m/\s*(\w*)\s*=\s*(\S*)\s*$/ or die "Illegal assignment $assign in configuration list (must be variable=value)";
+ exists $CONFIG{$1} or die "Unknown configuration variable $1.";
+ $CONFIG{$1}.=";$2";
+}
+
+# Map from hash to variables (we do this to have more concise code later, change from comma-separated list)
+foreach ( keys(%CONFIG) ) {
+ if ( $_ eq "MINWORDSBLOCK" ) { $MINWORDSBLOCK = $CONFIG{$_}; }
+ elsif ( $_ eq "FLOATENV" ) { $FLOATENV = liststringtoregex($CONFIG{$_}) ; }
+ elsif ( $_ eq "ITEMCMD" ) { $ITEMCMD = $CONFIG{$_} ; }
+ elsif ( $_ eq "LISTENV" ) { $LISTENV = liststringtoregex($CONFIG{$_}) ; }
+ elsif ( $_ eq "PICTUREENV" ) { $PICTUREENV = liststringtoregex($CONFIG{$_}) ; }
+ elsif ( $_ eq "MATHENV" ) { $MATHENV = liststringtoregex($CONFIG{$_}) ; }
+ elsif ( $_ eq "MATHREPL" ) { $MATHREPL = $CONFIG{$_} ; }
+ elsif ( $_ eq "MATHARRENV" ) { $MATHARRENV = liststringtoregex($CONFIG{$_}) ; }
+ elsif ( $_ eq "MATHARRREPL" ) { $MATHARRREPL = $CONFIG{$_} ; }
+ elsif ( $_ eq "ARRENV" ) { $ARRENV = liststringtoregex($CONFIG{$_}) ; }
+ elsif ( $_ eq "VERBATIMENV" ) { $VERBATIMENV = liststringtoregex($CONFIG{$_}) ; }
+ elsif ( $_ eq "VERBATIMLINEENV" ) { $VERBATIMLINEENV = liststringtoregex($CONFIG{$_}) ; }
+ elsif ( $_ eq "CUSTOMDIFCMD" ) { $CUSTOMDIFCMD = liststringtoregex($CONFIG{$_}) ; }
+ elsif ( $_ eq "COUNTERCMD" ) { $COUNTERCMD = liststringtoregex($CONFIG{$_}) ; }
+ elsif ( $_ eq "SCALEDELGRAPHICS" ) { $SCALEDELGRAPHICS = $CONFIG{$_} ; }
+ else { die "Unknown configuration variable $_.";}
+}
+
+if ( $mathmarkup == COARSE || $mathmarkup == WHOLE ) {
+ push(@MATHTEXTCMDLIST,qr/^MATHBLOCK(?:$MATHENV|$MATHARRENV|SQUAREBRACKET)$/);
+}
+
+
+
+foreach $pkg ( @packagelist ) {
+ map { $packages{$_}="" } split(/,/,$pkg) ;
+}
+
+
+
+if ($showconfig || $showtext || $showsafe || $showpreamble) {
+ show_configuration();
+ 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 $pat_n = $pat0;
+# if you get "undefined control sequence MATHBLOCKmath" error, increase the maximum value in this loop
+ for (my $i_pat = 0; $i_pat < 20; ++$i_pat){
+ $pat_n = '(?:[^{}]|\{'.$pat_n.'\}|\\\\\{|\\\\\})*';
+ # Actually within the text body, quoted braces are replaced in pre-processing. The only place where
+ # the last part of the pattern matters is when processing the arguments of context2cmds in the preamble
+ # and these contain a \{ or \} combination, probably rare.
+ # It should thus be fine to use the simpler version below.
+ ### $pat_n = '(?:[^{}]|\{'.$pat_n.'\})*';
+ }
+
+ my $brat0 = '(?:[^\[\]]|\\\[|\\\])*';
+ my $brat_n = $brat0;
+ for (my $i_pat = 0; $i_pat < 4; ++$i_pat){
+ $brat_n = '(?:[^\[\]]|\['.$brat_n.'\]|\\\[|\\\])*';
+ ### $brat_n = '(?:[^\[\]]|\['.$brat_n.'\])*'; # Version not taking into account escaped \[ and \]
+ }
+ my $abrat0 = '(?:[^<>])*';
+
+ my $quotemarks = '(?:\'\')|(?:\`\`)';
+ my $punct='[0.,\/\'\`:;\"\?\(\)\[\]!~\p{IsNonAsciiPunct}\p{IsNonAsciiS}]';
+ my $number='-?\d*\.\d*';
+ my $mathpunct='[+=<>\-\|]';
+ my $and = '&';
+ my $coords= '[\-.,\s\d]*';
+# quoted underscore - this needs special treatment as perl treats _ as a letter (\w) but latex does not
+# such that a\_b is interpreted as a{\_}b by latex but a{\_b} by perl
+ my $quotedunderscore='\\\\_';
+# word: sequence of letters or accents followed by letter
+ my $word_ja='\p{Han}+|\p{InHiragana}+|\p{InKatakana}+';
+ my $word='(?:' . $word_ja . '|(?:(?:[-\w\d*]|\\\\[\"\'\`~^][A-Za-z\*])(?!(?:' . $word_ja . ')))+)';
+ my $cmdleftright='\\\\(?:left|right|[Bb]igg?[lrm]?|middle)\s*(?:[<>()\[\]|\.]|\\\\(?:[|{}]|\w+))';
+ my $cmdoptseq='\\\\[\w\d@\*]+'.$extraspace.'(?:(?:<'.$abrat0.'>|\['.$brat_n.'\]|\{'. $pat_n . '\}|\(' . $coords .'\))'.$extraspace.')*';
+ my $defseq='\\\\def\\\\[\w\d@\*]+(?:#\d+|\[#\d+\])+(?:\{'. $pat_n . '\})?';
+ my $backslashnl='\\\\\n';
+ my $oneletcmd='\\\\.\*?(?:\['.$brat_n.'\]|\{'. $pat_n . '\})*';
+ my $math='\$(?:[^$]|\\\$)*?\$|\\\\[(](?:.|\n)*?\\\\[)]';
+## the current maths command cannot cope with newline within the math expression
+ my $comment='%[^\n]*\n';
+ my $pat=qr/(?:\A\s*)?(?:${and}|${quotemarks}|${number}|${word}|$quotedunderscore|${defseq}|$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
+# first find out which file name is longer for correct alignment
+my ($diff,$oldlabel_n_spaces,$newlabel_n_spaces);
+$oldlabel_n_spaces = 0;
+$newlabel_n_spaces = 0;
+$diff = length($newfile) - length($oldfile);
+if ($diff > 0) {
+ $oldlabel_n_spaces = $diff;
+}
+if ($diff < 0) {
+ $newlabel_n_spaces = abs($diff);
+}
+
+my ($oldtime,$newtime,$oldlabel,$newlabel);
+if (defined($labels[0])) {
+ $oldlabel=$labels[0] ;
+} else {
+ $oldtime=localtime((stat($oldfile))[9]);
+ $oldlabel="$oldfile " . " "x($oldlabel_n_spaces) . $oldtime;
+}
+if (defined($labels[1])) {
+ $newlabel=$labels[1] ;
+} else {
+ $newtime=localtime((stat($newfile))[9]);
+ $newlabel="$newfile " . " "x($newlabel_n_spaces) . $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);
+ # flatten preamble
+ $oldpreamble=flatten($oldpreamble,$oldpreamble,$oldfile,$encoding);
+ $newpreamble=flatten($newpreamble,$newpreamble,$newfile,$encoding);
+
+}
+
+
+
+
+my @auxlines;
+
+# boolean variab
+my ($ulem)=0;
+
+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);
+
+ # get a list of packages from preamble if not predefined
+ %packages=list_packages($newpreamble) unless %packages;
+ if ( %packages && $debug ) { my $key ; foreach $key (keys %packages) { print STDERR "DEBUG \\usepackage[",$packages{$key},"]{",$key,"}\n" ;} }
+}
+
+# have to return to all processing to properly add preamble additions based on packages found
+if (defined($graphicsmarkup)) {
+ $graphicsmarkup=~tr/a-z/A-Z/;
+ if ( $graphicsmarkup eq 'OFF' or $graphicsmarkup eq 'NONE' ) {
+ $graphicsmarkup=NONE;
+ } elsif ( $graphicsmarkup eq 'NEWONLY' or $graphicsmarkup eq 'NEW-ONLY' ) {
+ $graphicsmarkup=NEWONLY;
+ } elsif ( $graphicsmarkup eq 'BOTH' ) {
+ $graphicsmarkup=BOTH;
+ } elsif ( $graphicsmarkup !~ m/^[012]$/ ) {
+ die "latexdiff Illegal value: ($graphicsmarkup) for option --highlight-graphics. Possible values: OFF,WHOLE,COARSE,FINE,0-2\n";
+ }
+ # else use numerical value
+} else {
+ # Default: no explicit setting in menu
+ if ( defined $packages{"graphicx"} or defined $packages{"graphics"} ) {
+ $graphicsmarkup=NEWONLY;
+ } else {
+ $graphicsmarkup=NONE;
+ }
+}
+
+if (defined $packages{"hyperref"} ) {
+ # deleted lines should not generate or appear in link names:
+ print STDERR "hyperref package detected.\n" if $verbose ;
+ $latexdiffpreamble =~ s/\{\\DIFadd\}/{\\DIFaddtex}/g;
+ $latexdiffpreamble =~ s/\{\\DIFdel\}/{\\DIFdeltex}/g;
+ $latexdiffpreamble .= join "\n",(extrapream("HYPERREF"),"");
+ if($nolinks){
+ $latexdiffpreamble .= "\n\\hypersetup{bookmarks=false}";
+ }
+ ### $latexdiffpreamble .= '%DIF PREAMBLE EXTENSION ADDED BY LATEXDIFF FOR HYPERREF PACKAGE' . "\n";
+ ### $latexdiffpreamble .= '\providecommand{\DIFadd}[1]{\texorpdfstring{\DIFaddtex{#1}}{#1}}' . "\n";
+ ### $latexdiffpreamble .= '\providecommand{\DIFdel}[1]{\texorpdfstring{\DIFdeltex{#1}}{}}' . "\n";
+ ### $latexdiffpreamble .= '%DIF END PREAMBLE EXTENSION ADDED BY LATEXDIFF FOR HYPERREF PACKAGE' . "\n";
+}
+
+# add commands for figure highlighting to preamble
+if ($graphicsmarkup != NONE ) {
+ my @matches;
+ # Check if \DIFaddbeginFL definition calls \DIFaddbegin - if so we will issue an error message that graphics highlighting is
+ # is not compatible with this.
+ # (A more elegant solution would be to suppress the redefinitions of the \DIFaddbeginFL etc commands, but for this narrow use case
+ # I currently don't see this as an efficient use of time)
+ ### The foreach loop does not make sense here. I don't know why I put this in - (F Tilmann)
+ ###foreach my $cmd ( "DIFaddbegin","DIFaddend","DIFdelbegin","DIFdelend" ) {
+ @matches=( $latexdiffpreamble =~ m/command\{\\DIFaddbeginFL}\{($pat_n)}/sg ) ;
+ # we look at the last one of the list to take into account possible redefinition but almost always matches should have exactly one element
+ if ( $matches[$#matches] =~ m/\\DIFaddbegin/ ) {
+ die "Cannot combine graphics markup with float styles defining \\DIFaddbeginFL in terms of \\DIFaddbegin. Use --graphics-markup=none option or choose a different float style.";
+ exit 10;
+ }
+ ###}
+ $latexdiffpreamble .= join "\n",("\\newcommand{\\DIFscaledelfig}{$SCALEDELGRAPHICS}",extrapream("HIGHLIGHTGRAPHICS"),"");
+
+ # only change required for highlighting both is to declare \includegraphics safe, as preamble already contains commands for deleted environment
+ if ( $graphicsmarkup == BOTH ) {
+ init_regex_arr_list(\@SAFECMDLIST,'includegraphics');
+ }
+}
+
+$ulem = ($latexdiffpreamble =~ /\\RequirePackage(?:\[$brat_n\])?\{ulem\}/ || defined $packages{"ulem"});
+
+
+# If listings is being used or can be found in the latexdiff search path, add to the preamble auxiliary code to enable line-by-line markup
+if ( defined($packages{"listings"}) or `kpsewhich listings.sty` ne "" ) {
+ my @listingpreamble=extrapream("LISTINGS");
+ my @listingDIFcode=();
+ my $replaced;
+ # note that in case user supplies preamblefile the type might not reflect well the
+ @listingDIFcode=extrapream("-nofail","DIFCODE_" . $type) unless defined($preamblefile);
+ if (!(@listingDIFcode)) {
+ # if listingDIFcode is empty try to guess a suitable one from the preamble
+ if ($latexdiffpreamble =~ /\\RequirePackage(?:\[$brat_n\])?\{color\}/ and $ulem ) {
+ @listingDIFcode=extrapream("DIFCODE_UNDERLINE");
+ } elsif ( $latexdiffpreamble =~ /\\RequirePackage(?:\[$brat_n\])?\{color\}/ ) {
+ # only colour used
+ @listingDIFcode=extrapream("DIFCODE_CFONT");
+ } else {
+ # fall-back solution
+ @listingDIFcode=extrapream("DIFCODE_BOLD");
+ }
+ }
+ # now splice it in
+ $replaced=0;
+ ###print STDERR "DEBUG: listingDIFcode: ",join("\n",@listingDIFcode),"|||\n" if $debug;
+
+ @listingpreamble=grep {
+ # only replace if this has not been done already (use short-circuit property of and)
+ if (!$replaced and $_ =~ s/^.*%DIFCODE TEMPLATE.*$/join("\n",@listingDIFcode)/e ) {
+ ###print STDERR "DEBUG: Replaced text $_\n" if $debug;
+ $replaced=1;
+ 1;
+ } else {
+ # return false for those lines matching %DIFCODE TEMPLATE (so that they are not included in output)
+ not m/%DIFCODE TEMPLATE/;
+ }
+ } @listingpreamble;
+ ### print STDERR "DEBUG: listingpreamble @listingpreamble\n";
+ $latexdiffpreamble .= join "\n",(@listingpreamble,"");
+} else {
+ print STDERR "WARNING: listings package not detected. Disabling mark-up in verbatim environments \n" ;
+ # if listings does not exist disable line-by-line markup and treat all verbatim environments as opaque
+ $VERBATIMENV = liststringtoregex($CONFIG{VERBATIMENV}.";".$CONFIG{VERBATIMLINEENV});
+ $VERBATIMLINEENV = "";
+}
+
+# adding begin and end marker lines to preamble
+$latexdiffpreamble = "%DIF PREAMBLE EXTENSION ADDED BY LATEXDIFF\n" . $ latexdiffpreamble . "%DIF END PREAMBLE EXTENSION ADDED BY LATEXDIFF\n";
+
+# and return to preamble specific processing
+if ( length $oldpreamble && length $newpreamble ) {
+ 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);
+ }
+ if ( $earlylatexdiffpreamble) {
+ # insert latexdiff command directly after documentclass at beginning of preamble
+ # note that grep is only run for its side effect
+ ( grep { s/^([^%]*\\documentclass.*)$/$1$latexdiffpreamble/ } @diffpreamble )==1 or die "Could not find documentclass statement in preamble";
+ } else {
+ # insert latexdiff commands at the end of preamble (default behaviour)
+ push @diffpreamble,$latexdiffpreamble;
+ }
+ push @diffpreamble,'\begin{document}';
+ if (defined $packages{"hyperref"} && $nolinks) {
+ push @diffpreamble, '\begin{NoHyper}';
+ }
+}
+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);
+}
+
+# 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
+# and $packages{"apacite"}!~/natbibpapa/
+
+
+if (defined $packages{"units"} && $ulem ) {
+ # protect inlined maths environments by surrounding with an \mbox
+ # this is done to get around an incompatibility between the ulem and units package
+ # where spaces in the argument to underlined or crossed-out \unit commands cause an error message
+ print STDERR "units package detected at the same time as style using ulem.\n" if $verbose ;
+ $MBOXINLINEMATH=1;
+}
+
+if (defined $packages{"siunitx"} ) {
+ # protect SI command by surrounding them with an \mbox
+ # this is done to get around an incompatibility between the ulem and siunitx package
+ print STDERR "siunitx package detected.\n" if $verbose ;
+ my $mboxcmds='SI,ang,numlist,numrange,SIlist,SIrange';
+ init_regex_arr_list(\@SAFECMDLIST,'num,si');
+ if ( $enablecitmark || ( $ulem && ! $disablecitmark )) {
+ init_regex_arr_list(\@MBOXCMDLIST,$mboxcmds);
+ } else {
+ init_regex_arr_list(\@SAFECMDLIST,$mboxcmds);
+ }
+}
+
+if (defined $packages{"cleveref"} ) {
+ # protect selected command by surrounding them with an \mbox
+ # this is done to get around an incompatibility between ulem and cleveref package
+ print STDERR "cleveref package detected.\n" if $verbose ;
+ my $mboxcmds='[Cc]ref(?:range)?\*?,labelcref,(?:lc)?name[cC]refs?' ;
+ if ( $enablecitmark || ( $ulem && ! $disablecitmark )) {
+ init_regex_arr_list(\@MBOXCMDLIST,$mboxcmds);
+ } else {
+ init_regex_arr_list(\@SAFECMDLIST,$mboxcmds);
+ }
+}
+
+if (defined $packages{"glossaries"} ) {
+ # protect selected command by surrounding them with an \mbox
+ # this is done to get around an incompatibility between ulem and glossaries package
+ print STDERR "glossaries package detected.\n" if $verbose ;
+ my $mboxcmds='[gG][lL][sS](?:|pl|disp|link|first|firstplural|desc|user[iv][iv]?[iv]?),[aA][cC][rR](?:long|longpl|full|fullpl),[aA][cC][lfp]?[lfp]?';
+ init_regex_arr_list(\@SAFECMDLIST,'[gG][lL][sS](?:(?:entry)?(?:text|plural|name|symbol)|displaynumberlist|entryfirst|entryfirstplural|entrydesc|entrydescplural|entrysymbolplural|entryuser[iv][iv]?[iv]?|entrynumberlist|entrydisplaynumberlist|entrylong|entrylongpl|entryshort|entryshortpl|entryfull|entryfullpl),[gG]lossentry(?:name|desc|symbol),[aA][cC][rR](?:short|shortpl),[aA]csp?');
+ if ( $enablecitmark || ( $ulem && ! $disablecitmark )) {
+ init_regex_arr_list(\@MBOXCMDLIST,$mboxcmds);
+ } else {
+ init_regex_arr_list(\@SAFECMDLIST,$mboxcmds);
+ }
+}
+
+if (defined $packages{"chemformula"} or defined $packages{"chemmacros"} ) {
+ print STDERR "chemformula package detected.\n" if $verbose ;
+ init_regex_arr_list(\@SAFECMDLIST,'ch');
+ push(@UNSAFEMATHCMD,'ch');
+ # The next command would be needed to allow highlighting the interior of \ch commands in math environments
+ # but the redefinitions in chemformula are too deep to make this viable
+ # push(@MATHTEXTCMDLIST,'ch');
+}
+
+if (defined $packages{"mhchem"} ) {
+ print STDERR "mhchem package detected.\n" if $verbose ;
+ init_regex_arr_list(\@SAFECMDLIST,'ce');
+ push(@UNSAFEMATHCMD,'ce','cee');
+ # The next command would be needed to allow highlighting the interior of \cee commands in math environments
+ # but the redefinitions in chemformula are too deep to make this viable
+ # push(@MATHTEXTCMDLIST,'cee');
+}
+
+
+my ( $citpat);
+
+if ( defined $packages{"apacite"} ) {
+ print STDERR "apacite package detected.\n" if $verbose ;
+ $citpat='(?:mask)?(?:full|short|no)?cite(?:A|author|year|meta)?(?:NP)?';
+} else {
+ # citation command pattern for all other citation schemes
+ $citpat='(?:cite\w*|nocite)';
+};
+
+if ( ! $ulem ) {
+ # modes not using ulem: citation is safe
+ push (@SAFECMDLIST, $citpat);
+} else {
+ ### Experimental: disable text and emph commands
+ push(@SAFECMDEXCL, qr/^emph$/, qr/^text..$/);
+ # replace \cite{..} by \mbox{\cite{..}} in added or deleted blocks in post-processing
+ push(@MBOXCMDLIST,$citpat) unless $disablecitmark;
+ if ( uc($subtype) eq "COLOR" or uc($subtype) eq "DVIPSCOL" ) {
+ # remove \cite command again from list of safe commands
+ pop @MBOXCMDLIST;
+ # deleted cite commands
+ }
+}
+push(@MBOXCMDLIST,$citpat) if $enablecitmark ;
+
+
+if (defined $packages{"amsmath"} or defined $packages{"amsart"} or defined $packages{"amsbook"} ) {
+ print STDERR "amsmath package detected.\n" if $verbose ;
+ $MATHARRREPL='align*';
+}
+
+# add commands in MBOXCMDLIST to SAFECMDLIST
+foreach $mboxcmd ( @MBOXCMDLIST ) {
+ init_regex_arr_list(\@SAFECMDLIST, $mboxcmd);
+}
+
+# check if \label is in SAFECMDLIST, and if yes replace "label" in $LABELCMD by something that never matches (we hope!)
+if ( iscmd("label",\@SAFECMDLIST,\@SAFECMDEXCL) ) {
+ $LABELCMD=~ s/label/NEVERMATCHLABEL/;
+}
+
+
+
+print STDERR "Preprocessing body. " if $verbose;
+preprocess($oldbody,$newbody);
+
+
+# run difference algorithm
+@diffbody=bodydiff($oldbody, $newbody);
+$diffbo=join("",@diffbody);
+writedebugfile($diffbo,"bodydiff");
+
+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)\{($pat_n)\}/$1\{$2 \\ LATEXDIFF comparison \\ Old: $oldlabel \\ New: $newlabel \}/ or
+ $diffbo = "\\begin{verbatim}LATEXDIFF comparison\nOld: $oldlabel\nNew: $newlabel\\end{verbatim}\n$diffbo" ;
+}
+
+$diffall .= "$diffbo" ;
+if (defined $packages{"hyperref"} && $nolinks) {
+ $diffall .= "\\end{NoHyper}\n";
+}
+$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;
+
+
+# liststringtoregex(liststring)
+# expands string with semi-colon separated list into a regular expression corresponding
+# matching any of the elements
+sub liststringtoregex {
+ my ($liststring)=@_;
+ my @elements=grep /\S/,split(";",$liststring);
+ if ( @elements) {
+ return('(?:(?:' . join(')|(?:',@elements) .'))');
+ } else {
+ return "";
+ }
+}
+
+# show_configuration
+# note that this is not encapsulated but uses variables from the main program
+# It is provided for convenience because in the future it is planned to allow output
+# to be modified based on what packages are read etc - this works only if the input files are actually read
+# whether or not additional files are provided
+sub show_configuration {
+ if ($showpreamble) {
+ print "\nPreamble commands:\n";
+ print $latexdiffpreamble ;
+ }
+
+ if ($showsafe) {
+ print "\nsafecmd: Commands safe within scope of $ADDOPEN $ADDCLOSE and $DELOPEN $DELCLOSE (unless excluded):\n";
+ print_regex_arr(@SAFECMDLIST);
+ print "\nsafecmd-exlude: Commands not safe within scope of $ADDOPEN $ADDCLOSE and $DELOPEN $DELCLOSE :\n";
+ print_regex_arr(@SAFECMDEXCL);
+ print "\nmboxsafecmd: Commands safe only if they are surrounded by \\mbox command:\n";
+ print_regex_arr(@MBOXCMDLIST);
+ print "\nnmboxsafecmd: Commands not safe:\n";
+ print_regex_arr(@MBOXCMDEXCL);
+ }
+
+ 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 "ARRENV=$ARRENV\n";
+ print "COUNTERCMD=$COUNTERCMD\n";
+ print "FLOATENV=$FLOATENV\n";
+ print "ITEMCMD=$ITEMCMD\n";
+ print "LISTENV=$LISTENV\n";
+ print "MATHARRENV=$MATHARRENV\n";
+ print "MATHARRREPL=$MATHARRREPL\n";
+ print "MATHENV=$MATHENV\n";
+ print "MATHREPL=$MATHREPL\n";
+ print "MINWORDSBLOCK=$MINWORDSBLOCK\n";
+ print "PICTUREENV=$PICTUREENV\n";
+ print "SCALEDELGRAPHICS=$SCALEDELGRAPHICS\n";
+ print "VERBATIMENV=$VERBATIMENV\n";
+ print "VERBATIMLINEENV=$VERBATIMLINEENV\n";
+ print "CUSTOMDIFCMD=$CUSTOMDIFCMD\n";
+ }
+}
+
+
+
+## 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 utf8
+sub guess_encoding {
+ my ($filename)=@_;
+ my ($i,$enc);
+ open (FH, $filename) or die("Couldn't open $filename: $!");
+ $i=0;
+ while (<FH>) {
+ 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");
+ return("utf8");
+}
+
+
+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=<FILE>;
+ } 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=<FILE>;
+ } 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=<FILE>;
+ 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,\RequirePackage 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/(?<!\\)%.*$// ;
+# if ( $line =~ m/\\(?:documentclass|usepackage|RequirePackage)(?:\[(.+?)\])?\{(.*?)\}/ ) {
+## print STDERR "Found something: |$line|\n" if $debug;
+# if (defined($1)) {
+# $packages{$2}=$1;
+# } else {
+# $packages{$2}="";
+# }
+# }
+# }
+# return (%packages);
+#}
+
+
+# %packages=list_packages($preamble)
+# scans the arguments for \documentclass,\RequirePackage and \usepackage statements and constructs a hash
+# whose keys are the included packages, and whose values are the associated optional arguments
+# if argument of \usepackage or \RequirePackage is comma separated list, treat as different packages
+sub list_packages {
+ my ($preamble)=@_;
+ my %packages=();
+ my $pkg;
+
+ # remove comments
+ $preamble=~s/(?<!\\)%.*$//mg ;
+
+ while ( $preamble =~ m/\\(?:documentclass|usepackage|RequirePackage)(?:\[($brat_n)\])?\{(.*?)\}/gs ) {
+ if (defined($1)) {
+ foreach $pkg ( split /,/,$2 ) {
+ $packages{$pkg}=$1;
+ }
+ } else {
+ foreach $pkg ( split /,/,$2 ) {
+ $packages{$pkg}="";
+ }
+ }
+ }
+
+ # sometimes, class options are defined in such a way that they imply the loading and/or presence of a package
+ # so we also treat all class options as 'packages.
+ if ( $preamble =~ m/\\documentclass\s*\[($brat_n)\]\s*\{.*?\}/s ) {
+ foreach $pkg ( split /,/,$1 ) {
+ $pkg =~ s/\s//g ; # remove space and newline characters
+ $packages{$pkg}="" unless exists($packages{$pkg});
+ }
+ }
+ return (%packages);
+}
+
+# Subroutine add_safe_commands modified from version provided by S. Gouezel
+# add_safe_commands($preamble)
+# scans the argument for \newcommand and \DeclareMathOperator,
+# and adds the created commands which are clearly safe to @SAFECMDLIST
+sub add_safe_commands {
+ my ($preamble)=@_;
+
+ # get rid of comments
+ $preamble=~s/(?<!\\)%.*$//mg ;
+
+ my $to_test = "";
+ # test for \DeclareMathOperator{\foo}{myoperator}
+ while ( $preamble =~ m/\DeclareMathOperator\s*\*?\{\\(\w*?)\}/osg) {
+ $to_test=$1;
+ if ($to_test ne "" and not iscmd($to_test,\@SAFECMDLIST,\@SAFECMDEXCL) and not iscmd($to_test, \@SAFECMDEXCL, [])) {
+ # one should add $to_test to the list of safe commands.
+ init_regex_arr_list(\@SAFECMDLIST, $to_test);
+ print STDERR "Adding $to_test to the list of safe commands\n" if $verbose;
+ }
+ }
+
+ while ( $preamble =~ m/\\(?:new|renew|provide)command\s*{\\(\w*)\}(?:|\[\d*\])\s*\{(${pat_n})\}/osg ) {
+ my $maybe_to_test = $1;
+ my $should_be_safe = $2;
+ print STDERR "DEBUG Checking new command: maybe_to_test, should_be_safe: $1 $2\n" if $debug;
+ my $success = 0;
+ # test if all latex commands inside it are safe
+ $success = 1;
+ if ($should_be_safe =~ m/\\\\/) {
+ $success = 0;
+ } else {
+ while ($should_be_safe =~ m/\\(\w+)/g) {
+ ### print STDERR "DEBUG: Testing command $1 " if $debug;
+ $success = 0 unless iscmd($1,\@SAFECMDLIST,\@SAFECMDEXCL); ### or $1 eq "";
+ ### print STDERR " success=$success\n" if $debug;
+ }
+ }
+ ### }
+ if ($success) {
+ $to_test = $maybe_to_test;
+ if ( not iscmd($to_test,\@SAFECMDLIST,\@SAFECMDEXCL) and not iscmd($to_test, \@SAFECMDEXCL, [])) {
+ # # one should add $to_test to the list of safe commands.
+ init_regex_arr_list(\@SAFECMDLIST, $to_test);
+ print STDERR "Adding $to_test to the list of safe commands\n" if $verbose;
+ }
+ }
+ }
+}
+
+
+# helper function for flatten
+# remove \endinput at beginning of line and everything
+# following it, # if \endinput is not at the beginning of
+# the line, nothing will be removed. It is assumed that
+# this case is most common when \endinput is part of a
+# conditional clause. The file will only be processed
+# correctly if the conditional is always false,
+# i.e. \endinput # not actually reached
+sub remove_endinput {
+ # s/// operates on default input
+ $_[0] =~ s/^\\endinput.*\Z//ms ;
+ return($_[0]);
+}
+
+# flatten($text,$preamble,$filename,$encoding)
+# expands \input and \include commands within text
+# expands \bibliography command with corresponding bbl file if available
+# expands \subfile command (from subfiles package - not part of standard text distribution)
+# preamble is scanned for includeonly commands
+# encoding is the encoding
+sub flatten {
+ my ($text,$preamble,$filename,$encoding)=@_;
+ my ($includeonly,$dirname,$fname,$newpage,$fullfile,$filecontent,$replacement,$begline,$bblfile,$subfile,$command,$verbenv,$verboptions);
+ my ($subpreamble,$subbody,$subpost);
+ require File::Basename ;
+ require File::Spec ;
+ $dirname = File::Basename::dirname($filename);
+ $bblfile = $filename;
+ $bblfile=~s/\.tex$//;
+ $bblfile.=".bbl";
+
+ if ( ($includeonly) = ($preamble =~ m/\\includeonly\{(.*?)\}/ ) ) {
+ $includeonly =~ s/,/|/g;
+ } else {
+ $includeonly = '.*?';
+ }
+
+ print STDERR "DEBUG: includeonly $includeonly\n" if $debug;
+
+ # recursively replace \\input and \\include files
+ $text =~ s/(^(?:[^%\n]|\\%)*)(\\input\{(.*?)\}|\\include\{(${includeonly}(?:\.tex)?)\})/{
+ $begline=(defined($1)? $1 : "") ;
+ $fname = $3 if defined($3) ;
+ $fname = $4 if defined($4) ;
+ # # add tex extension unless there is a three or four letter extension already
+ $fname .= ".tex" unless $fname =~ m|\.\w{3,4}$|;
+ $fullfile = File::Spec->catfile($dirname,$fname);
+ print STDERR "DEBUG Beg of line match |$1|\n" if defined($1) && $debug ;
+ print STDERR "Include file $fname\n" if $verbose;
+ print STDERR "DEBUG looking for file ",$fullfile, "\n" if $debug;
+ # content of file becomes replacement value (use recursion), add \newpage if the command was include
+ if ( -f $fullfile ) {
+ # If file exists, replace input or include command with expanded input
+ $replacement=flatten(read_file_with_encoding($fullfile, $encoding), $preamble,$filename,$encoding) or die "Could not open file ",$fullfile,": $!";
+ $replacement = remove_endinput($replacement);
+ # \include always starts a new page; use explicit \newpage command to simulate this
+ $newpage=(defined($4)? " \\newpage " : "") ;
+ } else {
+ # if file does not exist, do not expand include or input command (do not warn if fname contains #[0-9] as it is then likely part of a command definition
+ # and is not meant to be expanded directly
+ print STDERR "WARNING: Could not find included file ",$fullfile,". I will continue but not expand |$2|\n" unless $fname =~ m(#[0-9]) ;
+ $replacement = $2 ; # i.e. just the original command again -> make no change file does not exist
+ $newpage="";
+ }
+ "$begline$newpage$replacement$newpage";
+ }/exgm;
+
+ # replace bibliography with bbl file if it exists
+ $text=~s/(^(?:[^%\n]|\\%)*)\\bibliography\{(.*?)\}/{
+ if ( -f $bblfile ){
+ $replacement=read_file_with_encoding(File::Spec->catfile($bblfile), $encoding);
+ } else {
+ warn "Bibliography file $bblfile cannot be found. No flattening of \\bibliography done. Run bibtex on old and new files first";
+ $replacement="\\bibliography{$2}";
+ }
+ $begline=(defined($1)? $1 : "") ;
+ "$begline$replacement";
+ }/exgm;
+
+ # replace subfile with contents (subfile package)
+ $text=~s/(^(?:[^%\n]|\\%)*)\\subfile\{(.*?)\}/{
+ $begline=(defined($1)? $1 : "") ;
+ $fname = $2;
+ # # add tex extension unless there is a three or four letter extension already
+ $fname .= ".tex" unless $fname =~ m|\.\w{3,4}|;
+ print STDERR "Include file as subfile $fname\n" if $verbose;
+ # content of file becomes replacement value (use recursion)
+ # now strip away everything outside and including \begin{document} and \end{document} pair#
+ # # note: no checking for comments is made
+ $fullfile=File::Spec->catfile($dirname,$fname);
+ if ( -f $fullfile) {
+ # if file exists, expand \subfile command by contents of file
+ $subfile=read_file_with_encoding($fullfile,$encoding) or die "Could not open included subfile ",$fullfile,": $!";
+ ($subpreamble,$subbody,$subpost)=splitdoc($subfile,'\\\\begin\{document\}','\\\\end\{document\}');
+ ### $subfile=~s|^.*\\begin{document}||s;
+ ### $subfile=~s|\\end{document}.*$||s;
+ $replacement=flatten($subbody, $preamble,$filename,$encoding);
+ ### $replacement = remove_endinput($replacement);
+ } else {
+ # if file does not exist, do not expand subfile
+ print STDERR "WARNING: Could not find subfile ",$fullfile,". I will continue but not expand |$2|\n" unless $fname =~ m(#[0-9]) ;
+ $replacement = "\\subfile\{$2\}" ; # i.e. just the original command again -> make no change file does not exist
+ }
+
+ "$begline$replacement";
+ }/exgm;
+
+ # replace \verbatiminput and \lstlistinginput
+ $text=~s/(^(?:[^%\n]|\\%)*)\\(verbatiminput\*?|lstinputlisting)$extraspace(\[$brat_n\])?$extraspace\{(.*?)\}/{
+ $begline=(defined($1)? $1 : "") ;
+ $command = $2 ;
+ $fname = $4 ;
+ $verboptions = defined($3)? $3 : "" ;
+ if ($command eq 'verbatiminput' ) {
+ $verbenv = "verbatim" ;
+ } elsif ($command eq 'verbatiminput*' ) {
+ $verbenv = "verbatim*" ;
+ } elsif ($command eq 'lstinputlisting' ) {
+ $verbenv = "lstlisting" ;
+ } else {
+ die "Internal errorL Unexpected verbatim input type $command.\n";
+ }
+ print STDERR "DEBUG Beg of line match |$begline|\n" if $debug ;
+ print STDERR "Include file $fname verbatim\n" if $verbose;
+ print STDERR "DEBUG looking for file ",File::Spec->catfile($dirname,$fname), "\n" if $debug;
+ # content of file becomes replacement value (do not 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=read_file_with_encoding(File::Spec->catfile($dirname,$fname), $encoding) or die "Couldn't find file ",File::Spec->catfile($dirname,$fname),": $!";
+ # Add a new line if it not already there (note that the matching operator needs to use different delimiters, as we are still inside an outer scope that takes precedence
+ $replacement .= "\n" unless $replacement =~ m(\n$) ;
+ "$begline\\begin{$verbenv}$verboptions\n$replacement\\end{$verbenv}\n";
+ }/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 or external file
+# (end of file after __END__ token)
+# if $type is a filename, it will read the file instead of reading from the appendix
+# otherwise it will screen appendix for line "%DIF $TYPE" and copy everything up to line
+# '%DIF END $TYPE' (where $TYPE is upcased version of $type)
+# extrapream('-nofail',$type) will---instead of failing---simply return nothing if
+# it does not find the matching line in a appendix (do not use -nofail option with multiple types!)
+sub extrapream {
+ my @types=@_;
+ my ($type,$arg);
+ my $nofail=0;
+ ###my @retval=("%DIF PREAMBLE EXTENSION ADDED BY LATEXDIFF") ;
+ my @retval=();
+ my ($copy);
+
+ foreach $arg ( @types ) {
+ if ( $arg eq '-nofail' ) {
+ $nofail=1;
+ next;
+ }
+ $type=$arg;
+ $copy=0;
+ if ( -f $type || lc $type eq '/dev/null' ) {
+ open (FILE,$type) or die "Cannot open preamble file $type: $!";
+ print STDERR "Reading preamble file $type\n" if $verbose ;
+ while (<FILE>) {
+ 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;
+ # save filehandle position (before first read this points to line after __END__)
+ # but seek DATA,0,0 resets it to the beginning of the file
+ # see https://stackoverflow.com/questions/4459601/how-can-i-use-data-twice
+ my $data_start = tell DATA;
+ while (<DATA>) {
+ if ( m/^%DIF $type/ ) {
+ $copy=1;
+ } elsif ( m/^%DIF END $type/ ) {
+ last;
+ }
+ chomp;
+ push (@retval,"$_ %DIF PREAMBLE") if $copy;
+ }
+ if ( $copy == 0 ) {
+ unless ($nofail) {
+ print STDERR "\nPreamble style $type not implemented.\n";
+ print STDERR "Write latexdiff -h to get help with available styles\n";
+ exit(2);
+ }
+ }
+ seek DATA,$data_start,0; # rewind DATA handle to beginning of data record
+ }
+ }
+ ###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");
+ print TOKENOLD join("***\n",@oldwords);
+ close(TOKENOLD);
+ open(TOKENNEW,">","latexdiff.debug.tokennew2");
+ 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
+# if there is white space in the beginning return that as first token
+sub splitlatex {
+ my ($inputstring) = @_ ;
+ my $string=$inputstring ;
+ # if input is empty, return empty list
+ length($string)>0 or return ();
+ $string=~s/^(\s*)//s;
+ my $leadin=$1;
+ length($string)>0 or return ($leadin);
+
+ 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;
+ }
+
+ }
+ unshift(@retval,$leadin) if (length($leadin)>0);
+ 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@*]+))((?:\[$brat_n\]|\{$pat_n\})*)/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;
+
+ # make a list of all TEXTCMDLIST commands in deleted and added blocks
+ $delcmds = extractcommands($delblock);
+ $addcmds = extractcommands($addblock);
+ # now find those text commands, which are found in both deleted and added blocks, and expand them
+ # 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}\[$brat_n\]${extraspace}|${extraspace}\{$pat_n\})*)/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}\[$brat_n\]|${extraspace}\{$pat_n\})*${extraspace}\{)($pat_n)(\}\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;
+ print STDERR "DEBUG: iscmd($cmd)=" if $debug;
+ foreach $pat ( @$regexar ) {
+ if ( $cmd =~ m/^${pat}$/ ) {
+ $ret=1 ;
+ last;
+ }
+ }
+ print STDERR "0\n" if ($debug && !$ret) ;
+ return 0 unless $ret;
+ foreach $pat ( @$regexexcl ) {
+ print STDERR "0\n" if ( $debug && $cmd =~ m/^${pat}$/) ;
+ return 0 if ( $cmd =~ m/^${pat}$/ );
+ }
+ print STDERR "1\n" if $debug;
+ 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 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);
+ ### print STDERR "DEBUG: marktags $openmark,$closemark,$open,$close,$opencmd,$closecmd,$comment\n" if $debug;
+ ### print STDERR "DEBUG: marktags blocksplit ",join("|",@$block),"\n" if $debug;
+ foreach (@$block) {
+ $word=$_;
+ ### print STDERR "DEBUG MARKTAGS: |$word|\n" if $debug;
+ if ( $word =~ s/^%/%$comment/ ) {
+ # a comment
+ if ($cmd==1) {
+ push (@$retval,$closecmd) ;
+ $cmd=-1;
+ }
+ push (@$retval,$word);
+ next;
+ }
+ if ( $word =~ m/^\s*$/ ) {
+ ### print STDERR "DEBUG MARKTAGS: whitespace detected |$word| cmdcom |$cmdcomment| |$opencmd|\n" if $debug;
+ # a sequence of white-space characters - this should only ever happen for the first element of block.
+ # in deleted block, omit, otherwise just copy it in
+ if ( ! $cmdcomment) { # ignore in deleted blocks
+ push(@$retval,$word);
+ }
+ next;
+ }
+ if (! $noncomment) {
+ push (@$retval,$openmark);
+ $noncomment=1;
+ }
+ # negative lookahead pattern (?!) in second clause is put in to avoid matching \( .. \) patterns
+ # also note that second pattern will match \\
+ print STDERR "DEBUG marktags: Considering word |$word|\n" if $debug;
+ if ( $word =~ /^[&{}\[\]]/ || ( $word =~ /^\\(?!\()(\\|[`'^"~=.]|[\w*@]+)/ && !iscmd($1,\@SAFECMDLIST,\@SAFECMDEXCL)) ) {
+ ###print STDERR "DEBUG MARKTAGS is a non-safe command ($1)\n" if $debug;
+ ### 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\]|\{$pat_n\})*\{)($pat_n)(\}\s*)$/so )
+ if ( ( $word =~ m/^(\\([\w\d\*]+)(?:${extraspace}\[$brat_n\]|${extraspace}\{$pat_n\})*${extraspace}\{)($pat_n)(\}\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=('\\','\\\\',@UNSAFEMATHCMD);
+ 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
+ ### print STDERR "MARKTAGS: Add command |$word|\n";
+ push (@$retval,$word);
+ $cmd=1;
+ }
+ } else {
+ ###print STDERR "DEBUG MARKTAGS is an ordinary word or SAFECMD command \n" if $debug;
+ # just an ordinary word or command in SAFECMD
+ push (@$retval,$open) if $cmd==-1 ;
+ push (@$retval,$closecmd,$open) if $cmd==1 ;
+ ###TODO: check here if it is a command in MBOXCMD list, and surround it with \mbox{...}
+ ### $word =~ /^\\(?!\()(\\|[`'^"~=.]|[\w*@]+)/ && iscmd($1,\@MBOXCMDLIST,\@MBOXCMDEXCL))
+ ### but actually this check has been carried out already so can simply check if word begins with backslash
+ if ( $word =~ /^\\(?!\()(\\|[`'^"~=.]|[\w*@]+)(.*?)(\s*)$/s && iscmd($1,\@MBOXCMDLIST,\@MBOXCMDEXCL)) {
+ # $word is a safe command in MBOXCMDLIST
+ ###print STDERR "DEBUG Mboxsafecmd detected:$word:\n" if $debug ;
+ push(@$retval,"\\mbox{$AUXCMD\n\\" . $1 . $2 . $3 ."}\\hspace{0pt}$AUXCMD\n" );
+ } else {
+ # $word is a normal word or a safe command (not in MBOXCMDLIST)
+ push (@$retval,$word);
+ }
+ $cmd=0;
+ }
+ }
+ push (@$retval,$close) if $cmd==0;
+ push (@$retval,$closecmd) if $cmd==1;
+
+ push (@$retval,$closemark) if ($noncomment);
+ return @$retval;
+}
+
+#used in preprocess
+sub take_comments_and_enter_from_frac() {
+ #*************take the \n and % between frac and {}***********
+ #notice all of the substitution are made none global
+ while( m/\\begin\{($MATHENV|$MATHARRENV|SQUAREBRACKET)}(.*?)\\frac(([\s]*%[^\n]*?)*[\r\n|\r|\n])+\{(.*?)\\end\{\1}/s ) {
+ # if there isn't any % or \n in the pattern $2 then there should be an \\end{...} in $2
+ ### print STDERR "Match the following in take_comments and_enter_from_frac(1):\n****$&****\n" if $debug;
+ if( $2 !~ m/\\end\{$1}/s ) {
+ # take out % and \n from the next match only (none global)
+ s/\\begin\{($MATHENV|$MATHARRENV|SQUAREBRACKET)}(.*?)\\frac(([\s]*%[^\n]*?)*[\r\n|\r|\n])+\{(.*?)\\end\{\1}/\\begin{$1}$2\\frac{$5\\end{$1}/s;
+ }
+ else{
+ #there are no more % and \n in $2, we want to find the next one so we clear the begin-end from the pattern
+ s/\\begin\{($MATHENV|$MATHARRENV|SQUAREBRACKET)}(.*?)\\end\{\1}/MATHBLOCK$1\{$2\}MATHBLOCKEND/s;
+ }
+ }
+ ###cleaning up
+ while( s/MATHBLOCK($MATHENV|$MATHARRENV|SQUAREBRACKET)\{(.*?)\}MATHBLOCKEND/\\begin{$1}$2\\end{$1}/s ){}
+ ###*************take the \n and % between frac and {}***********
+
+ ###**********take the \n and % between {} and {} of the frac***************
+ while( m/\\begin\{($MATHENV|$MATHARRENV|SQUAREBRACKET)\}(.*?)\\frac\{(.*?)\\end\{\1\}/s ) {
+ # if there isn't any more //frac before the first //end in the pattern $2 then there should be an \\end{...} in $2
+ ###print STDERR "Match the following in take_comments and_enter_from_frac(2):\n****$&****\n" if $debug;
+ if( $2 !~ m/\\end\{$1\}/s ) {
+ # from now on CURRFRAC is the frac we are looking at
+ s/\\begin\{($MATHENV|$MATHARRENV|SQUAREBRACKET)\}(.*?)\\frac\{(.*?)\\end\{\1\}/\\begin\{$1\}$2CURRFRAC\{$3\\end\{$1\}/s;
+ while( m/\\begin\{($MATHENV|$MATHARRENV|SQUAREBRACKET)\}(.*?)CURRFRAC\{(.*?)\\end\{\1\}/s ) {
+ if( m/\\begin\{($MATHENV|$MATHARRENV|SQUAREBRACKET)\}(.*?)CURRFRAC\{($pat_n)\}([\s]*(%[^\n]*?)*[\r\n|\r|\n])+[\s]*\{(.*?)\\end\{\1}/s ) {
+ s/\\begin\{($MATHENV|$MATHARRENV|SQUAREBRACKET)\}(.*?)CURRFRAC\{($pat_n)\}([\s]*(%[^\n]*?)*[\r\n|\r|\n])+[\s]*\{(.*?)\\end\{\1\}/\\begin\{$1\}$2CURRFRAC\{$3\}\{$6\\end\{$1\}/s;
+ }
+ else { # there is no comment or \n between the two brackets {}{}
+ # change CURRFRAC to FRACSTART so we can change them all back to //frac{ when we finish
+ s/\\begin\{($MATHENV|$MATHARRENV|SQUAREBRACKET)}(.*?)CURRFRAC\{(.*?)\\end\{\1}/\\begin{$1}$2FRACSTART\{$3\\end{$1}/s;
+ }
+ }
+ }
+ else{
+ ###there are no more frac in $2, we want to find the next one so we clear the begin-end from the pattern
+ s/\\begin\{($MATHENV|$MATHARRENV|SQUAREBRACKET)}(.*?)\\end\{\1}/MATHBLOCK$1\{$2\}MATHBLOCKEND/s;
+ }
+
+ }
+ ###cleaning up
+ while( s/MATHBLOCK($MATHENV|$MATHARRENV|SQUAREBRACKET)\{(.*?)\}MATHBLOCKEND/\\begin{$1}$2\\end{$1}/s ){}
+ s/FRACSTART/\\frac/g;
+ ###***************take the \n and % between {} and {} of the frac*********************
+}
+
+# preprocess($string, ..)
+# carry out the following pre-processing steps for all arguments:
+# 1. Remove leading white-space
+# Change \{ to \QLEFTBRACE and \} to \QRIGHTBRACE and \& to \AMPERSAND
+# #. Change {,} in comments to \CLEFTBRACE, \CRIGHTBRACE
+# 2. mark all first empty line (in block of several) with \PAR tokens
+# 3. Convert all '\%' into '\PERCENTAGE ' and all '\$' into \DOLLAR to make parsing regular expressions easier
+# 4. Convert all \verb|some verbatim text| commands (where | can be an arbitrary character)
+# into \verb{hash} (also lstinline)
+# 5. Convert \begin{verbatim} some verbatim text \end{verbatim} into \verbatim{hash} (not only verbatim, all patterns matching VERBATIMENV)
+# 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 math-mode COARSE,WHOLE or NONE 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 {
+ for (@_) {
+
+
+ # change in \verb and similar commands - note that I introduce an extra space here so that the
+ # already hashed variants do not trigger again
+ # transform \lstinline{...}
+# s/\\lstinline(\[$brat0\])?(\{(?:.*?)\})/"\\DIFlstinline". $1 ."{". tohash(\%verbhash,"$2") ."}"/esg;
+# s/\\lstinline(\[$brat0\])?((\S).*?\2)/"\\DIFlstinline". $1 ."{". tohash(\%verbhash,"$2") ."}"/esg;
+ s/\\lstinline((?:\[$brat_n\])?)(\{(?:.*?)\})/"\\DIFlstinline". $1 ."{". tohash(\%verbhash,"$2") ."}"/esg;
+ s/\\lstinline((?:\[$brat_n\])?)(([^\s\w]).*?\3)/"\\DIFlstinline". $1 ."{". tohash(\%verbhash,"$2") ."}"/esg;
+ s/\\(verb\*?|lstinline)([^\s\w])(.*?)\2/"\\DIF${1}{". tohash(\%verbhash,"${2}${3}${2}") ."}"/esg;
+
+ # Change \{ to \QLEFTBRACE, \} to \QRIGHTBRACE, and \& to \AMPERSAND
+ s/(?<!\\)\\\{/\\QLEFTBRACE /sg;
+ s/(?<!\\)\\\}/\\QRIGHTBRACE /sg;
+ s/(?<!\\)\\&/\\AMPERSAND /sg;
+# replace {,} in comments with \\CLEFTBRACE,\\CRIGHTBRACE
+ 1 while s/((?<!\\)%.*)\{(.*)$/$1\\CLEFTBRACE $2/mg ;
+ 1 while s/((?<!\\)%.*)\}(.*)$/$1\\CRIGHTBRACE $2/mg ;
+ s/(?<!\\)\\%/\\PERCENTAGE /g ; # (?<! is negative lookbehind assertion to prevent \\% from being converted
+ s/(?<!\\)\\\$/\\DOLLAR /g ; # (?<! is negative lookbehind assertion to prevent \\$ from being converted
+ s/\\begin\{($VERBATIMENV)\}(.*?)\\end\{\1\}/"\\${1}{". tohash(\%verbhash,"${2}") . "}"/esg;
+ s/\\begin\{($VERBATIMLINEENV)\}(.*?)\\end\{\1\}/"\\begin{$1}". linecomment($2) . "\\end{$1}"/esg;
+
+ # mark all first empty line (in block of several) with \PAR tokens
+ s/\n(\s*?)\n((?:\s*\n)*)/\n$1\\PAR\n$2/g ;
+ # Convert _n or _\cmd into \SUBSCRIPTNB{n} or \SUBSCRIPTNB{\cmd} and _{nnn} into \SUBSCRIPT{nn}
+ 1 while s/(?<!\\)_(\s*([^{\\\s]|\\\w+))/\\SUBSCRIPTNB{$1}/g ;
+ 1 while s/(?<!\\)_(\s*{($pat_n)})/\\SUBSCRIPT$1/g ;
+ # Convert ^n into \SUPERSCRIPTNB{n} and ^{nnn} into \SUPERSCRIPT{nn}
+ 1 while s/(?<!\\)\^(\s*([^{\\\s]|\\\w+))/\\SUPERSCRIPTNB{$1}/g ;
+ 1 while s/(?<!\\)\^(\s*{($pat_n)})/\\SUPERSCRIPT$1/g ;
+ # Convert \sqrt{n} into \SQRT{n} and \sqrt nn into SQRTNB{nn}
+ 1 while s/(?<!\\)\\sqrt(\s*([^{\\\s]|\\\w+))/\\SQRTNB{$1}/g ;
+ 1 while s/(?<!\\)\\sqrt(\s*{($pat_n)})/\\SQRT$1/g ;
+ # Convert $$ $$ into \begin{DOLLARDOLLAR} \end{DOLLARDOLLAR}
+ s/\$\$(.*?)\$\$/\\begin{DOLLARDOLLAR}$1\\end{DOLLARDOLLAR}/sg;
+ # Convert \[ \] into \begin{SQUAREBRACKET} \end{SQUAREBRACKET}
+ s/(?<!\\)\\\[/\\begin{SQUAREBRACKET}/sg;
+ s/\\\]/\\end{SQUAREBRACKET}/sg;
+ # Convert all picture environmentent (\begin{PICTUREENV} .. \end{PICTUREENV} \PICTUREBLOCKenv
+ s/\\begin\{($PICTUREENV)}(.*?)\\end\{\1}/\\PICTUREBLOCK$1\{$2\}/sg;
+ # For math-mode COARSE,WHOLE or NONE option -convert all \begin{MATH} .. \end{MATH}
+ # into \MATHBLOCKMATH{...} commands, where MATH is any valid math environment
+ # Also convert all array environments into ARRAYBLOCK environments
+
+ if ( $mathmarkup != FINE ) {
+ # DIFANCHORARRB and DIFANCHORARRE, DIFANCHORMATHB and DIFANCHORMATHE markers are inserted here to encourage the matching algorithm
+ # to always match up the closing brace. Otherwise sometimes one ends up with a situation where
+ # the closing brace is deleted and added at another point. The deleted closing brace is then
+ # prevented by a %DIFDELCMD, leading to material leaking in or out of the math environment.
+ # The anchors are removed in post-processing again. (note that they are simple text to cause least amount of complications
+ # Admittedly, this is something of a hack and will not always work. If it does not, then one needs to
+ # resort to WHOLE or FINE, or NONE math mode processing.
+ s/\\begin\{($ARRENV)}(.*?)\\end\{\1}/\\ARRAYBLOCK$1\{$2\\DIFANCHORARRB \}\\DIFANCHORARRE /sg;
+
+ take_comments_and_enter_from_frac();
+
+ s/\\begin\{($MATHENV|$MATHARRENV|SQUAREBRACKET)\}(.*?)\\end\{\1\}/\\MATHBLOCK$1\{$2\\DIFANCHORMATHB \}\\DIFANCHORMATHE /sg;
+ }
+
+ # add final token " STOP"
+ $_ .= " STOP"
+ }
+}
+
+
+# $expanded=linecomment($string)
+#preface all lines with verbatim marker (usually DIFVRB)
+sub linecomment {
+ my @verbatimlines=split("\n",$_[0]);
+ # the first line needs special treatment - we do want to retain optional arguments as is but wrap the remainder also with VERBCOMMENT
+ ### print STDERR "DEBUG: before verbatimlines[0] = ",$verbatimlines[0],"\n";
+ $verbatimlines[0]=~s/^((?:\s*\[$brat_n\])?\s*)([^\s\[].*)/ defined($2) ? ( "$1\%$VERBCOMMENT$2" ) : ( $1 )/e;
+ ### print STDERR "DEBUG: after verbatimlines[0] = ",$verbatimlines[0],"\n";
+ return(join("\n%$VERBCOMMENT",@verbatimlines)."\n");
+}
+
+# $simple=reverselinecomment($env $string)
+# remove DIFVRB comments but leave changed lines marked
+sub reverselinecomment {
+ my ($environment, $verbatimtext)=@_;
+ ###print STDERR "OLD VERBATIMTEXT: |$verbatimtext|\n";
+ # remove markup added by latexdiff
+ # (this should occur only if the type of verbatim environment was changed)
+ # (note that this destroys some information in old file)
+ # in theory I could save it by moving it out of the verbatim environment
+ # but this requires more bookkeeping and is probably not necessary)
+ $verbatimtext =~ s/\\DIFaddbegin //g;
+ $verbatimtext =~ s/\\DIFaddend //g;
+ $verbatimtext =~ s/\\DIFdelbegin //g;
+ $verbatimtext =~ s/\\DIFdelend //g;
+ $verbatimtext =~ s/$DELCMDOPEN.*//g;
+
+ # remove DIFVRB mark
+ $verbatimtext=~ s/%$VERBCOMMENT//g;
+
+ # remove part of the markup in changed lines
+ # if any of these substitution was made, then there was at least
+ # one changed line, and we have to extend the style
+ if ( $verbatimtext=~ s/$VERBCOMMENT//g ) {
+ # in the next line we add ~alsolanguage~ modifier, but also deletes the rest of the line after the optional argument, as lstlisting commands gets sometimes
+ # very confused by what is there (and othertimes seems to ignore this anyway)
+ unless ( $verbatimtext =~ s/^(\s*)\[($brat_n)\](.*)\n/$1\[$2,alsolanguage=DIFcode\]\n/ ) {
+ if ( $verbatimtext =~ m/^\s*\n/ ) {
+ $verbatimtext = "[alsolanguage=DIFcode]" . $verbatimtext;
+ } else {
+ $verbatimtext = "[alsolanguage=DIFcode]\n" . $verbatimtext;
+ }
+ }
+ # There is a bug in listings package (at least v1.5b) for empty comments where the actual comment command is not made invisible
+ # I therefore have to introduce an artificial '-' character at the end of empty added or deleted lines
+ $verbatimtext =~ s/($DELCOMMENT\s*)$/$1-/mg;
+ $verbatimtext = "\\DIFmodbegin\n\\begin{${environment}}${verbatimtext}\\end{${environment}}\n\\DIFmodend"
+ } else {
+ $verbatimtext = "\\begin{${environment}}${verbatimtext}\\end{${environment}}"
+ }
+ ###print STDERR "NEW VERBATIMTEXT: |$verbatimtext|\n";
+ return($verbatimtext);
+}
+
+
+#hashstring=tohash(\%hash,$string)
+# creates a hash value based on string and stores in %hash
+sub tohash {
+ my ($hash,$string)=@_;
+ my (@arr,$val);
+ my ($sum,$i)=(0,1);
+ my ($hstr);
+
+ @arr=unpack('c*',$string);
+
+ while (1) {
+ foreach $val (@arr) {
+ $sum += $i*$val;
+ $i++;
+ }
+ $hstr= "$sum";
+ last unless (defined($hash->{$hstr}) && $string ne $hash->{$hstr});
+ # else found a duplicate HASH need to repeat for a higher hash value
+ }
+ $hash->{$hstr}=$string;
+ ### print STDERR "Hash:$hstr: Content:$string:\n";
+ 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;
+}
+
+# writedebugfile(string, label)
+# if $debug set writes <string> to file latexdiff.debug.<label>
+# otherwise do nothing
+sub writedebugfile {
+ my ($string,$label)=@_;
+ if ( $debug ) {
+ open(RAWDIFF,">","latexdiff.debug." . $label);
+ print RAWDIFF $string;
+ close(RAWDIFF);
+ }
+}
+
+
+# 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 math-mode COARSE,WHOLE or NONE option set: Convert \MATHBLOCKmath{..} commands back to environments
+#
+# Convert all PICTUREblock{..} commands back to the appropriate environments
+# 3. Convert DIFadd, DIFdel, DIFaddbegin , ... 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 '\%' and '\DOLLAR ' 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, \end,{,} in comments
+# Change \QLEFTBRACE, \QRIGHTBRACE,\AMPERSAND 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);
+
+ my (@textparts,@newtextparts,@liststack,$listtype,$listlast);
+
+ my (@itemargs, $itemarg);
+
+
+ for (@_) {
+ # change $'s in comments to something harmless
+ 1 while s/(%.*)\$/$1DOLLARDIF/mg ;
+
+ # Remove final STOP token
+ s/ STOP$//;
+ # Replace \RIGHTBRACE in comments by \MBLOCKRIGHTBRACE
+ # the only way to get these is as %DIFDELCMD < \RIGHTBRACE construction
+ # This essentially marks closing right braces of MATHBLOCK environments, which did not get matched
+ # up. This case should be rare, so I just leave this in the diff file output. Not really elegant
+ # but can still be dealt with later if it results in problems.
+ s/%DIFDELCMD < \\RIGHTBRACE/%DIFDELCMD < \\MBLOCKRIGHTBRACE/g ;
+ # Replace \RIGHTBRACE by }
+ s/\\RIGHTBRACE/}/g;
+
+ # 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 ) {
+ ### while ( m/\\DIFdelbegin.*?\\DIFdelend/sg ) {
+ ### print STDERR "DEBUG Match delblock \n||||$&||||\n at ",pos,"\n";
+ $cnt=0;
+ $len=length($&);
+ $begin=pos($_) - $len;
+ $delblock=$&;
+ ### A much simpler method for math replacement might follow this strategy (can recycle part of the commands below for following
+ ### this strategy:
+ ### 1. a Insert aux commands \begin{MATHMODE} or \end{MATHMODE} for all deleted commands opening or closing displayed math mode
+ ### b Insert aux commands \begin{MATHARRMODE} or \end{MATHARRMODE} for all deleted commands opening or closing math array mode
+ ### 2 Replace MATHMODE and MATHARRMODE by correct pairing if appropriate partner math command is found in text
+ ### 3 a Replace remaining \begin{MATHMODE}...\end{MATHMODE} pairs with \begin{$MATHREPL}..\end{$MATHREPL}
+ ### b Replace remaining \begin{MATHARRMODE}...\end{MATHARRMODE} pairs with \begin{$MATHREPL}..\end{$MATHREPL}
+ ### 4 Delete all aux command math mode pairs which have simply comments or empty lines between them
+ ### As written this won't actually work!
+
+
+ ### Most general case: allow all included environments
+ ### $delblock=~ s/(\%DIFDELCMD < \s*\\begin\{(\w*\*?)\}\s*?\n)(.*?)(\%DIFDELCMD < \s*\\end\{\2\})/$1\\begin{$2}$AUXCMD\n$3\n\\end{$2}$AUXCMD\n$4/sg;
+ ### (.*?[^\n]?)\n? construct is necessary to avoid empty lines in math mode, which result in
+ ### an error
+ # displayed math environments
+ ###0.5: $delblock=~ s/(\%DIFDELCMD < \s*\\begin\{((?:$MATHENV)|SQUAREBRACKET)\}\s*?(?:$DELCMDCLOSE|\n))(.*?[^\n]?)\n?(\%DIFDELCMD < \s*\\end\{\2\})/\\begin{$MATHREPL}$AUXCMD\n$1$3\n\\end{$MATHREPL}$AUXCMD\n$4/sg;
+ 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/(?<!${AUXCMD}\n)(\%DIFDELCMD < \s*\\end\{($MATHENV)\}\s*?\n)(.*?[^\n]?)\n?(?<!${AUXCMD}\n)(\%DIFDELCMD < \s*\\begin\{\2\})/$1\\end{$MATHREPL}$AUXCMD\n$3\n\\begin{$MATHREPL}$AUXCMD\n$4/sg;
+ ###0.5: $delblock=~ s/(?<!${AUXCMD}\n)(\%DIFDELCMD < \s*\\end\{((?:$MATHENV)|SQUAREBRACKET)\}\s*?(?:$DELCMDCLOSE|\n))(.*?[^\n]?)\n?(?<!${AUXCMD}\n)(\%DIFDELCMD < \s*\\begin\{\2\})/\\end{MATHMODE}$AUXCMD\n$1$3\n\\begin{MATHMODE}$AUXCMD\n$4/sg;
+ $delblock=~ s/(?<!${AUXCMD}\n)(\%DIFDELCMD < \s*\\end\{((?:$MATHENV)|SQUAREBRACKET)\}.*?(?:$DELCMDCLOSE|\n))(.*?[^\n]?)\n?(?<!${AUXCMD}\n)(\%DIFDELCMD < \s*\\begin\{\2\})/\\end\{MATHMODE\}$AUXCMD\n$1$3\n\\begin\{MATHMODE\}$AUXCMD\n$4/sg;
+
+ # now look for unpaired %DIFDELCMD < \begin{MATHENV}; if found add \begin{$MATHREPL} and insert \end{$MATHREPL}
+ # just before end of block; again we use look-behind assertion to avoid matching constructions which have already been converted
+ if ($delblock=~ s/(?<!${AUXCMD}\n)(\%DIFDELCMD < \s*\\begin\{((?:$MATHENV)|SQUAREBRACKET)\}\s*?(?:$DELCMDCLOSE|\n))/$1\\begin{$MATHREPL}$AUXCMD\n/sg ) {
+ $delblock =~ s/(\\DIFdelend$)/\\end{$MATHREPL}$AUXCMD\n$1/s ;
+ }
+ # now look for unpaired %DIFDELCMD < \end{MATHENV}; if found add \end{MATHMODE} and insert \begin{MATHMODE}
+ # just before end of block; again we use look-behind assertion to avoid matching constructions which have already been converted
+ if ($delblock=~ s/(?<!${AUXCMD}\n)(\%DIFDELCMD < \s*\\end\{((?:$MATHENV)|SQUAREBRACKET)\}\s*?(?:$DELCMDCLOSE|\n))/$1\\end\{MATHMODE\}$AUXCMD\n/sg ) {
+ $delblock =~ s/(\\DIFdelend$)/\\begin\{MATHMODE\}$AUXCMD\n$1/s ;
+ }
+
+
+ ### pre-0.42 # same as above for special case \[.\] (latex abbreviation for displaymath)
+ ### pre-0.42 $delblock=~ s/(\%DIFDELCMD < \s*\\\[\s*?\n())(.*?[^\n]?)\n?(\%DIFDELCMD < \s*\\\])/$1\\\[$AUXCMD\n$3\n\\\]$AUXCMD\n$4/sg;
+ ### pre-0.42 $delblock=~ s/(?<!${AUXCMD}\n)(\%DIFDELCMD < \s*\\\]\s*?\n())(.*?[^\n]?)\n?(?<!${AUXCMD}\n)(\%DIFDELCMD < \s*\\\[)/$1\\\]$AUXCMD\n$3\n\\\[$AUXCMD\n$4/sg;
+ # equation array environment
+ ###pre-0.3 $delblock=~ s/(\%DIFDELCMD < \s*\\begin\{($MATHARRENV)\}\s*?\n)(.*?)(\%DIFDELCMD < \s*\\end\{\2\})/$1\\begin{$MATHARRREPL}$AUXCMD\n$3\n\\end{$MATHARRREPL}$AUXCMD\n$4/sg;
+ ###0.5 $delblock=~ s/(\%DIFDELCMD < \s*\\begin\{($MATHARRENV)\}\s*?(?:$DELCMDCLOSE|\n))(.*?[^\n]?)\n?(\%DIFDELCMD < \s*\\end\{\2\})/\\begin{$MATHARRREPL}$AUXCMD\n$1$3\n\\end{$MATHARRREPL}$AUXCMD\n$4/sg;
+ $delblock=~ s/(\%DIFDELCMD < \s*\\begin\{($MATHARRENV)\}.*?(?:$DELCMDCLOSE|\n))(.*?[^\n]?)\n?(\%DIFDELCMD < \s*\\end\{\2\})/\\begin{$MATHARRREPL}$AUXCMD\n$1$3\n\\end{$MATHARRREPL}$AUXCMD\n$4/sg;
+ ### pre-0.42 obsolete version which did not work on eqnarray test $delblock=~ s/(?<!${AUXCMD}\n)(\%DIFDELCMD < \s*\\end\{($MATHARRENV)\}\s*?\n)(.*?[^\n]?)\n?(?<!${AUXCMD}\n)(\%DIFDELCMD < \s*\\begin\{\2\})/$1\\end{$MATHARRREPL}$AUXCMD\n$3\n\\begin{$MATHARRREPL}$AUXCMD\n$4/sg;
+ $delblock=~ s/(?<!${AUXCMD}\n)(\%DIFDELCMD < \s*\\end\{($MATHARRENV)\}\s*?(?:$DELCMDCLOSE|\n))(.*?[^\n]?)\n?(?<!${AUXCMD}\n)(\%DIFDELCMD < \s*\\begin\{\2\})/\\end{MATHMODE}$AUXCMD\n$1$3\n\\begin{MATHMODE}$AUXCMD\n$4/sg;
+
+ # now look for unpaired %DIFDELCMD < \begin{MATHARRENV}; if found add \begin{$MATHARRREPL} and insert \end{$MATHARRREPL}
+ # just before end of block; again we use look-behind assertion to avoid matching constructions which have already been converted
+ if ($delblock=~ s/(?<!${AUXCMD}\n)(\%DIFDELCMD < \s*\\begin\{($MATHARRENV)\}\s*?(?:$DELCMDCLOSE|\n))/$1\\begin{$MATHARRREPL}$AUXCMD\n/sg ) {
+ $delblock =~ s/(\\DIFdelend$)/\\end{$MATHARRREPL}$AUXCMD\n$1/s ;
+ }
+ # now look for unpaired %DIFDELCMD < \end{MATHENV}; if found add \end{MATHMODE} and insert \begin{MATHMODE}
+ # just before end of block; again we use look-behind assertion to avoid matching constructions which have already been converted
+ if ($delblock=~ s/(?<!${AUXCMD}\n)(\%DIFDELCMD < \s*\\end\{($MATHARRENV)\}\s*?(?:$DELCMDCLOSE|\n))/$1\\end{MATHMODE}$AUXCMD\n/sg ) {
+ $delblock =~ s/(\\DIFdelend$)/\\begin{MATHMODE}$AUXCMD\n$1/s ;
+ }
+
+ # parse $delblock for deleted and reinstated eqnarray* environments - within those reinstate \\ and & commands
+ ### while ( $delblock =~ m/\\begin{$MATHARRREPL}$AUXCMD\n.*?\n\\end{$MATHARRREPL}$AUXCMD\n/sg ) {
+ while ( $delblock =~ m/\\begin\Q{$MATHARRREPL}$AUXCMD\E\n.*?\n\\end\Q{$MATHARRREPL}$AUXCMD\E\n/sg ) {
+ ### print STDERR "DEBUG Match eqarrayblock $& at ",pos,"\n";
+ $cnt2=0;
+ $len2=length($&);
+ $begin2=pos($delblock) - $len2;
+ $eqarrayblock=$&;
+ # reinstate deleted & and \\ commands
+ $eqarrayblock=~ s/(\%DIFDELCMD < \s*(\&|\\\\)\s*?(?:$DELCMDCLOSE|\n))/$1$2$AUXCMD\n/sg ;
+
+ substr($delblock,$begin2,$len2)=$eqarrayblock;
+ pos($delblock) = $begin2 + length($eqarrayblock);
+ }
+ } elsif ( $mathmarkup == COARSE || $mathmarkup == WHOLE ) {
+ # 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
+ $delblock=~ s/\\MATHBLOCK($MATHENV)\{($pat_n)\}/\\MATHBLOCK$MATHREPL\{$2\}/sg;
+ $delblock=~ s/\\MATHBLOCK($MATHARRENV)\{($pat_n)\}/\\MATHBLOCK$MATHARRREPL\{$2\}/sg;
+ }
+ # Reinstate completely deleted list environments. note that items within the
+ # environment will still be commented out. They will be restored later
+ $delblock=~ s/(\%DIFDELCMD < \s*\\begin\{($LISTENV)\}\s*?(?:\n|$DELCMDCLOSE))(.*?)(\%DIFDELCMD < \s*\\end\{\2\})/{
+ ### # block within the search; replacement environment
+ ### "$1\\begin{$2}$AUXCMD\n". restore_item_commands($3). "\n\\end{$2}$AUXCMD\n$4";
+ "$1\\begin{$2}$AUXCMD\n$3\n\\end{$2}$AUXCMD\n$4";
+ }/esg;
+
+ ### $delblock=~ s/\\begin\{$MATHENV}$AUXCMD/\\begin{$MATHREPL}$AUXCMD/g;
+ ### $delblock=~ s/\\end\{$MATHENV}$AUXCMD/\\end{$MATHREPL}$AUXCMD/g;
+ ### $delblock=~ s/\\begin\{$MATHARRENV}$AUXCMD/\\begin{$MATHARRREPL}$AUXCMD/g;
+ ### $delblock=~ s/\\end\{$MATHARRENV}$AUXCMD/\\end{$MATHARRREPL}$AUXCMD/g;
+
+ # 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}\[$brat_n\]${extraspace}|${extraspace}\{$pat_n\})*\s*${AUXCMD}\n)/\\$1$2\\addtocounter{$1}{-1}${AUXCMD}\n/sg ;
+
+ # bb. disable active labels within deleted blocks (i.e. those not commented out) (as these are not safe commands, this should normally only
+ # happen within deleted maths blocks
+ ### $delblock=~ s/(?<!$DELCMDOPEN)(\\$LABELCMD(?:${extraspace})\{(?:[^{}])*\}[\t ]*)\n?/${DELCMDOPEN}$1${DELCMDCLOSE}/smg ;
+ ### previous line caused trouble as by issue #90 I might need to modify this
+ $delblock=~ s/^([^%]*)(\\$LABELCMD(?:${extraspace})\{(?:[^{}])*\}[\t ]*)\n?/$1${DELCMDOPEN}$2${DELCMDCLOSE}/smg ;
+ ### print STDERR "<<<$delblock>>>\n" if $debug;
+
+
+ # c. If in-line math mode contains array environment, enclose the whole environment in \mbox'es
+ while ( $delblock =~ m/($math)(\s*)/sg ) {
+ # print STDERR "DEBUG Delblock Match math $& at ",pos,"\n";
+ $cnt2=0;
+ $len2=length($&);
+ $begin2=pos($delblock) - $len2;
+ $mathblock="%\n\\mbox{$AUXCMD\n$1\n}$AUXCMD\n";
+ next unless ( $mathblock =~ /ARRAYBLOCK/ or $mathblock =~ m/\{$ARRENV\}/ );
+ substr($delblock,$begin2,$len2)=$mathblock;
+ pos($delblock) = $begin2 + length($mathblock);
+ }
+ ### if ($CITE2CMD) {
+ ###### ${extraspace}(?:\[$brat0\]${extraspace}){0,2}\{$pat_n\})) .*?%%%\n
+ ### $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}\{$pat_n\})(\s*)/\\mbox{$AUXCMD\n$1\n}$AUXCMD\n/msg ;
+ ### $delblock=~s/(\\($CITECMD)${extraspace}(?:<$abrat0>${extraspace})?(?:\[$brat0\]${extraspace}){0,2}\{$pat_n\})(\s*)/\\mbox{$AUXCMD\n$1\n}$AUXCMD\n/msg ;
+ ### }
+ # if MBOXINLINEMATH is set, protect inlined math environments with an extra mbox
+ if ( $MBOXINLINEMATH ) {
+ # note additional \newline after command is omitted from output if right at the end of deleted block (otherwise a spurious empty line is generated)
+ $delblock=~s/($math)(?:[\s\n]*)?/\\mbox{$AUXCMD\n$1\n}$AUXCMD\n/sg;
+ }
+ ###if ( defined($packages{"listings"} and $latexdiffpreamble =~ /\\RequirePackage(?:\[$brat_n\])?\{color\}/)) {
+ ### # change included verbatim environments
+ ### $delblock =~ s/\\DIFverb\{/\\DIFDIFdelverb\{/g;
+ ### $delblock =~ s/\\DIFlstinline/\\DIFDIFdellstinline/g;
+ ###}
+ # Mark deleted verbose commands
+ $delblock =~ s/(${DELCMDOPEN}\\DIF((?:verb\*?|lstinline(?:\[$brat_n\])?)\{([-\d]*?)\}\s*).*)$/%\n\\DIFDIFdel$2${AUXCMD}\n$1/gm;
+ if ( $CUSTOMDIFCMD ) {
+ $delblock =~ s/(${DELCMDOPEN}.*)\\($CUSTOMDIFCMD)/$1${DELCMDCLOSE}\\DEL$2/gm;
+ }
+
+ # splice in modified delblock
+ substr($_,$begin,$len)=$delblock;
+ pos = $begin + length($delblock);
+ }
+ ###writedebugfile($_,'postprocess');
+
+ ### print STDERR "<<<$_>>>\n" if $debug;
+
+
+ # 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 =~ /ARRAYBLOCK/ or $mathblock =~ m/\{$ARRENV\}/) ;
+ substr($addblock,$begin2,$len2)=$mathblock;
+ pos($addblock) = $begin2 + length($mathblock);
+ }
+ # if MBOXINLINEMATH is set, protect inlined math environments with an extra mbox
+ if ( $MBOXINLINEMATH ) {
+ ##$addblock=~s/($math)/\\mbox{$AUXCMD\n$1\n}$AUXCMD\n/sg;
+ $addblock=~s/($math)(?:[\s\n]*)?/\\mbox{$AUXCMD\n$1\n}$AUXCMD\n/sg;
+ }
+ ###if ( defined($packages{"listings"} and $latexdiffpreamble =~ /\\RequirePackage(?:\[$brat0\])?\{color\}/)) {
+ # mark added verbatim commands
+ $addblock =~ s/\\DIFverb/\\DIFDIFaddverb/g;
+ $addblock =~ s/\\DIFlstinline/\\DIFDIFaddlstinline/g;
+ if( $CUSTOMDIFCMD ) {
+ $addblock =~ s/\\($CUSTOMDIFCMD)/\\ADD$1/g;
+ }
+ # markup the optional arguments of \item
+ $addblock =~ s/(\\$ITEMCMD$extraspace(?:<$abrat0>)?$extraspace)\[($brat_n)\]/
+ @itemargs=splitlatex(substr($2,0,length($2)));
+ $itemarg="[".join("",marktags("","",$ADDOPEN,$ADDCLOSE,"","",$ADDCOMMENT,\@itemargs))."]";
+ "$1$itemarg"/sge; # old substitution: $1\[$ADDOPEN$2$ADDCLOSE\]
+ ###}
+# splice in modified addblock
+ substr($_,$begin,$len)=$addblock;
+ pos = $begin + length($addblock);
+ }
+
+ # Go through whole text, and by counting list environment commands, find out when we are within a list environment.
+ # Within those restore deleted \item commands
+ @textparts=split /(?<!$DELCMDOPEN)(\\(?:begin|end)\{$LISTENV\})/ ;
+ @liststack=();
+ @newtextparts=map {
+ ### print STDERR ":::::::: $_\n";
+ if ( ($listtype) = m/^\\begin\{($LISTENV)\}$/ ) {
+ print STDERR "DEBUG: postprocess \\begin{$listtype}\n" if $debug;
+ push @liststack,$listtype;
+ } elsif ( ($listtype) = m/^\\end\{($LISTENV)\}$/ ) {
+ print STDERR "DEBUG: postprocess \\end{$listtype}\n" if $debug;
+ if (scalar @liststack > 0) {
+ $listlast=pop(@liststack);
+ ($listtype eq $listlast) or warn "Invalid nesting of list environments: $listlast environment closed by \\end{$listtype}.";
+ } else {
+ warn "WARNING: Invalid nesting of list environments: \\end{$listtype} encountered without matching \\begin{$listtype}.\n";
+ }
+ } else {
+ print STDERR "DEBUG: postprocess \@liststack=(",join(",",@liststack),")\n" if $debug;
+ if (scalar @liststack > 0 ) {
+ # we are within a list environment and should replace all item commands
+ $_=restore_item_commands($_);
+ }
+ # else: we are outside a list environment and do not need to do anything
+ }
+ $_ } @textparts; # end of map command
+ # replace the main text with the modified version
+ $_= join("",@newtextparts);
+
+
+
+
+ # 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\}((?:(.(?!(?<!\\)\&|\\\\))*)?)\\end\{MATHMODE\}/\\begin{$MATHREPL}$1\\end{$MATHREPL}/sg;
+ # others into MATHARRREPL
+ s/\\begin\{MATHMODE\}(.*?)\\end\{MATHMODE\}/\\begin{$MATHARRREPL}$1\\end{$MATHARRREPL}/sg;
+
+ # now look for AUXCMD math-mode pairs which have only comments (or empty lines between them), and remove the added commands
+ s/\\begin\{((?:$MATHENV)|(?:$MATHARRENV)|SQUAREBRACKET)\}$AUXCMD\n((?:\s*%.[^\n]*\n)*)\\end\{\1\}$AUXCMD\n/$2/sg;
+ } else {
+ # math modes OFF,WHOLE,COARSE: Convert \MATHBLOCKmath{..} commands back to environments
+ s/\\MATHBLOCK($MATHENV|$MATHARRENV|SQUAREBRACKET)\{($pat_n)\}/\\begin{$1}$2\\end{$1}/sg;
+ # convert ARRAYBLOCK.. commands back to environments
+ s/\\ARRAYBLOCK($ARRENV)\{($pat_n)\}/\\begin{$1}$2\\end{$1}/sg;
+ # get rid of the DIFANCHOR markers, first the delete comments, then everywhere
+ s/%DIFDELCMD < \\DIFANCHOR(?:MATH|ARR)[BE] (?:\n%DIFDELCMD < )?%%%\n//g ;
+ s/\\DIFANCHOR(?:MATH|ARR)[BE] //g;
+ }
+
+ # Convert all PICTUREblock{..} commands back to the appropriate environments
+ s/\\PICTUREBLOCK($PICTUREENV)\{($pat_n)\}/\\begin{$1}$2\\end{$1}/sg;
+#0.5: # Remove all mark up within picture environments
+# while ( m/\\begin\{($PICTUREENV)\}.*?\\end\{\1\}/sg ) {
+# $cnt=0;
+# $len=length($&);
+# $begin=pos($_) - $len;
+# $float=$&;
+# $float =~ s/\\DIFaddbegin //g;
+# $float =~ s/\\DIFaddend //g;
+# $float =~ s/\\DIFadd\{($pat_n)\}/$1/g;
+# $float =~ s/\\DIFdelbegin //g;
+# $float =~ s/\\DIFdelend //g;
+# $float =~ s/\\DIFdel\{($pat_n)\}//g;
+# $float =~ s/$DELCMDOPEN.*//g;
+# substr($_,$begin,$len)=$float;
+# pos = $begin + length($float);
+# }
+ # Convert DIFadd, DIFdel, DIFFaddbegin , ... into varieties
+ # within floats (currently recognised float environments: plate,table,figure
+ # plus starred varieties).
+ while ( m/\\begin\{($FLOATENV)\}.*?\\end\{\1\}/sg ) {
+ $cnt=0;
+ $len=length($&);
+ $begin=pos($_) - $len;
+ $float=$&;
+ $float =~ s/\\DIFaddbegin /\\DIFaddbeginFL /g;
+ $float =~ s/\\DIFaddend /\\DIFaddendFL /g;
+ $float =~ s/\\DIFadd\{/\\DIFaddFL{/g;
+ $float =~ s/\\DIFdelbegin /\\DIFdelbeginFL /g;
+ $float =~ s/\\DIFdelend /\\DIFdelendFL /g;
+ $float =~ s/\\DIFdel\{/\\DIFdelFL{/g;
+ substr($_,$begin,$len)=$float;
+ pos = $begin + length($float);
+ }
+ ### former location of undo renaming of \begin and \end in comments
+
+ # remove empty DIFCMD < lines
+ s/^\Q${DELCMDOPEN}\E\n//msg;
+
+ # Expand hashes of verb and verbatim environments (note negative look behind assertion to not leak out of DIFDELCMD comments
+ s/${DELCMDOPEN}\\($VERBATIMENV)\{([-\d]*?)\}/"${DELCMDOPEN}\\begin{${1}}".fromhash(\%verbhash,$2,$DELCMDOPEN)."${DELCMDOPEN}\\end{${1}}"/esg;
+ # revert changes to verbatim environments for line diffs (and add code to mark up changes)
+ s/(?<!$DELCMDOPEN)\\begin\{($VERBATIMLINEENV)\}(.*?)\\end\{\1\}/"". reverselinecomment($1, $2) .""/esg;
+# # we do the same for deleted environments but additionally reinstate the framing commands
+# s/$DELCMDOPEN\\begin\{($VERBATIMLINEENV)\}$extraspace(?:\[$brat0\])?$DELCMDCLOSE(.*?)$DELCMDOPEN\\end\{\1\}$DELCMDCLOSE/"\\begin{$1}". reverselinecomment($2) . "\\end{$1}"/esg;
+## s/$DELCMDOPEN\\begin\{($VERBATIMLINEENV)\}($extraspace(?:\[$brat0\])?\s*)(?:\n|$DELCMDOPEN)*$DELCMDCLOSE((?:\%$DELCOMMENT$VERBCOMMENT.*?\n)*)($DELCMDOPEN\\end\{\1\}(?:\n|\s|$DELCMDOPEN)*$DELCMDCLOSE)/"SUBSTITUTION: \\begin{$1}$2 INTERIOR: |$3| END: |$4|"/esg;
+ s/ # Deleted \begin command of verbatim environment (Captures $1: whole deleted command, $2: environment, $3: optional arguments with white space
+ (\Q$DELCMDOPEN\E\\begin\{($VERBATIMLINEENV)\}(\Q$extraspace\E(?:\[$brat_n\])?\s*)(?:\n|\Q$DELCMDOPEN\E)*\Q$DELCMDCLOSE\E)
+ # Interior of deleted verbatim environment should consist entirely of delete DIFVRB comments, i.e. match only lines beginning with % DIF < DIFVRB
+ # Captures: $4: all lines combined
+ ((?:\%\Q$DELCOMMENT$VERBCOMMENT\E[^\n]*?\n)*)
+ # Deleted \end command of verbatim environment. Note that the type is forced to match the opening. Captures: $5: Whole deleted environment (previous way this line was written: (\Q$DELCMDOPEN\E\\end\{\2\}(?:\n|\s|\Q$DELCMDOPEN\E)*\Q$DELCMDCLOSE\E)
+ (\Q$DELCMDOPEN\E\\end\{\2\})
+ / # Substitution part
+ $1 # Leave expression as is
+ . "$AUXCMD NEXT\n" # Mark the following line as an auxiliary command
+ . "" # reinstate the original environment without options
+ . reverselinecomment($2, "$3$4") # modify the body to change the markup; reverselinecomment parses for options
+ . " $AUXCMD\n" # close the auxiliary environment
+ . $5 # and again leave the original deleted closing environment as is
+ /esgx; # Modifiers of substitution command
+ # where changes have occurred in verbatim environment, change verbatim to DIFverbatim to allow mark-up
+ # (I use the presence of optional paramater to verbatim environment as the marker - normal verbatim
+ # environment does not take optional arguments)
+ s/(?<!$DELCMDOPEN)\\begin\{(verbatim[*]?)\}(\[$brat_n\].*?)\\end\{\1\}/\\begin{DIF$1}$2\\end{DIF$1}/sg;
+
+ s/\\($VERBATIMENV)\{([-\d]*?)\}/"\\begin{${1}}".fromhash(\%verbhash,$2)."\\end{${1}}"/esg;
+
+
+ # remove all \PAR tokens (taking care to properly keep commented out PAR's
+ # from introducing uncommented newlines - next line)
+ s/(%DIF < )([^\n]*?)\\PAR\n/$1$2\n$1\n/sg;
+ # convert PAR commands which are on a line by themselves
+ s/\n(\s*?)\\PAR\n/\n\n/sg;
+ # convert remaining PAR commands (which are preceded by non-white space characters, usually "}" ($ADDCLOSE)
+ s/\\PAR\n/\n\n/sg;
+
+ # package specific processing:
+ if ( defined($packages{"endfloat"})) {
+ #endfloat: make sure \begin{figure} and \end{figure} are always
+ # on a line by themselves, similarly for table environment
+ print STDERR "endfloat package detected.\n" if $verbose ;
+ # eliminate whitespace before and after
+ s/^(\s*)(\\(?:end|begin)\{(?:figure|table)\})(\s*?)$/$2/mg;
+ # split lines with remaining characters before float environment conmmand
+ s/^([^%]+)(\\(?:begin|end)\{(?:figure|table)\})/$1\n$2/mg;
+ # split lines with remaining characters after float environment conmmand
+ s/^((?:[^%]+)\\(?:begin|end)\{(?:figure|table)\}(?:\[[a-zA-Z]+\])?)(.+)((?:%.*)?)$/$1\n$2$3/mg;
+ }
+
+ # Convert '\PERCENTAGE ' back into '\%' (the final question mark catches a special situation where due to a latter pre-processing step the ' ' becomes separated
+ s/\\PERCENTAGE ?/\\%/g;
+ # Convert '\DOLLAR ' back into '\$'
+ s/\\DOLLAR /\\\$/g;
+
+ # undo renaming of the \begin and \end,{,} and dollars in comments
+
+ # although we only renamed $ in comments to DOLLARDIFF, we might have lost the % in unchanged verbatim blocks, so rename all
+ s/DOLLARDIF/\$/g;
+# Convert \begin{SQUAREBRACKET} \end{SQUAREBRACKET} into \[ \]
+ s/\\end\{SQUAREBRACKET\}/\\\]/sg;
+ s/\\begin\{SQUAREBRACKET\}/\\\[/sg;
+# 4. Convert \begin{DOLLARDOLLAR} \end{DOLLARDOLLAR} into $$ $$
+ s/\\begin\{DOLLARDOLLAR\}(.*?)\\end\{DOLLARDOLLAR\}/\$\$$1\$\$/sg;
+# 5. Convert \SUPERSCRIPTNB{n} into ^n and \SUPERSCRIPT{nn} into ^{nnn}
+ 1 while s/\\SUPERSCRIPT(\s*\{($pat_n)\})/^$1/g ;
+ 1 while s/\\SUPERSCRIPTNB\{(\s*$pat0)\}/^$1/g ;
+ # Convert \SUBSCRIPNB{n} into _n and \SUBCRIPT{nn} into _{nnn}
+ 1 while s/\\SUBSCRIPT(\s*\{($pat_n)\})/_$1/g ;
+ 1 while s/\\SUBSCRIPTNB\{(\s*$pat0)\}/_$1/g ;
+ # Convert \SQRT{n} into \sqrt{n} and \SQRTNB{nn} into \sqrt nn
+ 1 while s/\\SQRT(\s*\{($pat_n)\})/\\sqrt$1/g ;
+ 1 while s/\\SQRTNB\{(\s*$pat0)\}/\\sqrt$1/g ;
+
+ 1 while s/(%.*)\\CRIGHTBRACE (.*)$/$1\}$2/mg ;
+ 1 while s/(%.*)\\CLEFTBRACE (.*)$/$1\{$2/mg ;
+
+
+# Change \QLEFTBRACE, \QRIGHTBRACE to \{,\}
+ s/\\QLEFTBRACE /\\\{/sg;
+ s/\\QRIGHTBRACE /\\\}/sg;
+ s/\\AMPERSAND /\\&/sg;
+ # Highligh added inline verbatim commands if possible
+ if ( $latexdiffpreamble =~ /\\RequirePackage(?:\[$brat_n\])?\{color\}/ ) {
+ # wrap added verb commands with color commands
+ s/\\DIFDIFadd((?:verb\*?|lstinline(?:\[$brat_n\])?)\{[-\d]*?\}[\s\n]*)/\{\\color{blue}$AUXCMD\n\\DIF$1%\n\}$AUXCMD\n/sg;
+ s/\\DIFDIFdel((?:verb\*?|lstinline(?:\[$brat_n\])?)\{[-\d]*?\}[\s\n]*$AUXCMD)/\{\\color{red}${AUXCMD}\n\\DIF$1\n\}${AUXCMD}/sg;
+ } else {
+ # currently if colour markup is not used just remove the added mark
+ s/\\DIFDIFadd(verb\*?|lstinline)/\\DIF$1/sg;
+ s/\\DIFDIFdel((?:verb\*?|lstinline(?:\[$brat_n\])?)\{[-\d]*?\}[\s\n]*$AUXCMD\n)//sg;
+ }
+ # expand \verb and friends inline arguments
+ s/\\DIF((?:DIFadd|DIFdel)?(?:verb\*?|lstinline(?:\[$brat_n\])?))\{([-\d]*?)\}/"\\${1}". fromhash(\%verbhash,$2)/esg;
+ # add basicstyle color{blue} to added lstinline commands
+ # finally add the comment to the ones not having an optional argument before
+ ###s/\\DIFaddlstinline(?!\[)/\\lstinline\n[basicstyle=\\color{blue}]$AUXCMD\n/g;
+
+ return;
+ }
+}
+
+# $out = restore_item_commands($listenviron)
+# short helper function for post-process, which restores deleted \item commands in its argument (as DIFAUXCMDs)
+sub restore_item_commands {
+ my ($string)=@_ ;
+ my ($itemarg,@itemargs);
+ $string =~ s/(\%DIFDELCMD < \s*(\\$ITEMCMD$extraspace)((?:<$abrat0>)?$extraspace)((?:\[$brat_n\])?)\s*((?:${cmdoptseq}\s*?)*)(?:\n|$DELCMDCLOSE))/
+ # if \item has an []argument, then mark up the argument as deleted)
+ if (length($4)>0) {
+ # use substr to exclude square brackets at end points
+ @itemargs=splitlatex(substr($4,1,length($4)-2));
+ $itemarg="[".join("",marktags("","",$DELOPEN,$DELCLOSE,$DELCMDOPEN,$DELCMDCLOSE,$DELCOMMENT,\@itemargs))."]";
+ } else {
+ $itemarg="";
+ }
+ "$1$2$3$itemarg$AUXCMD\n"; ###.((length($5)>0) ? "%DIFDELCMD $5 $DELCMDCLOSE\n" : "")
+ /sge;
+ return($string);
+}
+
+
+# @auxlines=preprocess_preamble($oldpreamble,$newpreamble);
+ # pre-process preamble by looking for commands used in \maketitle (title, author, date etc commands)
+ # the list of commands is defined in CONTEXT2CMD
+ # if found then use a bodydiff to mark up content, and replace the corresponding commands
+ # in both preambles by marked up version to 'fool' the linediff (such that only body is marked
+ # up.
+ # A special case are e.g. author commands being added (or removed)
+ # 1. If commands are added, then the entire content is marked up as new, but also the lines are marked as new in the linediff
+ # 2. If commands are removed, then the linediff will mark the line as deleted. The program returns
+ # with $auxlines a text to be appended at the end of the preamble, which shows the respective fields as deleted
+sub preprocess_preamble {
+ my ($oldpreambleref,$newpreambleref)=(\$_[0],\$_[1]) ;
+ my @auxlines=();
+ # Remember to use $$oldpreambleref to refer to oldpreamble
+ my ($titlecmd,$titlecmdpat);
+ my (@oldtitlecommands,@newtitlecommands );
+ my %oldhash = ();
+ my %newhash = ();
+ my ($line,$cmd,$optarg,$arg,$optargnew,$optargold,$optargdiff,$argold,$argnew,$argdiff,$auxline);
+
+ my $warnmsgdetail = <<EOF ;
+ This should not occur for standard styles, but can occur for some specifiy styles, document classes,
+ e.g. journal house styles.
+ Workaround: Use --replace-context2cmd option to specifically set those commands, which are not repeated.
+EOF
+
+ # resuse context2cmdlist to define these commands to look out for in preamble
+ $titlecmd = "(?:".join("|",@CONTEXT2CMDLIST).")";
+ # as context2cmdlist is stored as regex, e.g. ((?-xism:^title$), we need to remove ^- fo
+ # resue in a more complex regex
+ $titlecmd =~ s/[\$\^]//g;
+ # make sure to not match on comment lines:
+ $titlecmdpat=qr/^(?:[^%\n]|\\%)*(\\($titlecmd)$extraspace(?:\[($brat_n)\])?(?:\{($pat_n)\}))/ms;
+ ###print STDERR "DEBUG:",$titlecmdpat,"\n";
+ @oldtitlecommands= ( $$oldpreambleref =~ m/$titlecmdpat/g );
+ @newtitlecommands= ( $$newpreambleref =~ m/$titlecmdpat/g );
+
+
+ while ( @oldtitlecommands ) {
+ $line=shift @oldtitlecommands;
+ $cmd=shift @oldtitlecommands;
+ $optarg=shift @oldtitlecommands;
+ $arg=shift @oldtitlecommands;
+
+ if ( defined($oldhash{$cmd})) {
+ warn "WARNING: $cmd is used twice in preamble of old file. Reverting to pure line diff mode for preamble.\n";
+ print STDERR $warnmsgdetail;
+ return;
+ }
+ $oldhash{$cmd}=[ $line, $optarg, $arg ];
+ }
+ while ( @newtitlecommands ) {
+ $line=shift @newtitlecommands;
+ $cmd=shift @newtitlecommands;
+ $optarg=shift @newtitlecommands;
+ $arg=shift @newtitlecommands;
+
+ if ( defined($newhash{$cmd})) {
+ warn "$cmd is used twice in preamble of new file. Reverting to pure line diff mode for preamble.\n";
+ print STDERR $warnmsgdetail;
+ return;
+ }
+ $newhash{$cmd}=[ $line, $optarg, $arg ];
+ }
+ foreach $cmd ( keys %newhash ) {
+ if ( defined($newhash{$cmd}->[1])) {
+ $optargnew=$newhash{$cmd}->[1];
+ } else {
+ $optargnew="";
+ }
+ if ( defined($oldhash{$cmd}->[1])) {
+ $optargold=$oldhash{$cmd}->[1];
+ } else {
+ $optargold="";
+ }
+
+ if ( defined($oldhash{$cmd}->[2]) ) {
+ $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}) ;
+ $argold=$oldhash{$cmd}->[2];
+ $argdiff="{" . join("",bodydiff($argold,"")) ."}";
+ 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="";
+ }
+ $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)
+# This is used for command lists and configuration variables, but the processing is slightly
+# different:
+# For lists, the regular expression is extended to include beginning (^) and end ($) markers, to require full-string matching
+# For configuration variables (and all others), simply an unadorned list is copied
+sub init_regex_arr_data {
+ my ($arr,$token)=@_;
+ my $copy=0;
+ my ($mode);
+ if ($token =~ m/COMMANDS/ ) {
+ $mode=0; # Reading command list
+ } else {
+ $mode=1; # Reading configuration variables
+ }
+
+ while (<DATA>) {
+ if ( m/^%%BEGIN $token\s*$/ ) {
+ $copy=1;
+ next;
+ } elsif ( m/^%%END $token\s*$/ ) {
+ last; }
+ chomp;
+ if ( $mode==0 ) {
+# print STDERR "DEBUG init_regex_arr_data regex >$_<\n" if ($debug && $copy);
+ push (@$arr,qr/^$_$/) if ( $copy && !/^%/ ) ;
+ } elsif ($mode==1) {
+ push (@$arr,"$_") if ( $copy && !/^%/ ) ;
+ }
+ }
+ seek DATA,0,0; # rewind DATA handle to file begin
+}
+
+
+# init_regex_arr_ext(\@array,$arg)
+# appends 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)=@_;
+ if ( -f $arg ) {
+ init_regex_arr_file($arr,$arg);
+ } else {
+ init_regex_arr_list($arr,$arg);
+ }
+}
+
+# init_regex_arr_file(\@array,$fname)
+# appends array with regular expressions.
+# Read in list of regular expressions from $fname
+# (one expression per line)
+sub init_regex_arr_file {
+ my ($arr,$fname)=@_;
+ open(FILE,"$fname") or die ("Couldn't open $fname: $!");
+ while (<FILE>) {
+ chomp;
+ next if /^\s*#/ || /^\s*%/ || /^\s*$/ ;
+ push (@$arr,qr/^$_$/);
+ }
+ close(FILE);
+}
+
+# init_regex_arr_list(\@array,$arg)
+# appends array with regular expressions.
+# read from comma separated list of regular expressions ($arg)
+sub init_regex_arr_list {
+ my ($arr,$arg)=@_;
+ my $regex;
+ ### print STDERR "DEBUG init_regex_arr_list arg >$arg<\n" if $debug;
+ foreach $regex (split(qr/(?<!\\),/,$arg)) {
+ $regex =~ s/\\,/,/g;
+ print STDERR "DEBUG init_regex_arr_list regex >$regex<\n" if $debug;
+ push (@$arr,qr/^$regex$/);
+ }
+}
+
+
+#exetime() returns time since last execution of this command
+#exetime(1) resets this time
+my $lasttime=-1; # global variable for persistence
+sub exetime {
+ my $reset=0;
+ my $retval;
+ if ((scalar @_) >=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. Note that old.tex and new.tex need to
+be real files (not pipes or similar) as they are opened twice.
+
+--type=markupstyle
+-t markupstyle Add code to preamble for selected markup style
+ Available styles: UNDERLINE CTRADITIONAL TRADITIONAL CFONT FONTSTRIKE INVISIBLE
+ CHANGEBAR CCHANGEBAR CULINECHBAR CFONTCHBAR BOLD PDFCOMMENT
+ [ 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 MARGIN DVIPSCOL COLOR ZLABEL ONLYCHANGEDPAGE (LABEL)*
+ [ Default: SAFE ]
+ * LABEL subtype is deprecated
+
+--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.
+ context2 commands are also the only commands in the preamble, whose argument will
+ be processed in word-by-word mode (which only works, if they occur no more than
+ once in the preamble).
+
+--exclude-mboxsafecmd=exclude-file
+--exclude-mboxsafecmd="cmd1,cmd2,..."
+--append-mboxsafecmd=append-file
+--append-mboxsafecmd="cmd1,cmd2,..."
+ Define safe commands, which additionally need to be protected by encapsulating
+ in an \\mbox{..}. This is sometimes needed to get around incompatibilities
+ between external packages and the ulem package, which is used for highlighting
+ in the default style UNDERLINE as well as CULINECHBAR CFONTSTRIKE
+
+
+
+--config var1=val1,var2=val2,...
+-c var1=val1,.. Set configuration variables.
+-c configfile Available variables:
+ ARRENV (RegEx)
+ COUNTERCMD (RegEx)
+ FLOATENV (RegEx)
+ ITEMCMD (RegEx)
+ LISTENV (RegEx)
+ MATHARRENV (RegEx)
+ MATHARRREPL (String)
+ MATHENV (RegEx)
+ MATHREPL (String)
+ MINWORDSBLOCK (Integer)
+ PICTUREENV (RegEx)
+ SCALEDELGRAPHICS (Float)
+ VERBATIMENV (RegEx)
+ VERBATIMLINEENV (RegEx)
+ CUSTOMDIFCMD (RegEx)
+ This option can be repeated.
+
+--add-to-config varenv1=pattern1,varenv2=pattern2
+ For configuration variables containing a regular expression (essentially those ending
+ in ENV, and COUNTERCMD) this provides an alternative way to modify the configuration
+ variables. Instead of setting the complete pattern, with this option it is possible to add an
+ alternative pattern. varenv must be one of the variables listed above that take a regular
+ expression as argument, and pattern is any regular expression (which might need to be
+ protected from the shell by quotation). Several patterns can be added at once by using semi-colons
+ to separate them, e.g. --add-to-config "LISTENV=myitemize;myenumerate,COUNTERCMD=endnote"
+
+--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 apacite siunitx cleveref glossaries mhchem chemformula/chemmacros
+ [ 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.
+
+--graphics-markup=level Change highlight style for graphics embedded with \\includegraphics commands
+ Possible values for level:
+ none,off or 0: no highlighting for figures
+ new-only or 1: surround newly added or changed figures with a blue frame [Default]
+ both or 2: highlight new figures with a blue frame and show deleted figures
+ at reduced scale, and crossed out with a red diagonal cross. Use configuration
+ variable SCALEDELGRAPHICS to set size of deleted figures.
+ Note that changes to the optional parameters will make the figure appear as changed
+ to latexdiff, and this figure will thus be highlighted.
+
+--disable-citation-markup
+--disable-auto-mbox Suppress citation markup and markup of other vulnerable commands in styles
+ using ulem (UNDERLINE,FONTSTRIKE, CULINECHBAR)
+ (the two options are identical and are simply aliases)
+
+--enable-citation-markup
+--enforce-auto-mbox Protect citation commands and other vulnerable commands in changed sections
+ with \\mbox command, i.e. use default behaviour for ulem package for other packages
+ (the two options are identical and are simply aliases)
+
+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
+
+--visible-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.
+
+Internal options:
+These options are mostly for automated use by latexdiff-vc. They can be used directly, but
+the API should be considered less stable than for the other options.
+
+--no-links Suppress generation of hyperreferences, used for minimal diffs
+ (option --only-changes of latexdiff-vc).
+EOF
+}
+
+=head1 NAME
+
+latexdiff - determine and markup differences between two latex files
+
+=head1 SYNOPSIS
+
+B<latexdiff> [ B<OPTIONS> ] F<old.tex> F<new.tex> > F<diff.tex>
+
+=head1 DESCRIPTION
+
+Briefly, I<latexdiff> is a utility program to aid in the management of
+revisions of latex documents. It compares two valid latex files, here
+called C<old.tex> and C<new.tex>, 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. Note that old.tex and new.tex need to
+be real files (not pipes or similar) as they are opened twice (unless C<--encoding> option is used)
+
+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<C<%DIF E<gt>>>" is appended to each added line, i.e. a
+line present in C<new.tex> but not in C<old.tex>. Discarded lines
+ are deactivated by prepending "S<C<%DIF E<lt>>>". 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<diff.tex> will be similar to
+C<new.tex>. At the end of the preamble, the definitions for I<latexdiff> markup commands are inserted.
+In differencing the main body of the text, I<latexdiff> attempts to
+satisfy the following guidelines (in order of priority):
+
+=over 3
+
+=item 1
+
+If both C<old.tex> and C<new.tex> are valid LaTeX, then the resulting
+C<diff.tex> should also be valid LateX. (NB If a few plain TeX commands
+are used within C<old.tex> or C<new.tex> then C<diff.tex> 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<diff.tex>.
+
+=item 3
+
+If a changed passage contains text or text-producing commands, then
+running C<diff.tex> 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<diff.tex> should follow the formatting of C<new.tex>
+
+=back
+
+For differencing the same algorithm as I<diff> 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<picture> and C<DIFnomarkup> environments; see B<--config>
+option). The latter environment (C<DIFnomarkup>) 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<latexdiff> begin with "C<\DIF>". Added
+blocks containing words, commands or comments which are in C<new.tex>
+but not in C<old.tex> 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<C<%DIF E<gt> >>".
+
+Within deleted blocks text is highlighted with C<\DIFdel>. Deleted
+comments are marked by prepending "S<C<%DIF E<lt> >>". Non-safe command
+and curly braces within deleted blocks are commented out with
+"S<C<%DIFDELCMD E<lt> >>".
+
+
+
+=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<UNDERLINE CTRADITIONAL TRADITIONAL CFONT FONTSTRIKE INVISIBLE
+CHANGEBAR CCHANGEBAR CULINECHBAR CFONTCHBAR BOLD PDFCOMMENT>
+
+[ Default: C<UNDERLINE> ]
+
+=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<SAFE MARGIN COLOR DVIPSCOL ZLABEL ONLYCHANGEDPAGE (LABEL)*>
+
+[ Default: C<SAFE> ]
+* Subtype C<LABEL> is deprecated
+
+=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<FLOATSAFE TRADITIONALSAFE IDENTICAL>
+
+[ Default: C<FLOATSAFE> ]
+
+=item B<--encoding=enc> or
+B<-e enc>
+
+Specify encoding of old.tex and new.tex. Typical encodings are
+C<ascii>, C<utf8>, C<latin1>, C<latin9>. A list of available encodings can be
+obtained by executing
+
+C<perl -MEncode -e 'print join ("\n",Encode->encodings( ":all" )) ;' >
+
+If this option is used, then old.tex, new.tex are only opened once.
+[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<amsmath>
+
+Configuration variable MATHARRREPL is set to C<align*> (Default: C<eqnarray*>). (Note that many of the
+amsmath array environments are already recognised by default as such)
+
+=item C<endfloat>
+
+Ensure that C<\begin{figure}> and C<\end{figure}> always appear by themselves on a line.
+
+=item C<hyperref>
+
+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).
+
+=item C<apacite>
+
+Redefine the commands recognised as citation commands.
+
+=item C<siunitx>
+
+Treat C<\SI> as equivalent to citation commands (i.e. protect with C<\mbox> if markup style uses ulem package.
+
+=item C<cleveref>
+
+Treat C<\cref,\Cref>, etc as equivalent to citation commands (i.e. protect with C<\mbox> if markup style uses ulem package.
+
+=item C<glossaries>
+
+Define most of the glossaries commands as safe, protecting them with \mbox'es where needed
+
+=item C<mhchem>
+
+Treat C<\ce> as a safe command, i.e. it will be highlighted (note that C<\cee> will not be highlighted in equations as this leads to processing errors)
+
+=item C<chemformula> or C<chemmacros>
+
+Treat C<\ch> as a safe command outside equations, i.e. it will be highlighted (note that C<\ch> will not be highlighted in equations as this leads to processing 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. C<\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.
+
+context2 commands are also the only commands in the preamble, whose argument will be processed in
+word-by-word mode (which only works, if they occur no more than once in the preamble). The algorithm currently cannot cope with repeated context2 commands in the preamble, as they occur e.g. for the C<\author> argument in some journal styles (not in the standard styles, though
+If such a repetition is detected, the whole preamble will be processed in line-by-line mode. In such a case, use C<--replace-context2cmd> option to just select the commands, which should be processed and are not used repeatedly in the preamble.
+
+
+
+=item B<--exclude-mboxsafecmd=exclude-file> or B<--exclude-mboxsafecmd="cmd1,cmd2,...">
+
+=item B<--append-mboxsafecmd=append-file> or B<--append-mboxsafecmd="cmd1,cmd2,...">
+
+Define safe commands, which additionally need to be protected by encapsulating
+in an C<\mbox{..}>. This is sometimes needed to get around incompatibilities
+between external packages and the ulem package, which is used for highlighting
+in the default style UNDERLINE as well as CULINECHBAR CFONTSTRIKE
+
+
+
+
+
+=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<ARRENV> (RegEx)
+
+C<COUNTERCMD> (RegEx)
+
+C<CUSTODIFCMD> (RegEx)
+
+C<FLOATENV> (RegEx)
+
+C<ITEMCMD> (RegEx)
+
+C<LISTENV> (RegEx)
+
+C<MATHARRENV> (RegEx)
+
+C<MATHARRREPL> (String)
+
+C<MATHENV> (RegEx)
+
+C<MATHREPL> (String)
+
+C<MINWORDSBLOCK> (Integer)
+
+C<PICTUREENV> (RegEx)
+
+C<SCALEDELGRAPHICS> (Float)
+
+
+=item B<--add-to-config varenv1=pattern1,varenv2=pattern2,...>
+
+For configuration variables, which are a regular expression (essentially those ending
+in ENV, COUNTERCMD and CUSTOMDIFCMD, see list above) this option provides an alternative way to modify the configuration
+variables. Instead of setting the complete pattern, with this option it is possible to add an
+alternative pattern. C<varenv> must be one of the variables listed above that take a regular
+expression as argument, and pattern is any regular expression (which might need to be
+protected from the shell by quotation). Several patterns can be added at once by using semi-colons
+to separate them, e.g. C<--add-to-config "LISTENV=myitemize;myenumerate,COUNTERCMD=endnote">
+
+=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<old.tex> or C<new.tex> 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<off> 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<whole> 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<coarse> 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<fine> 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<--graphics-markup=level>
+
+ Change highlight style for graphics embedded with C<\includegraphics> commands.
+
+Possible values for level:
+
+C<none>, C<off> or C<0>: no highlighting for figures
+
+C<new-only> or C<1>: surround newly added or changed figures with a blue frame [Default if graphicx package loaded]
+
+C<both> or C<2>: highlight new figures with a blue frame and show deleted figures at reduced
+scale, and crossed out with a red diagonal cross. Use configuration
+variable SCALEDELGRAPHICS to set size of deleted figures.
+
+Note that changes to the optional parameters will make the figure appear as changed
+to latexdiff, and this figure will thus be highlighted
+
+=item B<--disable-citation-markup> or B<--disable-auto-mbox>
+
+Suppress citation markup and markup of other vulnerable commands in styles
+using ulem (UNDERLINE,FONTSTRIKE, CULINECHBAR)
+(the two options are identical and are simply aliases)
+
+=item B<--enable-citation-markup> or B<--enforce-auto-mbox>
+
+Protect citation commands and other vulnerable commands in changed sections
+with C<\mbox> command, i.e. use default behaviour for ulem package for other packages
+(the two options are identical and are simply aliases)
+
+=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<latexdiff> 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<--visible-label>
+
+Include old and new filenames (or labels set with C<--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 Internal options
+
+These options are mostly for automated use by latexdiff-vc. They can be used directly, but the API should be considered less stable than for the other options.
+
+=over 4
+
+=item B<--no-links>
+
+Suppress generation of hyperreferences, used for minimal diffs (option --only-changes of latexdiff-vc)
+
+=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<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).
+
+=item C<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)
+
+=item C<TRADITIONAL>
+
+Like C<CTRADITIONAL> but without the use of color.
+
+=item C<CFONT>
+
+Added text is blue and set in sans-serif, and discarded text is red and very small size.
+
+=item C<FONTSTRIKE>
+
+Added tex is set in sans-serif, discarded text small and struck out
+
+=item C<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).
+
+=item C<CFONTCHBAR>
+
+Like C<CFONT> but with additional changebars (Requires color and changebar packages).
+
+=item C<CULINECHBAR>
+
+Like C<UNDERLINE> but with additional changebars (Requires color, ulem and changebar packages).
+
+=item C<CHANGEBAR>
+
+No mark up of text, but mark margins with changebars (Requires changebar package).
+
+=item C<INVISIBLE>
+
+No visible markup (but generic markup commands will still be inserted.
+
+=item C<BOLD>
+
+Added text is set in bold face, discarded is not shown.
+
+=item C<PDFCOMMENT>
+
+The pdfcomment package is used to underline new text, and mark deletions with a PDF comment. Note that this markup might appear differently or not at all based on the pdf viewer used. The viewer with best support for pdf markup is probably acroread. This style is only recommended if the number of differences is small.
+
+=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<SAFE>
+
+No additional markup (Recommended choice)
+
+=item C<MARGIN>
+
+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<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).
+
+=item C<DVIPSCOL>
+
+An alternative way of marking added passages in blue, and deleted ones in red. Note
+that C<DVIPSCOL> 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).
+
+
+=item C<ZLABEL>
+
+can be used to highlight only changed pages, but requires post-processing. It is recommend to not call this option manually but use C<latexdiff-vc> with C<--only-changes> option. Alternatively, use the script given within preamble of diff files made using this style.
+
+=item C<ONLYCHANGEDPAGE>
+
+also highlights changed pages, without the need for post-processing, but might not work reliably if
+there is floating material (figures, tables).
+
+=item C<LABEL>
+
+is similar to C<ZLABEL>, but does not need the zref package and works less reliably (deprecated).
+
+=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<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 C<MARGIN> as C<\marginpar> does not work properly within floats.
+
+=item C<TRADITIONALSAFE>
+
+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<TRADITIONAL> and C<CTRADITIONAL> markup types as the \footnote command does not work properly in floating environments.
+
+=item C<IDENTICAL>
+
+Make no difference between the main text and floats.
+
+=back
+
+
+=head2 Configuration Variables
+
+=over 10
+
+=item C<ARRENV>
+
+If a match to C<ARRENV> is found within an inline math environment within a deleted or added block, then the inlined math
+is surrounded by C<\mbox{>...C<}>. This is necessary as underlining does not work within inlined array environments.
+
+[ Default: C<ARRENV>=S<C<(?:array|[pbvBV]matrix)> >
+
+=item C<COUNTERCMD>
+
+If a command in a deleted block which is also in the textcmd list matches C<COUNTERCMD> then an
+additional command C<\addtocounter{>F<cntcmd>C<}{-1}>, where F<cntcmd> is the matching command, is appended in the diff file such that the numbering in the diff file remains synchronized with the
+numbering in the new file.
+
+[ Default: C<COUNTERCMD>=C<(?:footnote|part|section|subsection> ...
+
+C<|subsubsection|paragraph|subparagraph)> ]
+
+=item C<CUSTOMDIFCMD>
+
+This option is for advanced users and allows definition of special versions of commands, which do not work as safe commands.
+
+Commands in C<CUSTOMDIFCMD> that occur in added or deleted blocks will be given an ADD or DEL prefix.
+The prefixed versions of the command must be defined in the preamble, either by putting them
+in the preamble of at least the new file, or by creating a custom preamble file (Option --preamble).
+For example the command C<\blindtext> (from package blindtext) does not interact well with underlining, so that
+for the standard markup type, it is not satisfactory to define it as a safe command. Instead, a customised versions
+without underlining can be defined in the preamble:
+
+C<\newcommand{\DELblindtext}{{\color{red}\blindtext}}>
+
+C<\newcommand{\ADDblindtext}{{\color{blue}\blindtext}}>
+
+and then latexdiff should be invoked with the option C<-c CUSTOMDIFCMD=blindtext>.
+
+[ Default: none ]
+
+=item C<FLOATENV>
+
+Environments whose name matches the regular expression in C<FLOATENV> are
+considered floats. Within these environments, the I<latexdiff> markup commands
+are replaced by their FL variaties.
+
+[ Default: S<C<(?:figure|table|plate)[\w\d*@]*> >]
+
+=item C<ITEMCMD>
+
+Commands representing new item line with list environments.
+
+[ Default: \C<item> ]
+
+=item C<LISTENV>
+
+Environments whose name matches the regular expression in C<LISTENV> are list environments.
+
+[ Default: S<C<(?:itemize|enumerate|description)> >]
+
+=item C<MATHENV>,C<MATHREPL>
+
+If both \begin and \end for a math environment (environment name matching C<MATHENV> or \[ and \])
+are within the same deleted block, they are replaced by a \begin and \end commands for C<MATHREPL>
+rather than being commented out.
+
+[ Default: C<MATHENV>=S<C<(?:displaymath|equation)> >, C<MATHREPL>=S<C<displaymath> >]
+
+=item C<MATHARRENV>,C<MATHARRREPL>
+
+as C<MATHENV>,C<MATHREPL> but for equation arrays
+
+[ Default: C<MATHARRENV>=S<C<eqnarray\*?> >, C<MATHREPL>=S<C<eqnarray> >]
+
+=item C<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 C<MINWORDSBLOCK> to the preceding added and discarded parts.
+
+[ Default: 3 ]
+
+=item C<PICTUREENV>
+
+Within environments whose name matches the regular expression in C<PICTUREENV>
+all latexdiff markup is removed (in pathologic cases this might lead to
+inconsistent markup but this situation should be rare).
+
+[ Default: S<C<(?:picture|DIFnomarkup)[\w\d*@]*> >]
+
+=item C<SCALEDELGRAPHICS>
+
+If C<--graphics-markup=both> is chosen, C<SCALEDELGRAPHICS> is the factor, by which deleted figures will be scaled (i.e. 0.5 implies they are shown at half linear size).
+
+[ Default: 0.5 ]
+
+=item C<VERBATIMENV>
+
+RegEx describing environments like verbatim, whose contents should be taken verbatim. The content of these environments will not be processed in any way:
+deleted content is commented out, new content is not marked up
+
+[ Default: S<C<comment> > ]
+
+=item C<VERBATIMLINEENV>
+
+RegEx describing environments like verbatim, whose contents should be taken verbatim. The content of environments described by VERBATIMLINEENV are compared in
+line mode, and changes are marked up using the listings package. The markup style is set based on the chosen mains markup type (Option -t), or on an analysis
+of the preamble.
+Note that "listings.sty" must be installed. If this file is not found the fallback solution is to
+treat VERBATIMLINEENV environments treated exactly the same way as VERBATIMENV environments.
+
+[ Default: S<C<(?:verbatim[*]?|lstlisting> > ]
+
+=back
+
+=head1 COMMON PROBLEMS AND FAQ
+
+=over 10
+
+=item Citations result in overfull boxes
+
+There is an incompatibility between the C<ulem> package, which C<latexdiff> uses for underlining and striking out in the UNDERLINE style,
+the default style, and the way citations are generated. In order to be able to mark up citations properly, they are enclosed with an C<\mbox>
+command. 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. The same occurs for some other packages (e.g., siunitx). If this is a problem, you have two possibilities.
+
+1. Use C<CFONT> type markup (option C<-t CFONT>): 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, and deleted text is shown with a different font. Other styles not using the C<ulem> package will also work.
+
+2. Choose option C<--disable-citation-markup> which turns off the marking up of citations: deleted citations are no longer shown, and
+added citations are shown without markup. (This was the default behaviour of latexdiff at versions 0.6 and older)
+
+For custom packages you can define the commands which need to be protected by C<\mbox> with C<--append-mboxsafecmd> and C<--excludemboxsafecmd> options
+(submit your lists of command as feature request at github page to set the default behaviour of future versions, see section 6)
+
+=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>.
+
+=item How can I just show the pages where changes had been made
+
+Use options -C<-s ZLABEL> (some postprocessing required) or C<-s ONLYCHANGEDPAGE>. C<latexdiff-vc --ps|--pdf> with C<--only-changes> option takes care of
+the post-processing for you (requires zref package to be installed).
+
+=back
+
+=head1 BUGS
+
+=over 10
+
+=item 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.
+
+=back
+
+Please submit bug reports using the issue tracker of the github repository page I<https://github.com/ftilmann/latexdiff.git>,
+or send them to I<tilmann -- AT -- gfz-potsdam.de>. Include the version number of I<latexdiff>
+(from comments at the top of the source or use B<--version>). If you come across latex
+files that are error-free and conform to the specifications set out
+above, and whose differencing still does not result in error-free
+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<latexrevise>, L<latexdiff-vc>
+
+=head1 PORTABILITY
+
+I<latexdiff> 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<latexdiff> requires installation of the Perl package
+C<Algorithm::Diff> (available from I<www.cpan.org> -
+I<http://search.cpan.org/~nedkonz/Algorithm-Diff-1.15>) but a stand-alone
+version, I<latexdiff-so>, which has this package inlined, is available, too.
+I<latexdiff-fast> requires the I<diff> command to be present.
+
+=head1 AUTHOR
+
+Version 1.3.0
+Copyright (C) 2004-2018 Frederik Tilmann
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License Version 3
+
+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 sent 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
+[Hclbkdruvt]
+[`'^"~=.]
+_
+AMPERSAND
+(SUPER|SUB)SCRIPTNB
+(SUPER|SUB)SCRIPT
+SQRT
+SQRTNB
+PERCENTAGE
+DOLLAR
+%%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
+intertext
+part
+(sub){0,2}section\*?
+(sub)?paragraph\*?
+makebox
+mbox
+opening
+parbox
+raisebox
+savebox
+sbox
+shortintertext
+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. These commands behave like text commands, except when they occur in a deleted section, where they are disabled, but their argument is shown as deleted text.
+caption
+subcaption
+%%END CONTEXT1 COMMANDS
+
+%%BEGIN CONTEXT2 COMMANDS
+% Regex matching commands with a text argument (leave out the \), which will fail out of context. As corresponding commands for context1. The only difference is that context2 commands are completely disabled in deleted sections, including their arguments.
+title
+author
+date
+institute
+%%END CONTEXT2 COMMANDS
+
+%% CONFIGURATION variabe defaults
+%%BEGIN LISTENV CONFIG
+itemize
+description
+enumerate
+%%END LISTENV CONFIG
+
+%%BEGIN FLOATENV CONFIG
+figure[\w\d*@]*
+table[\w\d*@]*
+plate[\w\d*@]*
+%%END FLOATENV CONFIG
+
+%%BEGIN PICTUREENV CONFIG
+picture[\w\d*@]*
+tikzpicture[\w\d*@]*
+DIFnomarkup
+%%END PICTUREENV CONFIG
+
+%%BEGIN MATHENV CONFIG
+equation[*]?
+displaymath
+DOLLARDOLLAR
+%%END MATHENV CONFIG
+
+%%BEGIN MATHARRENV CONFIG
+eqnarray[*]?
+align[*]?
+alignat[*]?
+gather[*]?
+multline[*]?
+flalign[*]?
+%%END MATHARRENV CONFIG
+
+%%BEGIN ARRENV CONFIG
+aligned
+gathered
+array
+[pbvBV]?matrix
+smallmatrix
+cases
+split
+%%END ARRENV CONFIG
+
+%%BEGIN COUNTERCMD CONFIG
+footnote
+part
+chapter
+section
+subsection
+subsubsection
+paragraph
+subparagraph
+%%END COUNTERCMD CONFIG
+
+%%BEGIN VERBATIMENV CONFIG
+comment
+%%END VERBATIMENV CONFIG
+
+%%BEGIN VERBATIMLINEENV CONFIG
+lstlisting
+verbatim[*]?
+%%END VERBATIMLINEENV CONFIG
+
+%%BEGIN CUSTOMDIFCMD CONFIG
+%%END CUSTOMDIFCMD CONFIG
+
+%%% 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}
+\DeclareOldFontCommand{\sf}{\normalfont\sffamily}{\mathsf}
+\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}
+\DeclareOldFontCommand{\sf}{\normalfont\sffamily}{\mathsf}
+\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}
+\DeclareOldFontCommand{\sf}{\normalfont\sffamily}{\mathsf}
+\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}
+\DeclareOldFontCommand{\sf}{\normalfont\sffamily}{\mathsf}
+\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
+
+%DIF BOLD PREAMBLE
+\DeclareOldFontCommand{\bf}{\normalfont\bfseries}{\mathbf}
+\providecommand{\DIFadd}[1]{{\bf #1}}
+\providecommand{\DIFdel}[1]{}
+%DIF END BOLD PREAMBLE
+
+%DIF PDFCOMMENT PREAMBLE
+\RequirePackage{pdfcomment} %DIF PREAMBLE
+\providecommand{\DIFadd}[1]{\pdfmarkupcomment[author=ADD:,markup=Underline]{#1}{}}
+\providecommand{\DIFdel}[1]{\pdfcomment[icon=Insert,author=DEL:,hspace=12pt]{#1}}
+%DIF END PDFCOMMENT PREAMBLE
+
+%% SUBTYPES (Markers for beginning and end of changed blocks)
+
+%DIF SAFE PREAMBLE
+\providecommand{\DIFaddbegin}{}
+\providecommand{\DIFaddend}{}
+\providecommand{\DIFdelbegin}{}
+\providecommand{\DIFdelend}{}
+\providecommand{\DIFmodbegin}{}
+\providecommand{\DIFmodend}{}
+%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{]}}
+\providecommand{\DIFmodbegin}{\protect\marginpar{m[}}
+\providecommand{\DIFmodend}{\protect\marginpar{]}}
+%DIF END MARGIN 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}}
+\providecommand{\DIFmodbegin}{}
+\providecommand{\DIFmodend}{}
+%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}}
+\providecommand{\DIFmodbegin}{}
+\providecommand{\DIFmodend}{}
+%DIF END COLOR PREAMBLE
+
+%DIF LABEL PREAMBLE
+% To show only pages with changes (pdf) (external program pdftk needs to be installed)
+% (only works for simple documents with non-repeated page numbers, otherwise use ZLABEL)
+% pdflatex diff.tex
+% pdflatex diff.tex
+%pdftk diff.pdf cat \
+%`perl -lne '\
+% if (m/\\newlabel{DIFchg[b](\d*)}{{.*}{(.*)}}/) { $start{$1}=$2; print $2}\
+% if (m/\\newlabel{DIFchg[e](\d*)}{{.*}{(.*)}}/) { \
+% if (defined($start{$1})) { \
+% for ($j=$start{$1}; $j<=$2; $j++) {print "$j";}\
+% } else { \
+% print "$2"\
+% }\
+% }' diff.aux \
+% | uniq \
+% | tr \\n ' '` \
+% output diff-changedpages.pdf
+% To show only pages with changes (dvips/dvipdf)
+% dvips -pp `\
+% [ put here the perl script from above]
+% | uniq | tr -s \\n ','`
+\typeout{Check comments in preamble of output for instructions how to show only pages where changes have been made}
+\newcount\DIFcounterb
+\global\DIFcounterb 0\relax
+\newcount\DIFcountere
+\global\DIFcountere 0\relax
+\providecommand{\DIFaddbegin}{\global\advance\DIFcounterb 1\relax\label{DIFchgb\the\DIFcounterb}}
+\providecommand{\DIFaddend}{\global\advance\DIFcountere 1\relax\label{DIFchge\the\DIFcountere}}
+\providecommand{\DIFdelbegin}{\global\advance\DIFcounterb 1\relax\label{DIFchgb\the\DIFcounterb}}
+\providecommand{\DIFdelend}{\global\advance\DIFcountere 1\relax\label{DIFchge\the\DIFcountere}}
+\providecommand{\DIFmodbegin}{\global\advance\DIFcounterb 1\relax\label{DIFchgb\the\DIFcounterb}}
+\providecommand{\DIFmodend}{\global\advance\DIFcountere 1\relax\label{DIFchge\the\DIFcountere}}
+%DIF END LABEL PREAMBLE
+
+%DIF ZLABEL PREAMBLE
+% To show only pages with changes (pdf) (external program pdftk needs to be installed)
+% (uses zref for reference to absolute page numbers)
+% pdflatex diff.tex
+% pdflatex diff.tex
+%pdftk diff.pdf cat \
+%`perl -lne 'if (m/\\zref\@newlabel{DIFchgb(\d*)}{.*\\abspage{(\d*)}}/ ) { $start{$1}=$2; print $2 } \
+% if (m/\\zref\@newlabel{DIFchge(\d*)}{.*\\abspage{(\d*)}}/) { \
+% if (defined($start{$1})) { \
+% for ($j=$start{$1}; $j<=$2; $j++) {print "$j";}\
+% } else { \
+% print "$2"\
+% }\
+% }' diff.aux \
+% | uniq \
+% | tr \\n ' '` \
+% output diff-changedpages.pdf
+% To show only pages with changes (dvips/dvipdf)
+% latex diff.tex
+% latex diff.tex
+% dvips -pp `perl -lne 'if (m/\\newlabel{DIFchg[be]\d*}{{.*}{(.*)}}/) { print $1 }' diff.aux | uniq | tr -s \\n ','` diff.dvi
+\typeout{Check comments in preamble of output for instructions how to show only pages where changes have been made}
+\usepackage[user,abspage]{zref}
+\newcount\DIFcounterb
+\global\DIFcounterb 0\relax
+\newcount\DIFcountere
+\global\DIFcountere 0\relax
+\providecommand{\DIFaddbegin}{\global\advance\DIFcounterb 1\relax\zlabel{DIFchgb\the\DIFcounterb}}
+\providecommand{\DIFaddend}{\global\advance\DIFcountere 1\relax\zlabel{DIFchge\the\DIFcountere}}
+\providecommand{\DIFdelbegin}{\global\advance\DIFcounterb 1\relax\zlabel{DIFchgb\the\DIFcounterb}}
+\providecommand{\DIFdelend}{\global\advance\DIFcountere 1\relax\zlabel{DIFchge\the\DIFcountere}}
+\providecommand{\DIFmodbegin}{\global\advance\DIFcounterb 1\relax\zlabel{DIFchgb\the\DIFcounterb}}
+\providecommand{\DIFmodend}{\global\advance\DIFcountere 1\relax\zlabel{DIFchge\the\DIFcountere}}
+%DIF END ZLABEL PREAMBLE
+
+%DIF ONLYCHANGEDPAGE PREAMBLE
+\RequirePackage{atbegshi}
+\RequirePackage{etoolbox}
+\RequirePackage{zref}
+% redefine label command to write immediately to aux file - page references will be lost
+\makeatletter \let\oldlabel\label% Store \label
+\renewcommand{\label}[1]{% Update \label to write to the .aux immediately
+\zref@wrapper@immediate{\oldlabel{#1}}}
+\makeatother
+\newbool{DIFkeeppage}
+\newbool{DIFchange}
+\boolfalse{DIFkeeppage}
+\boolfalse{DIFchange}
+\AtBeginShipout{%
+ \ifbool{DIFkeeppage}
+ {\global\boolfalse{DIFkeeppage}} % True DIFkeeppage
+ {\ifbool{DIFchange}{\global\boolfalse{DIFkeeppage}}{\global\boolfalse{DIFkeeppage}\AtBeginShipoutDiscard}} % False DIFkeeppage
+}
+\providecommand{\DIFaddbegin}{\global\booltrue{DIFkeeppage}\global\booltrue{DIFchange}}
+\providecommand{\DIFaddend}{\global\booltrue{DIFkeeppage}\global\boolfalse{DIFchange}}
+\providecommand{\DIFdelbegin}{\global\booltrue{DIFkeeppage}\global\booltrue{DIFchange}}
+\providecommand{\DIFdelend}{\global\booltrue{DIFkeeppage}\global\boolfalse{DIFchange}}
+\providecommand{\DIFmodbegin}{\global\booltrue{DIFkeeppage}\global\booltrue{DIFchange}}
+\providecommand{\DIFmodend}{\global\booltrue{DIFkeeppage}\global\boolfalse{DIFchange}}
+%DIF END ONLYCHANGEDPAGE 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 TRADITIONALSAFE PREAMBLE
+
+% see:
+% http://tex.stackexchange.com/questions/47351/can-i-redefine-a-command-to-contain-itself
+
+%DIF HIGHLIGHTGRAPHICS PREAMBLE
+\RequirePackage{settobox}
+\RequirePackage{letltxmacro}
+\newsavebox{\DIFdelgraphicsbox}
+\newlength{\DIFdelgraphicswidth}
+\newlength{\DIFdelgraphicsheight}
+% store original definition of \includegraphics
+\LetLtxMacro{\DIFOincludegraphics}{\includegraphics}
+\newcommand{\DIFaddincludegraphics}[2][]{{\color{blue}\fbox{\DIFOincludegraphics[#1]{#2}}}}
+\newcommand{\DIFdelincludegraphics}[2][]{%
+\sbox{\DIFdelgraphicsbox}{\DIFOincludegraphics[#1]{#2}}%
+\settoboxwidth{\DIFdelgraphicswidth}{\DIFdelgraphicsbox}
+\settoboxtotalheight{\DIFdelgraphicsheight}{\DIFdelgraphicsbox}
+\scalebox{\DIFscaledelfig}{%
+\parbox[b]{\DIFdelgraphicswidth}{\usebox{\DIFdelgraphicsbox}\\[-\baselineskip] \rule{\DIFdelgraphicswidth}{0em}}\llap{\resizebox{\DIFdelgraphicswidth}{\DIFdelgraphicsheight}{%
+\setlength{\unitlength}{\DIFdelgraphicswidth}%
+\begin{picture}(1,1)%
+\thicklines\linethickness{2pt}
+{\color[rgb]{1,0,0}\put(0,0){\framebox(1,1){}}}%
+{\color[rgb]{1,0,0}\put(0,0){\line( 1,1){1}}}%
+{\color[rgb]{1,0,0}\put(0,1){\line(1,-1){1}}}%
+\end{picture}%
+}\hspace*{3pt}}}
+}
+\LetLtxMacro{\DIFOaddbegin}{\DIFaddbegin}
+\LetLtxMacro{\DIFOaddend}{\DIFaddend}
+\LetLtxMacro{\DIFOdelbegin}{\DIFdelbegin}
+\LetLtxMacro{\DIFOdelend}{\DIFdelend}
+\DeclareRobustCommand{\DIFaddbegin}{\DIFOaddbegin \let\includegraphics\DIFaddincludegraphics}
+\DeclareRobustCommand{\DIFaddend}{\DIFOaddend \let\includegraphics\DIFOincludegraphics}
+\DeclareRobustCommand{\DIFdelbegin}{\DIFOdelbegin \let\includegraphics\DIFdelincludegraphics}
+\DeclareRobustCommand{\DIFdelend}{\DIFOaddend \let\includegraphics\DIFOincludegraphics}
+\LetLtxMacro{\DIFOaddbeginFL}{\DIFaddbeginFL}
+\LetLtxMacro{\DIFOaddendFL}{\DIFaddendFL}
+\LetLtxMacro{\DIFOdelbeginFL}{\DIFdelbeginFL}
+\LetLtxMacro{\DIFOdelendFL}{\DIFdelendFL}
+\DeclareRobustCommand{\DIFaddbeginFL}{\DIFOaddbeginFL \let\includegraphics\DIFaddincludegraphics}
+\DeclareRobustCommand{\DIFaddendFL}{\DIFOaddendFL \let\includegraphics\DIFOincludegraphics}
+\DeclareRobustCommand{\DIFdelbeginFL}{\DIFOdelbeginFL \let\includegraphics\DIFdelincludegraphics}
+\DeclareRobustCommand{\DIFdelendFL}{\DIFOaddendFL \let\includegraphics\DIFOincludegraphics}
+%DIF END HIGHLIGHTGRAPHICS 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 PREAMBLE
+
+%DIF LISTINGS PREAMBLE
+\RequirePackage{listings}
+\RequirePackage{color}
+\lstdefinelanguage{DIFcode}{
+ % note that the definitions in the following two lines are overwritten dependent on the markup type selected %DIFCODE TEMPLATE
+ morecomment=[il]{\%DIF\ <\ }, %DIFCODE TEMPLATE
+ moredelim=[il][\bfseries]{\%DIF\ >\ } %DIFCODE TEMPLATE
+}
+\lstdefinestyle{DIFverbatimstyle}{
+ language=DIFcode,
+ basicstyle=\ttfamily,
+ columns=fullflexible,
+ keepspaces=true
+}
+\lstnewenvironment{DIFverbatim}{\lstset{style=DIFverbatimstyle}}{}
+\lstnewenvironment{DIFverbatim*}{\lstset{style=DIFverbatimstyle,showspaces=true}}{}
+%DIF END LISTINGS PREAMBLE
+
+%DIF DIFCODE_UNDERLINE
+ moredelim=[il][\color{red}\sout]{\%DIF\ <\ },
+ moredelim=[il][\color{blue}\uwave]{\%DIF\ >\ }
+%DIF END DIFCODE_UNDERLINE
+
+%DIF DIFCODE_CTRADITIONAL
+ moredelim=[il][\color{red}\scriptsize]{\%DIF\ <\ },
+ moredelim=[il][\color{blue}\sffamily]{\%DIF\ >\ }
+%DIF END DIFCODE_CTRADITIONAL
+
+%DIF DIFCODE_TRADITIONAL
+ moredelim=[il][\color{white}\tiny]{\%DIF\ <\ },
+ moredelim=[il][\sffamily]{\%DIF\ >\ }
+%DIF END DIFCODE_TRADITIONAL
+
+%DIF DIFCODE_CFONT
+ moredelim=[il][\color{red}\scriptsize]{\%DIF\ <\ },
+ moredelim=[il][\color{blue}\sffamily]{\%DIF\ >\ }
+%DIF END DIFCODE_CFONT
+
+%DIF DIFCODE_FONTSTRIKE
+ moredelim=[il][\scriptsize \sout]{\%DIF\ <\ },
+ moredelim=[il][\sffamily]{\%DIF\ >\ }
+%DIF END DIFCODE_FONTSTRIKE
+
+%DIF DIFCODE_INVISIBLE
+ moredelim=[il][\color{white}\tiny]{\%DIF\ <\ },
+ moredelim=[il]{\%DIF\ >\ }
+%DIF END DIFCODE_INVISIBLE
+
+%DIF DIFCODE_CHANGEBAR
+ moredelim=[il][\color{white}\tiny]{\%DIF\ <\ },
+ moredelim=[il]{\%DIF\ >\ }
+%DIF END DIFCODE_CHANGEBAR
+
+%DIF DIFCODE_CCHANGEBAR
+ moredelim=[il][\color{red}]{\%DIF\ <\ },
+ moredelim=[il][\color{blue}]{\%DIF\ >\ }
+%DIF END DIFCODE_CCHANGEBAR
+
+%DIF DIFCODE_CULINECHBAR
+ moredelim=[il][\color{red}\sout]{\%DIF\ <\ },
+ moredelim=[il][\color{blue}\uwave]{\%DIF\ >\ }
+%DIF END DIFCODE_CULINECHBAR
+
+%DIF DIFCODE_CFONTCHBAR
+ moredelim=[il][\color{red}\scriptsize]{\%DIF\ <\ },
+ moredelim=[il][\color{blue}\sffamily]{\%DIF\ >\ }
+%DIF END DIFCODE_CFONTCHBAR
+
+%DIF DIFCODE_BOLD
+ % unfortunately \bfseries cannot be combined with ttfamily without extra packages
+ % also morecomment=[il] is broken as of v1.5b of listings at least
+ % workaround: plot in white with tiny font
+ % morecomment=[il]{\%DIF\ <\ },
+ moredelim=[il][\color{white}\tiny]{\%DIF\ <\ },
+ moredelim=[il][\sffamily\bfseries]{\%DIF\ >\ }
+%DIF END DIFCODE_BOLD
+
+%DIF DIFCODE_PDFCOMMENT
+
+ moredelim=[il][\color{white}\tiny]{\%DIF\ <\ },
+ moredelim=[il][\sffamily\bfseries]{\%DIF\ >\ }
+%DIF END DIFCODE_PDFCOMMENT
+
diff --git a/support/latexdiff/latexdiff-vc b/support/latexdiff/latexdiff-vc
new file mode 100755
index 0000000000..21bf1f3adf
--- /dev/null
+++ b/support/latexdiff/latexdiff-vc
@@ -0,0 +1,827 @@
+#!/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-16 F J Tilmann (tilmann@gfz-potsdam.de)
+#
+# Repository: https://github.com/ftilmann/latexdiff
+# CTAN page: http://www.ctan.org/pkg/latexdiff
+#
+#
+# Contributors: S Utcke, H Bruyninckx, C Junghans
+#
+# 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 <http://www.gnu.org/licenses/>.
+#
+# Detailed usage information at the end of the file
+#
+# TODO/IDEAS: - option to call external pre-processing codes
+# - choose type of latex processor / bibtex (luatex, xelatex etc)
+# version 1.3.0 ((7 October 2018)
+# - option --only-changes with hyperref will suppress hyperrefs (pull request jprotze)_
+# - option --only-changes now moves (rather than copies) file with only changes
+# version 1.2.1 (22 June 2017):
+# - update: use qpdf (instead of pdftk) to select particular pages of output (pull request #102 submited by Tom Scogland via github). This was necessary because pdftk is being deprecated. pdftk is still used as a fall-back
+# - bug fix: --hg option was not recognised (partially fixes github issue #93 )
+# - wrap passed-through options to latexdiff in quotation marks (fix github issue #58 )
+# - program names for latexdiff, latex, dvips, bibtex configurable (fixes issue #40)
+#
+# version 1.2.0:
+# - depracation fix: left brace in RegEx now needs to be escaped
+#
+# version 1.1.1:
+# - better detection of RCS system
+# - undocumented option --debug/--nodebug to override default setting for debug mode (Default: 0)#
+# - bug fix: --flatten option combined with --pdf caused confusion of old and new file
+#
+# version 1.1.0:
+#
+# - with option --flatten and version control option, checkout the whole tree into a temporary directory
+# (use svn info + checkout ; git archive )
+# - add option --only-changes to output only changed pages (in combination with --ps or --pdf option)
+# version 1.0.4:
+# - [ Patch #3486 contributed by cbarbu] add additional compilation for styles using chbar + avoid pdf/postscripts repeat in the code
+# version 1.0.3: Bug fix: replace use of system('cp...') with File::Copy::copy (Patch contributed by D. Bremner)
+# Quotes around system call file arguments to allow filenames with spaces (Patch contributed by ssteve)
+# 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 Bjorn 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 File::Copy;
+
+use strict ;
+use warnings ;
+
+my $versionstring=<<EOF ;
+This is LATEXDIFF-VC 1.3.0
+ (c) 2005-2018 F J Tilmann
+EOF
+
+# output debug and intermediate files, set to 0 in final distribution
+my $debug=0;
+
+
+# Option names
+my ($version,$help,$fast,$showconfig,$so,$postscript,$pdf,$onlychanges,$flatten,$force,$dir,$cvs,$rcs,$svn,$git,$hg,
+ $run,$rundvi2,$diffcmd,$patchcmd,@revs,@configlist);
+# for passing through config options to latexdiff:
+my ($configlatexdiff,@config,$config,$assign);
+
+# Preset Variables
+#my $latexdiff="latexdiff"; # Program for making the comparison
+#my $latexcmd="latex"; # latex compiler if not further identified
+my $vc="";
+my $tempdir=tempdir(CLEANUP => 1); # generate a temp dir, which will automatically be deleted at program exit
+# Variables
+my ($file1,$file2,$diff,$diffbase,$rootdir,$answer,$options,$infile,$append,$dirname,$cwd);
+my (@files,@ldoptions,@tmpfiles,@ptmpfiles,@difffiles,$extracomp); # ,
+
+
+# keep commands to be used in config hash
+my (%CFG)=(
+ LATEX => "latex",
+ LATEXDIFF => "latexdiff",
+ DVI2 => "dvips",
+ BIBTEX => "bibtex"
+ );
+
+
+
+Getopt::Long::Configure('pass_through','bundling');
+
+GetOptions('revision|r:s' => \@revs,
+ 'cvs' => \$cvs,
+ 'rcs' => \$rcs,
+ 'svn' => \$svn,
+ 'git' => \$git,
+ 'hg' => \$hg,
+ 'dir|d:s' => \$dir,
+ 'run' => \$run,
+ 'dvi' => \$rundvi2,
+ 'fast' => \$fast,
+ 'so' => \$so,
+ 'postscript|ps' => \$postscript,
+ 'pdf' => \$pdf,
+ 'force' => \$force,
+ 'only-changes' => \$onlychanges,
+ 'flatten:s' => \$flatten,
+ 'config|c=s' => \@configlist,
+ 'show-config' => \$showconfig,
+ 'version' => \$version,
+ 'help|h' => \$help,
+ 'debug!' => \$debug);
+
+##print STDERR "DEBUG 1:revs($#revs): " . join(":",@revs) . "\n";
+##print STDERR "DEBUG 1:ARGV($#ARGV): " . join(":",@ARGV) . "\n";
+
+$extracomp = join(" ",grep(/BAR/,@ARGV)); # special latexdiff options requiring additional compilation
+
+if ( $help ) {
+ pod2usage(1) ;
+}
+
+if ( $version ) {
+ die $versionstring ;
+}
+
+if ( $so ) {
+ $CFG{LATEXDIFF}='latexdiff-so';
+}
+if ( $fast ) {
+ die "Cannot specify more than one of --fast or --so " if ($so);
+ $CFG{LATEXDIFF}='latexdiff-fast';
+}
+
+if ( $cvs ) {
+ $vc="CVS";
+}
+if ( $rcs ) {
+ die "Cannot specify more than one of --cvs, --rcs, --svn --git or --hg." if ($vc);
+ $vc="RCS";
+}
+if ( $svn ) {
+ die "Cannot specify more than one of --cvs, --rcs, --svn --git or --hg." if ($vc);
+ $vc="SVN";
+}
+if ( $git ) {
+ die "Cannot specify more than one of --cvs, --rcs, --svn --git or --hg." if ($vc);
+ $vc="GIT";
+}
+if ( $hg ) {
+ die "Cannot specify more than one of --cvs, --rcs, --svn --git or --hg." if ($vc);
+ $vc="HG";
+}
+
+if ( $pdf ) {
+ $CFG{LATEX} = "pdflatex";
+ $run=1;
+} elsif ( $postscript ) {
+ $CFG{LATEX} = "latex";
+ $rundvi2=1;
+}
+
+if ( $rundvi2 ) {
+ $run=1;
+}
+
+# setting config variables from command line. Explicitly set configuration options take precedence over convenience options,
+# therefore this is executed last
+@config=();
+foreach $config ( @configlist ) {
+ if (-f $config || lc $config eq '/dev/null' ) {
+ open(FILE,$config) or die ("Couldn't open configuration file $config: $!");
+ while (<FILE>) {
+ chomp;
+ next if /^\s*#/ || /^\s*%/ || /^\s*$/ ;
+ push (@config,$_);
+ }
+ close(FILE);
+ }
+ else {
+# foreach ( split(",",$config) ) {
+# push @config,$_;
+# }
+ push @config,split(",",$config)
+ }
+}
+
+$configlatexdiff="";
+foreach $assign ( @config ) {
+ $assign=~ m/\s*(\w*)\s*=\s*(\S*)\s*$/ or die "Illegal assignment $assign in configuration list (must be variable=value)";
+ if ( defined($CFG{$1})) {
+ # known latexdiff-vc option
+ $CFG{$1}=$2;
+ } else {
+ # unknown option, assume it is a latexdiff configuration variable
+ $configlatexdiff .= "$1=$2,";
+ }
+}
+# delete last comma inv $configlatexdiff if present
+$configlatexdiff =~ s/,$// ;
+
+if ($showconfig) {
+ print "# Configuration variables (latexdiff-vc):\n";
+ foreach ( keys %CFG ) {
+ print "$_=$CFG{$_}\n";
+ }
+ exit 0;
+}
+
+
+# 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] =~ /^-/ ) ) {
+ push @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 =~ /^-/ ) ) {
+ push @ARGV,$dir;
+ $dir="";
+}
+# check whether the first file name or first passed-through option for latexdiff got misinterpreted as an option to an empty --flatten option
+
+if ( defined($flatten) && ( -f $flatten || $flatten =~ /^-/ ) ) {
+ unshift @ARGV,$flatten;
+ $flatten="";
+}
+
+print STDERR "DEBUG: PDF $pdf latexdiff-vc command line: ", join(" ",@ARGV), "\n" if $debug;
+
+$file2=pop @ARGV;
+( defined($file2) && $file2 =~ /\.(tex|bbl|flt)$/ ) or pod2usage("Must specify at least one tex, bbl or flt 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 ( $0 =~ /-hg$/ ) {
+ $vc="HG";
+ } elsif ( -e "$file2,v" || -d "RCS" ) {
+ 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";
+ } elsif ( -d ".hg" ) {
+ print STDERR "Guess you are using HG ...\n";
+ $vc="HG";
+ } elsif ( -e "CVSROOT" || defined($ENV{"CVSROOT"}) ) {
+ print STDERR "Guess you are using CVS ...\n";
+ $vc="CVS";
+ } 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 --internal-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";
+ } elsif ( $vc eq "HG" ) {
+ $diffcmd = "hg diff --root . -r";
+ $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, .bbl or .flt (output of flatex)
+
+@files=($file2);
+while( $file1=pop @ARGV ) {
+ if ( $file1 =~ /\.(tex|bbl|flt)$/ ) {
+ # $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 ( length $configlatexdiff >0 ) {
+ push @ldoptions, "--config=$configlatexdiff";
+}
+
+if ( defined($flatten) ) {
+ push @ldoptions, "--flatten" ;
+}
+
+if ( defined($debug) && $debug ) {
+ push @ldoptions, "--debug" ;
+}
+
+# impose ZLABEL subtype if --only-changes option
+if ( $onlychanges ) {
+ push @ldoptions, "-s", "ZLABEL","-f","IDENTICAL","--no-links" ;
+}
+
+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;
+ warn "Option -flatten should normally be combined with -r option (Results will probably not be as expected)" if defined($flatten);
+ # compare two files
+ $file1=shift @files ;
+} else {
+ # revision control
+ if ( defined($flatten) ) {
+ pod2usage("Only one root file must be given if --flatten option is used with version control") if @files != 1;
+ $tempdir='.' if ( $flatten eq "keep-intermediate" );
+ print STDERR "flatten tempdir |$tempdir|\n" if $debug;
+ if ( $vc eq "SVN" ) {
+ my (@infoout)=`svn info`;
+ my (@urlline) = grep(/^URL:/, @infoout);
+ @urlline ==1 or die "Ambiguous output from svn info command.";
+ ( $rootdir = $urlline[0] ) =~ s/URL:\s*// ;
+ chomp $rootdir;
+ } elsif ( $vc eq "GIT" || $vc eq "HG" ) {
+ # do nothing
+ } else {
+ die "--flatten option with revision control only possible with SVN, HG and GIT modes";
+ }
+ }
+}
+
+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";
+}
+
+if ($vc eq "HG" && scalar(@revs)) {
+ length($revs[$#revs]) > 0 or $revs[$#revs]="tip";
+ length($revs[0]) > 0 or $revs[0]="tip";
+}
+
+print STDERR "DEBUG LDOptions($#ldoptions): " . join(":",@ldoptions) . "\n" if $debug;
+
+
+# cycle through all files
+@difffiles=();
+
+while ( $infile=$file2=shift @files ) {
+ print STDERR "Working on $infile \n";
+ if ( scalar(@revs) == 1 ) {
+ if ( defined($flatten) ) {
+ my $olddir=$tempdir . "/latexdiff-vc-$revs[0]";
+ print STDERR "Checking out old dir into: $olddir (rev: $revs[0])\n";
+ checkout_dir($revs[0],$olddir);
+ $file1=$olddir ."/".$infile;
+ } else {
+ ($file1=$infile) =~ s/\.(tex|bbl|flt)/-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
+ copy($infile,$file1) || die "copy($infile,$file1) failed: $!";
+ }
+ }
+ } elsif ( scalar(@revs) == 2 ) {
+ if ( defined($flatten) ) {
+ my $olddir=$tempdir . "/latexdiff-vc-$revs[0]";
+ print STDERR "Checking out old dir into: $olddir (rev: $revs[0])\n";
+ checkout_dir($revs[0],$olddir);
+ $file1=$olddir ."/".$infile;
+
+ my $newdir=$tempdir . "/latexdiff-vc-$revs[1]";
+ print STDERR "Checking out new dir into: $newdir\n";
+ checkout_dir($revs[1],$newdir);
+ $file2=$newdir ."/".$infile;
+ } else {
+ ($file1=$infile) =~ s/\.(tex|bbl|flt)/-oldtmp-$$.$1/ ;
+ $file2 =~ s/\.(tex|bbl|flt)/-newtmp-$$.$1/ ;
+ push @tmpfiles,$file2;
+ if (system("$diffcmd$revs[1] $infile | $patchcmd -o$file2")==0 and -z $file2 ) {
+ copy($infile,$file2) || die "copy($infile,$file2) failed: $!";
+ }
+ if (system("$diffcmd$revs[0] $infile | $patchcmd -o$file1")==0 and -z $file1 ) {
+ copy($infile,$file1) || die "copy($infile,$file1) failed: $!";
+ };
+ }
+ }
+
+ 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|flt)$/$append.$1/ ;
+ }
+
+ # make directories if needed
+ $dirname=dirname($diff) ;
+ system("mkdir -p $dirname") unless ( -e $dirname );
+
+ # Remaining options are passed to latexdiff
+ if (scalar(@ldoptions) > 0 ) {
+ $options = "\'" . join("\' \'",@ldoptions) . "\'";
+ } else {
+ $options = "";
+ }
+
+ if ( -e $diff && ! $force ) {
+ print STDERR "OK to overwrite existing file $diff (y/n)? ";
+ $answer = <STDIN> ;
+ unless ($answer =~ /^y/i ) {
+ unlink @tmpfiles;
+ die "Abort ... " ;
+ }
+ }
+ print STDERR "Running: $CFG{LATEXDIFF} $options \"$file1\" \"$file2\" > \"$diff\"\n";
+ unless ( system("$CFG{LATEXDIFF} $options \"$file1\" \"$file2\" > \"$diff\"") == 0 ) {
+ print STDERR "Something went wrong in $CFG{LATEXDIFF}. Deleting $diff and abort\n" ; unlink $diff ; exit(5)
+ };
+ print "Generated difference file $diff\n";
+
+ if ( $run 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\"");
+ }
+
+ if ( $run ) {
+ print STDERR "PDF: $pdf Postscript: $postscript cwd $cwd\n" if $debug;
+
+ if ( system("grep -q \'^[^%]*\\\\bibliography{\' \"$diff\"") == 0 ) {
+ system("$CFG{LATEX} --interaction=batchmode \"$diff\"; $CFG{BIBTEX} \"$diffbase\";");
+ push @ptmpfiles, "$diffbase.bbl","$diffbase.bbl" ;
+ }
+
+ # if special needs, as CHANGEBAR
+ if ( $extracomp ) {
+ # print "Extracomp\n";
+ system("$CFG{LATEX} --interaction=batchmode \"$diff\";");
+ }
+
+ # final compilation
+ system("$CFG{LATEX} --interaction=batchmode \"$diff\";"); # needed if cross-refs
+ system("$CFG{LATEX} \"$diff\";"); # final, with possible error messages
+
+ if ( $rundvi2 ) {
+ my $dvi="$diffbase.dvi";
+ #my $ps="$diffbase.ps";
+ my $ppoption="";
+
+ if ( $onlychanges ) {
+ $ppoption="-pp ".join(",",findchangedpages("$diffbase.aux"));
+ }
+ #system("$CFG{DVI2} $ppoption -o $ps $dvi");
+ system("$CFG{DVI2} $ppoption $dvi");
+ push @ptmpfiles, "$diffbase.aux","$diffbase.log",$dvi ;
+ #print STDERR "Generated postscript file $ps\n";
+ } elsif ( $run ) {
+ if ( $onlychanges ) {
+ my @pages=findchangedpages("$diffbase.aux");
+ my $gs = `which gs`;
+ $gs =~ s/^\s+|\s+$//g;
+ my $qpdf = `which qpdf`;
+ $qpdf =~ s/^\s+|\s+$//g;
+ my $pdftk = `which pdftk`;
+ $pdftk =~ s/^\s+|\s+$//g;
+ my $command;
+ if (-x $gs && `gs --version` >= 9.20) {
+ $command="gs -sDEVICE=pdfwrite -dNOPAUSE -dBATCH -dSAFER -sPageList=" . join(",", @pages) . " -sOutputFile=\"$diffbase-changedpage.pdf\" \"$diffbase.pdf\"";
+ } elsif (-x $pdftk) {
+ $command="pdftk \"$diffbase.pdf\" cat " . join(" ",@pages) . " output \"$diffbase-changedpage.pdf\"";
+ } elsif (-x $qpdf) {
+ $command="qpdf --linearize \"$diffbase.pdf\" --pages \"$diffbase.pdf\" " . join(",", @pages) . " -- \"$diffbase-changedpage.pdf\" ";
+ } else {
+ die ("could not find any of gs, pdftk or qpdf");
+ }
+ print "Executing ".$command;
+ system($command) == 0
+ or die("could not execute <".$command."> to strip pages. Return code: $?");
+ move("$diffbase-changedpage.pdf","$diffbase.pdf");
+ }
+ push @ptmpfiles, "$diffbase.aux","$diffbase.log";
+ }
+ }
+ unlink @ptmpfiles;
+ chdir $cwd;
+}
+
+# findchangedpages($auxfile)
+# returns a list of the page numbers on which changes were marked with the ZLABEL subtype of latexdiff
+sub findchangedpages {
+ my ($auxfile) =@_;
+ my $j;
+ my (%pages); # note that I use a hash with page numbers as keys and arbitrary values - this way I can use Perl's built-in functions to get rid of duplicates
+ my %start;
+ open(AUX,$auxfile) or die ("Could open aux file $auxfile . System error: $!");
+ while (<AUX>) {
+ if (m/\\zref\@newlabel\{DIFchgb(\d*)\}\{.*\\abspage\{(\d*)\}\}/ ) {
+ $start{$1}=$2; $pages{$2}=1;
+ }
+ if (m/\\zref\@newlabel\{DIFchge(\d*)\}\{.*\\abspage\{(\d*)\}\}/) {
+ if (defined($start{$1})) {
+ for ($j=$start{$1}; $j<=$2; $j++) {
+ $pages{$j}=1;
+ }
+ } else {
+ $pages{$2}=1;
+ }
+ }
+ }
+ close(AUX);
+ # sort pages numerically (they should be sorted already; this is just to make sure
+ return(sort {$a <=> $b} keys(%pages));
+}
+
+# checkout_dir(rev,dirname)
+# checks out revision rev and stores it in dirname
+# uses global variables: $vc, $rootdir
+sub checkout_dir {
+ my ($rev,$dirname)=@_;
+
+ unless (-e $dirname) { mkdir $dirname or die "Cannot mkdir $dirname ." ;}
+ if ( $vc eq "SVN" ) {
+ system("svn checkout -r $rev $rootdir $dirname")==0 or die "Something went wrong in executing: svn checkout -r $rev $rootdir $dirname";
+ } elsif ( $vc eq "GIT" ) {
+ $rev="HEAD" if length($rev)==0;
+ system("git archive --format=tar $rev | ( cd $dirname ; tar -xf -)")==0 or die "Something went wrong in executing: git archive --format=tar $rev | ( cd $dirname ; tar -xf -)";
+ } elsif ( $vc eq "HG" ) {
+ system("hg archive --type files -r $rev $dirname")==0 or die "Something went wrong in executing: hg archive --type files -r $rev $dirname";
+ } else {
+ die "checkout_dir: only works with SVN, HG and GIT VCS system (selected: $vc)";
+ }
+}
+
+# greptex returns 1 if regex is not matched in filename
+# only the 25 first non-comment lines are scanned
+# 0 if there is a match
+sub greptex {
+ my ($regex,$filename)=@_;
+ my ($i)=0;
+ open (FH, $filename) or die("Couldn't open $filename: $!");
+ while (<FH>) {
+ 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<latexdiff-vc> [ F<latexdiff-options> ] [ F<latexdiff-vc-options> ] B<-r> [F<rev1>] [B<-r> F<rev2>] F<file1.tex> [ F<file2.tex> ...]
+
+ or
+
+B<latexdiff-vc> [ F<latexdiff-options> ] [ F<latexdiff-vc-options> ][ B<--postscript> | B<--pdf> ] F<old.tex> F<new.tex>
+
+=head1 DESCRIPTION
+
+I<latexdiff-vc> is a wrapper script that applies I<latexdiff> to a
+file, or multiple files under version control (git, subversion (SVN), mercurial (hg), CVS, RCS), and optionally runs the
+sequence of C<latex> and C<dvips> or C<pdflatex> 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>, B<--git> or B<--hg>
+
+Set the version control system used.
+If no version system is specified, latexdiff-vc will venture a guess.
+
+latexdiff-cvs, latexdiff-rcs etc are variants of latexdiff-vc which default to
+the respective versioning system. However, this default can still be overridden using the options above.
+
+Note that hg needs to support the C<--root> option (version >= 2.9)
+
+=item B<-r>, B<-r> F<rev> or B<--revision>, B<--revision=>F<rev>
+
+Choose revision (under RCS, CVS, SVN, GIT or HG). One or two B<-r> options can be
+specified, and they result in different behaviour:
+
+=over 4
+
+=item B<latexdiff-vc> -r F<file.tex> ...
+
+compares F<file.tex> with the most recent version checked into RCS.
+
+=item B<latexdiff-vc> -r F<rev1> F<file.tex> ...
+
+compares F<file.tex> with revision F<rev1>.
+
+=item B<latexdiff-vc> -r F<rev1> -r F<rev2> F<file.tex> ...
+
+compares revisions F<rev1> and F<rev2> of F<file.tex>.
+
+Multiple files can be specified for all of the above options. All files must have the
+extension C<.tex>, though.
+
+=item B<latexdiff-vc> F<old.tex> F<new.tex>
+
+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<path> or B<--dir=>F<path>
+
+Rather than appending the string C<diff> and optionally the version
+numbers given to the output-file, this will prepend a directory name C<diff>
+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<path> can be specified, which is prepended instead of C<diff>.
+
+=item B<--flatten,--flatten=keep-intermediate>
+
+If combined with C<--git>, C<--svn> or C<--hg> option or the corresponding modes, check out the revisions to compare in a separate temporary directory, and then pass on option C<--flatten> to latexdiff. The directory in which C<latexdiff-vc> is invoked defines the subtree which will be checked out.
+Note that if additional files are needed which are not included in the flatten procedure (package files, included graphics), they need to be accessible in the current directory. If you use bibtex, it is recommended to include the C<.bbl> file in the version management.
+
+The generic usage of this function is : C<latexdiff-vc --flatten -r rev1 [-r rev2] master.tex> where master.tex is the project file containing the highest level of includes etc.
+
+With C<--flatten=keep-intermediate>, the intermediate revision snapshots are kept in the current directory (Default is to store them in a temporary directory and delete them after generating the diff file.)
+
+=item B<--config var1=val1,var2=val2,...> or B<-c var1=val1,..>
+
+
+
+=item B<--only-changes>
+
+Post-process the output such that only pages with changes on them are displayed. This requires the use of subtype ZLABEL
+in latexdiff, which will be set automatically, but any manually set -s option will be overruled (also requires zref package to
+be installed). (note that this option must be combined with --ps or --pdf to make sense)
+
+=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<--run>
+
+run latex command on diff file after generation of diff file.
+
+=item B<--dvi>
+
+run latex and dvixxx commands after generation of diff file.
+
+=item B<-c configfile>
+
+Set configuration variables for latexdiff and latexdiff-vc. The option can be repeated to set different
+variables (as an alternative to the comma-separated list).
+Available variables for latexdiff-vc:
+
+=over 8
+
+=item C<LATEXDIFF> latexdiff command (e.g. latexdiff-fast, latexdiff-so). This command should support the option C<--interaction=batchmode>
+
+=item C<LATEX> latex command (e.g. pdflatex, lualatex)
+
+=item C<DVI2> Command for conversion of dvi file (e.g. dvips, dvipdf)
+
+=item C<BIBTEX> Command replacing bibtex
+
+=back
+
+All other config variables are passed to latexdiff. Explicity set configuration changes always override implicit
+changes by the following shortcut options B<--fast>, B<--so>, B<--ps> and B<--pdf>.
+
+=item B<--fast> or B<--so>
+
+Use C<latexdiff-fast> or C<latexdiff-so>, respectively (instead of C<latexdiff>).
+
+=item B<--ps> or B<--postscript>
+
+Generate postscript output from difference file. This will run the
+sequence C<latex; latex; dvips> on the difference file (do not use
+this option in the rare cases, where three C<latex> commands are
+required if you care about correct referencing). If the difference
+file contains a C<\bibliography> tag, run the sequence C<latex;
+bibtex; latex; latex; dvips>.
+
+=item B<--pdf>
+
+Generate pdf output from difference file using C<pdflatex>. This will
+run the sequence C<pdflatex; pdflatex> on the difference file, or
+C<pdflatex; bibtex; pdflatex; pdflatex> for files requiring bibtex.
+Note that this is not just a shortcut for setting configuration variable but also triggers
+some special behaviour.
+
+
+=item B<--show-config>
+
+Show values of configuration variables.
+
+=item B<--help> or B<-h>
+
+Show help text
+
+=item B<--version>
+
+Show version number
+
+=back
+
+All other options are passed on to C<latexdiff>.
+
+=head1 SEE ALSO
+
+L<latexdiff>
+
+=head1 PORTABILITY
+
+I<latexdiff-vc> uses external commands and is therefore dependent on the system architecture; it has been
+tested mainly on Unix-like systems. It also requires the a version control
+system and latex to be installed on the system to make use of all features. Modules from Perl 5.8
+or higher are required.
+
+=head1 BUG REPORTING
+
+Please submit bug reports using the issue tracker of the github repository page I<https://github.com/ftilmann/latexdiff.git>,
+or send them to I<tilmann -- AT -- gfz-potsdam.de>. Include the version number of I<latexdiff-vc>
+(option C<--version>).
+
+=head1 AUTHOR
+
+Version 1.2.1
+Copyright (C) 2005-2017 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; some ideas have been inspired by git-latexdiff bash script.
+C. Junghans: Mercurial Support.
+
+=cut
+
diff --git a/support/latexdiff/latexdiff-vc.1 b/support/latexdiff/latexdiff-vc.1
new file mode 100644
index 0000000000..b4a00e943e
--- /dev/null
+++ b/support/latexdiff/latexdiff-vc.1
@@ -0,0 +1,309 @@
+.\" Automatically generated by Pod::Man 2.28 (Pod::Simple 3.29)
+.\"
+.\" 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" ''
+. ds C`
+. ds C'
+'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.
+.\"
+.\" Avoid warning from groff about undefined register 'F'.
+.de IX
+..
+.nr rF 0
+.if \n(.g .if rF .nr rF 1
+.if (\n(rF:(\n(.g==0)) \{
+. if \nF \{
+. de IX
+. tm Index:\\$1\t\\n%\t"\\$2"
+..
+. if !\nF==2 \{
+. nr % 0
+. nr F 2
+. \}
+. \}
+.\}
+.rr rF
+.\"
+.\" 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 "2018-10-07" "perl v5.22.1" " "
+.\" 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 (git, subversion (\s-1SVN\s0), mercurial (hg), \s-1CVS, RCS\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, \fB\-\-git\fR or \fB\-\-hg\fR" 4
+.IX Item "--rcs, --svn, --cvs, --git or --hg"
+Set the version control system used.
+If no version system is specified, latexdiff-vc will venture a guess.
+.Sp
+latexdiff-cvs, latexdiff-rcs etc are variants of latexdiff-vc which default to
+the respective versioning system. However, this default can still be overridden using the options above.
+.Sp
+Note that hg needs to support the \f(CW\*(C`\-\-root\*(C'\fR option (version >= 2.9)
+.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, CVS, SVN, GIT\s0 or \s-1HG\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\-\-flatten,\-\-flatten=keep\-intermediate\fR" 4
+.IX Item "--flatten,--flatten=keep-intermediate"
+If combined with \f(CW\*(C`\-\-git\*(C'\fR, \f(CW\*(C`\-\-svn\*(C'\fR or \f(CW\*(C`\-\-hg\*(C'\fR option or the corresponding modes, check out the revisions to compare in a separate temporary directory, and then pass on option \f(CW\*(C`\-\-flatten\*(C'\fR to latexdiff. The directory in which \f(CW\*(C`latexdiff\-vc\*(C'\fR is invoked defines the subtree which will be checked out.
+Note that if additional files are needed which are not included in the flatten procedure (package files, included graphics), they need to be accessible in the current directory. If you use bibtex, it is recommended to include the \f(CW\*(C`.bbl\*(C'\fR file in the version management.
+.Sp
+The generic usage of this function is : \f(CW\*(C`latexdiff\-vc \-\-flatten \-r rev1 [\-r rev2] master.tex\*(C'\fR where master.tex is the project file containing the highest level of includes etc.
+.Sp
+With \f(CW\*(C`\-\-flatten=keep\-intermediate\*(C'\fR, the intermediate revision snapshots are kept in the current directory (Default is to store them in a temporary directory and delete them after generating the diff file.)
+.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,.."
+.PD 0
+.IP "\fB\-\-only\-changes\fR" 4
+.IX Item "--only-changes"
+.PD
+Post-process the output such that only pages with changes on them are displayed. This requires the use of subtype \s-1ZLABEL \s0
+in latexdiff, which will be set automatically, but any manually set \-s option will be overruled (also requires zref package to
+be installed). (note that this option must be combined with \-\-ps or \-\-pdf to make sense)
+.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\-\-run\fR" 4
+.IX Item "--run"
+run latex command on diff file after generation of diff file.
+.IP "\fB\-\-dvi\fR" 4
+.IX Item "--dvi"
+run latex and dvixxx commands after generation of diff file.
+.IP "\fB\-c configfile\fR" 4
+.IX Item "-c configfile"
+Set configuration variables for latexdiff and latexdiff-vc. The option can be repeated to set different
+variables (as an alternative to the comma-separated list).
+Available variables for latexdiff-vc:
+.RS 4
+.ie n .IP """LATEXDIFF"" latexdiff command (e.g. latexdiff-fast, latexdiff-so). This command should support the option ""\-\-interaction=batchmode""" 8
+.el .IP "\f(CWLATEXDIFF\fR latexdiff command (e.g. latexdiff-fast, latexdiff-so). This command should support the option \f(CW\-\-interaction=batchmode\fR" 8
+.IX Item "LATEXDIFF latexdiff command (e.g. latexdiff-fast, latexdiff-so). This command should support the option --interaction=batchmode"
+.PD 0
+.ie n .IP """LATEX"" latex command (e.g. pdflatex, lualatex)" 8
+.el .IP "\f(CWLATEX\fR latex command (e.g. pdflatex, lualatex)" 8
+.IX Item "LATEX latex command (e.g. pdflatex, lualatex)"
+.ie n .IP """DVI2"" Command for conversion of dvi file (e.g. dvips, dvipdf)" 8
+.el .IP "\f(CWDVI2\fR Command for conversion of dvi file (e.g. dvips, dvipdf)" 8
+.IX Item "DVI2 Command for conversion of dvi file (e.g. dvips, dvipdf)"
+.ie n .IP """BIBTEX"" Command replacing bibtex" 8
+.el .IP "\f(CWBIBTEX\fR Command replacing bibtex" 8
+.IX Item "BIBTEX Command replacing bibtex"
+.RE
+.RS 4
+.PD
+.Sp
+All other config variables are passed to latexdiff. Explicity set configuration changes always override implicit
+changes by the following shortcut options \fB\-\-fast\fR, \fB\-\-so\fR, \fB\-\-ps\fR and \fB\-\-pdf\fR.
+.RE
+.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.
+Note that this is not just a shortcut for setting configuration variable but also triggers
+some special behaviour.
+.IP "\fB\-\-show\-config\fR" 4
+.IX Item "--show-config"
+Show values of configuration variables.
+.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 dependent on the system architecture; it has been
+tested mainly on Unix-like systems. It also requires the a version control
+system and latex to be installed on the system to make use of all features. Modules from Perl 5.8
+or higher are required.
+.SH "BUG REPORTING"
+.IX Header "BUG REPORTING"
+Please submit bug reports using the issue tracker of the github repository page \fIhttps://github.com/ftilmann/latexdiff.git\fR,
+or send them to \fItilmann \*(-- \s-1AT\s0 \*(-- gfz\-potsdam.de\fR. Include the version number of \fIlatexdiff-vc\fR
+(option \f(CW\*(C`\-\-version\*(C'\fR).
+.SH "AUTHOR"
+.IX Header "AUTHOR"
+Version 1.2.1
+Copyright (C) 2005\-2017 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; some ideas have been inspired by git-latexdiff bash script.
+C. Junghans: Mercurial Support.
diff --git a/support/latexdiff/latexdiff.1 b/support/latexdiff/latexdiff.1
new file mode 100644
index 0000000000..f48444e307
--- /dev/null
+++ b/support/latexdiff/latexdiff.1
@@ -0,0 +1,924 @@
+.\" Automatically generated by Pod::Man 2.28 (Pod::Simple 3.29)
+.\"
+.\" 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" ''
+. ds C`
+. ds C'
+'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.
+.\"
+.\" Avoid warning from groff about undefined register 'F'.
+.de IX
+..
+.nr rF 0
+.if \n(.g .if rF .nr rF 1
+.if (\n(rF:(\n(.g==0)) \{
+. if \nF \{
+. de IX
+. tm Index:\\$1\t\\n%\t"\\$2"
+..
+. if !\nF==2 \{
+. nr % 0
+. nr F 2
+. \}
+. \}
+.\}
+.rr rF
+.\"
+.\" 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 "2018-10-07" "perl v5.22.1" " "
+.\" 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. Note that old.tex and new.tex need to
+be real files (not pipes or similar) as they are opened twice (unless \f(CW\*(C`\-\-encoding\*(C'\fR option is used)
+.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 CFONTCHBAR BOLD PDFCOMMENT\*(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 MARGIN COLOR DVIPSCOL ZLABEL ONLYCHANGEDPAGE (LABEL)*\*(C'\fR
+.Sp
+[ Default: \f(CW\*(C`SAFE\*(C'\fR ]
+* Subtype \f(CW\*(C`LABEL\*(C'\fR is deprecated
+.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
+If this option is used, then old.tex, new.tex are only opened once.
+[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 \s-1MATHARRREPL\s0 is set to \f(CW\*(C`align*\*(C'\fR (Default: \f(CW\*(C`eqnarray*\*(C'\fR). (Note that many of the
+amsmath array environments are already recognised by default as such)
+.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).
+.ie n .IP """apacite""" 8
+.el .IP "\f(CWapacite\fR" 8
+.IX Item "apacite"
+Redefine the commands recognised as citation commands.
+.ie n .IP """siunitx""" 8
+.el .IP "\f(CWsiunitx\fR" 8
+.IX Item "siunitx"
+Treat \f(CW\*(C`\eSI\*(C'\fR as equivalent to citation commands (i.e. protect with \f(CW\*(C`\embox\*(C'\fR if markup style uses ulem package.
+.ie n .IP """cleveref""" 8
+.el .IP "\f(CWcleveref\fR" 8
+.IX Item "cleveref"
+Treat \f(CW\*(C`\ecref,\eCref\*(C'\fR, etc as equivalent to citation commands (i.e. protect with \f(CW\*(C`\embox\*(C'\fR if markup style uses ulem package.
+.ie n .IP """glossaries""" 8
+.el .IP "\f(CWglossaries\fR" 8
+.IX Item "glossaries"
+Define most of the glossaries commands as safe, protecting them with \embox'es where needed
+.ie n .IP """mhchem""" 8
+.el .IP "\f(CWmhchem\fR" 8
+.IX Item "mhchem"
+Treat \f(CW\*(C`\ece\*(C'\fR as a safe command, i.e. it will be highlighted (note that \f(CW\*(C`\ecee\*(C'\fR will not be highlighted in equations as this leads to processing errors)
+.ie n .IP """chemformula"" or ""chemmacros""" 8
+.el .IP "\f(CWchemformula\fR or \f(CWchemmacros\fR" 8
+.IX Item "chemformula or chemmacros"
+Treat \f(CW\*(C`\ech\*(C'\fR as a safe command outside equations, i.e. it will be highlighted (note that \f(CW\*(C`\ech\*(C'\fR will not be highlighted in equations as this leads to processing errors)
+.RE
+.RS 4
+.Sp
+[ Default: scan the preamble for \f(CW\*(C`\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
+.IP "\fB\-\-append\-context1cmd=append\-file\fR or" 4
+.IX Item "--append-context1cmd=append-file or"
+.ie n .IP "\fB\-\-append\-context1cmd=""cmd1,cmd2,...""\fR" 4
+.el .IP "\fB\-\-append\-context1cmd=``cmd1,cmd2,...''\fR" 4
+.IX 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. \f(CW\*(C`\ecaption\*(C'\fR 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
+.IP "\fB\-\-append\-context2cmd=append\-file\fR or" 4
+.IX Item "--append-context2cmd=append-file or"
+.ie n .IP "\fB\-\-append\-context2cmd=""cmd1,cmd2,...""\fR" 4
+.el .IP "\fB\-\-append\-context2cmd=``cmd1,cmd2,...''\fR" 4
+.IX Item "--append-context2cmd=cmd1,cmd2,..."
+.PD
+As corresponding commands for context1. The only difference is that
+context2 commands are completely disabled in deleted sections, including
+their arguments.
+.Sp
+context2 commands are also the only commands in the preamble, whose argument will be processed in
+word-by-word mode (which only works, if they occur no more than once in the preamble). The algorithm currently cannot cope with repeated context2 commands in the preamble, as they occur e.g. for the \f(CW\*(C`\eauthor\*(C'\fR argument in some journal styles (not in the standard styles, though
+If such a repetition is detected, the whole preamble will be processed in line-by-line mode. In such a case, use \f(CW\*(C`\-\-replace\-context2cmd\*(C'\fR option to just select the commands, which should be processed and are not used repeatedly in the preamble.
+.ie n .IP "\fB\-\-exclude\-mboxsafecmd=exclude\-file\fR or \fB\-\-exclude\-mboxsafecmd=""cmd1,cmd2,...""\fR" 4
+.el .IP "\fB\-\-exclude\-mboxsafecmd=exclude\-file\fR or \fB\-\-exclude\-mboxsafecmd=``cmd1,cmd2,...''\fR" 4
+.IX Item "--exclude-mboxsafecmd=exclude-file or --exclude-mboxsafecmd=cmd1,cmd2,..."
+.PD 0
+.ie n .IP "\fB\-\-append\-mboxsafecmd=append\-file\fR or \fB\-\-append\-mboxsafecmd=""cmd1,cmd2,...""\fR" 4
+.el .IP "\fB\-\-append\-mboxsafecmd=append\-file\fR or \fB\-\-append\-mboxsafecmd=``cmd1,cmd2,...''\fR" 4
+.IX Item "--append-mboxsafecmd=append-file or --append-mboxsafecmd=cmd1,cmd2,..."
+.PD
+Define safe commands, which additionally need to be protected by encapsulating
+in an \f(CW\*(C`\embox{..}\*(C'\fR. This is sometimes needed to get around incompatibilities
+between external packages and the ulem package, which is used for highlighting
+in the default style \s-1UNDERLINE\s0 as well as \s-1CULINECHBAR CFONTSTRIKE\s0
+.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,.."
+.PD 0
+.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`ARRENV\*(C'\fR (RegEx)
+.Sp
+\&\f(CW\*(C`COUNTERCMD\*(C'\fR (RegEx)
+.Sp
+\&\f(CW\*(C`CUSTODIFCMD\*(C'\fR (RegEx)
+.Sp
+\&\f(CW\*(C`FLOATENV\*(C'\fR (RegEx)
+.Sp
+\&\f(CW\*(C`ITEMCMD\*(C'\fR (RegEx)
+.Sp
+\&\f(CW\*(C`LISTENV\*(C'\fR (RegEx)
+.Sp
+\&\f(CW\*(C`MATHARRENV\*(C'\fR (RegEx)
+.Sp
+\&\f(CW\*(C`MATHARRREPL\*(C'\fR (String)
+.Sp
+\&\f(CW\*(C`MATHENV\*(C'\fR (RegEx)
+.Sp
+\&\f(CW\*(C`MATHREPL\*(C'\fR (String)
+.Sp
+\&\f(CW\*(C`MINWORDSBLOCK\*(C'\fR (Integer)
+.Sp
+\&\f(CW\*(C`PICTUREENV\*(C'\fR (RegEx)
+.Sp
+\&\f(CW\*(C`SCALEDELGRAPHICS\*(C'\fR (Float)
+.IP "\fB\-\-add\-to\-config varenv1=pattern1,varenv2=pattern2,...\fR" 4
+.IX Item "--add-to-config varenv1=pattern1,varenv2=pattern2,..."
+For configuration variables, which are a regular expression (essentially those ending
+in \s-1ENV, COUNTERCMD\s0 and \s-1CUSTOMDIFCMD,\s0 see list above) this option provides an alternative way to modify the configuration
+variables. Instead of setting the complete pattern, with this option it is possible to add an
+alternative pattern. \f(CW\*(C`varenv\*(C'\fR must be one of the variables listed above that take a regular
+expression as argument, and pattern is any regular expression (which might need to be
+protected from the shell by quotation). Several patterns can be added at once by using semi-colons
+to separate them, e.g. \f(CW\*(C`\-\-add\-to\-config "LISTENV=myitemize;myenumerate,COUNTERCMD=endnote"\*(C'\fR
+.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\-\-graphics\-markup=level\fR" 4
+.IX Item "--graphics-markup=level"
+.Vb 1
+\& Change highlight style for graphics embedded with C<\eincludegraphics> commands.
+.Ve
+.Sp
+Possible values for level:
+.Sp
+\&\f(CW\*(C`none\*(C'\fR, \f(CW\*(C`off\*(C'\fR or \f(CW0\fR: no highlighting for figures
+.Sp
+\&\f(CW\*(C`new\-only\*(C'\fR or \f(CW1\fR: surround newly added or changed figures with a blue frame [Default if graphicx package loaded]
+.Sp
+\&\f(CW\*(C`both\*(C'\fR or \f(CW2\fR: highlight new figures with a blue frame and show deleted figures at reduced
+scale, and crossed out with a red diagonal cross. Use configuration
+variable \s-1SCALEDELGRAPHICS\s0 to set size of deleted figures.
+.Sp
+Note that changes to the optional parameters will make the figure appear as changed
+to latexdiff, and this figure will thus be highlighted
+.IP "\fB\-\-disable\-citation\-markup\fR or \fB\-\-disable\-auto\-mbox\fR" 4
+.IX Item "--disable-citation-markup or --disable-auto-mbox"
+Suppress citation markup and markup of other vulnerable commands in styles
+using ulem (\s-1UNDERLINE,FONTSTRIKE, CULINECHBAR\s0)
+(the two options are identical and are simply aliases)
+.IP "\fB\-\-enable\-citation\-markup\fR or \fB\-\-enforce\-auto\-mbox\fR" 4
+.IX Item "--enable-citation-markup or --enforce-auto-mbox"
+Protect citation commands and other vulnerable commands in changed sections
+with \f(CW\*(C`\embox\*(C'\fR command, i.e. use default behaviour for ulem package for other packages
+(the two options are identical and are simply aliases)
+.SS "Miscellaneous"
+.IX Subsection "Miscellaneous"
+.IP "\fB\-\-verbose\fR or \fB\-V\fR" 4
+.IX Item "--verbose or -V"
+Output various status information to stderr during processing.
+Default is to work silently.
+.IP "\fB\-\-driver=type\fR" 4
+.IX Item "--driver=type"
+Choose driver for changebar package (only relevant for styles using
+ changebar: \s-1CCHANGEBAR CFONTCHBAR CULINECHBAR CHANGEBAR\s0). Possible
+drivers are listed in changebar manual, e.g. pdftex,dvips,dvitops
+ [Default: dvips]
+.IP "\fB\-\-ignore\-warnings\fR" 4
+.IX Item "--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 \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.
+.IP "\fB\-\-label=label\fR or \fB\-L label\fR" 4
+.IX Item "--label=label or -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 \f(CW\*(C`\-L labelold \-L labelnew\*(C'\fR.
+[Default: use the filename and modification dates for the label]
+.IP "\fB\-\-no\-label\fR" 4
+.IX Item "--no-label"
+Suppress inclusion of old and new file names as comment in output file
+.IP "\fB\-\-visible\-label\fR" 4
+.IX Item "--visible-label"
+Include old and new filenames (or labels set with \f(CW\*(C`\-\-label\*(C'\fR option) as
+visible output.
+.IP "\fB\-\-flatten\fR" 4
+.IX Item "--flatten"
+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.
+.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
+.SS "Internal options"
+.IX Subsection "Internal options"
+These options are mostly for automated use by latexdiff-vc. They can be used directly, but the \s-1API\s0 should be considered less stable than for the other options.
+.IP "\fB\-\-no\-links\fR" 4
+.IX Item "--no-links"
+Suppress generation of hyperreferences, used for minimal diffs (option \-\-only\-changes of latexdiff-vc)
+.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.
+.ie n .IP """BOLD""" 10
+.el .IP "\f(CWBOLD\fR" 10
+.IX Item "BOLD"
+Added text is set in bold face, discarded is not shown.
+.ie n .IP """PDFCOMMENT""" 10
+.el .IP "\f(CWPDFCOMMENT\fR" 10
+.IX Item "PDFCOMMENT"
+The pdfcomment package is used to underline new text, and mark deletions with a \s-1PDF\s0 comment. Note that this markup might appear differently or not at all based on the pdf viewer used. The viewer with best support for pdf markup is probably acroread. This style is only recommended if the number of differences is small.
+.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).
+.ie n .IP """ZLABEL""" 10
+.el .IP "\f(CWZLABEL\fR" 10
+.IX Item "ZLABEL"
+can be used to highlight only changed pages, but requires post-processing. It is recommend to not call this option manually but use \f(CW\*(C`latexdiff\-vc\*(C'\fR with \f(CW\*(C`\-\-only\-changes\*(C'\fR option. Alternatively, use the script given within preamble of diff files made using this style.
+.ie n .IP """ONLYCHANGEDPAGE""" 10
+.el .IP "\f(CWONLYCHANGEDPAGE\fR" 10
+.IX Item "ONLYCHANGEDPAGE"
+also highlights changed pages, without the need for post-processing, but might not work reliably if
+there is floating material (figures, tables).
+.ie n .IP """LABEL""" 10
+.el .IP "\f(CWLABEL\fR" 10
+.IX Item "LABEL"
+is similar to \f(CW\*(C`ZLABEL\*(C'\fR, but does not need the zref package and works less reliably (deprecated).
+.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 """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 ]
+.ie n .IP """CUSTOMDIFCMD""" 10
+.el .IP "\f(CWCUSTOMDIFCMD\fR" 10
+.IX Item "CUSTOMDIFCMD"
+This option is for advanced users and allows definition of special versions of commands, which do not work as safe commands.
+.Sp
+Commands in \f(CW\*(C`CUSTOMDIFCMD\*(C'\fR that occur in added or deleted blocks will be given an \s-1ADD\s0 or \s-1DEL\s0 prefix.
+The prefixed versions of the command must be defined in the preamble, either by putting them
+in the preamble of at least the new file, or by creating a custom preamble file (Option \-\-preamble).
+For example the command \f(CW\*(C`\eblindtext\*(C'\fR (from package blindtext) does not interact well with underlining, so that
+for the standard markup type, it is not satisfactory to define it as a safe command. Instead, a customised versions
+without underlining can be defined in the preamble:
+.Sp
+\&\f(CW\*(C`\enewcommand{\eDELblindtext}{{\ecolor{red}\eblindtext}}\*(C'\fR
+.Sp
+\&\f(CW\*(C`\enewcommand{\eADDblindtext}{{\ecolor{blue}\eblindtext}}\*(C'\fR
+.Sp
+and then latexdiff should be invoked with the option \f(CW\*(C`\-c CUSTOMDIFCMD=blindtext\*(C'\fR.
+.Sp
+[ Default: none ]
+.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 """ITEMCMD""" 10
+.el .IP "\f(CWITEMCMD\fR" 10
+.IX Item "ITEMCMD"
+Commands representing new item line with list environments.
+.Sp
+[ Default: \e\f(CW\*(C`item\*(C'\fR ]
+.ie n .IP """LISTENV""" 10
+.el .IP "\f(CWLISTENV\fR" 10
+.IX Item "LISTENV"
+Environments whose name matches the regular expression in \f(CW\*(C`LISTENV\*(C'\fR are list environments.
+.Sp
+[ Default: \f(CW\*(C`(?:itemize|enumerate|description)\*(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 """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 """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 """SCALEDELGRAPHICS""" 10
+.el .IP "\f(CWSCALEDELGRAPHICS\fR" 10
+.IX Item "SCALEDELGRAPHICS"
+If \f(CW\*(C`\-\-graphics\-markup=both\*(C'\fR is chosen, \f(CW\*(C`SCALEDELGRAPHICS\*(C'\fR is the factor, by which deleted figures will be scaled (i.e. 0.5 implies they are shown at half linear size).
+.Sp
+[ Default: 0.5 ]
+.ie n .IP """VERBATIMENV""" 10
+.el .IP "\f(CWVERBATIMENV\fR" 10
+.IX Item "VERBATIMENV"
+RegEx describing environments like verbatim, whose contents should be taken verbatim. The content of these environments will not be processed in any way:
+deleted content is commented out, new content is not marked up
+.Sp
+[ Default: \f(CW\*(C`comment\*(C'\fR\ ]
+.ie n .IP """VERBATIMLINEENV""" 10
+.el .IP "\f(CWVERBATIMLINEENV\fR" 10
+.IX Item "VERBATIMLINEENV"
+RegEx describing environments like verbatim, whose contents should be taken verbatim. The content of environments described by \s-1VERBATIMLINEENV\s0 are compared in
+line mode, and changes are marked up using the listings package. The markup style is set based on the chosen mains markup type (Option \-t), or on an analysis
+of the preamble.
+Note that \*(L"listings.sty\*(R" must be installed. If this file is not found the fallback solution is to
+treat \s-1VERBATIMLINEENV\s0 environments treated exactly the same way as \s-1VERBATIMENV\s0 environments.
+.Sp
+[ Default: \f(CW\*(C`(?:verbatim[*]?|lstlisting\*(C'\fR\ ]
+.SH "COMMON PROBLEMS AND FAQ"
+.IX Header "COMMON PROBLEMS AND FAQ"
+.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, and the way citations are generated. In order to be able to mark up citations properly, they are enclosed with an \f(CW\*(C`\embox\*(C'\fR
+command. 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. The same occurs for some other packages (e.g., siunitx). If this is a problem, you have two possibilities.
+.Sp
+1. Use \f(CW\*(C`CFONT\*(C'\fR type markup (option \f(CW\*(C`\-t CFONT\*(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, and deleted text is shown with a different font. Other styles not using the \f(CW\*(C`ulem\*(C'\fR package will also work.
+.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 citations are shown without markup. (This was the default behaviour of latexdiff at versions 0.6 and older)
+.Sp
+For custom packages you can define the commands which need to be protected by \f(CW\*(C`\embox\*(C'\fR with \f(CW\*(C`\-\-append\-mboxsafecmd\*(C'\fR and \f(CW\*(C`\-\-excludemboxsafecmd\*(C'\fR options
+(submit your lists of command as feature request at github page to set the default behaviour of future versions, see section 6)
+.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.
+.IP "How can I just show the pages where changes had been made" 10
+.IX Item "How can I just show the pages where changes had been made"
+Use options \-\f(CW\*(C`\-s ZLABEL\*(C'\fR (some postprocessing required) or \f(CW\*(C`\-s ONLYCHANGEDPAGE\*(C'\fR. \f(CW\*(C`latexdiff\-vc \-\-ps|\-\-pdf\*(C'\fR with \f(CW\*(C`\-\-only\-changes\*(C'\fR option takes care of
+the post-processing for you (requires zref package to be installed).
+.SH "BUGS"
+.IX Header "BUGS"
+.IP "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." 10
+.IX Item "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 using the issue tracker of the github repository page \fIhttps://github.com/ftilmann/latexdiff.git\fR,
+or send them to \fItilmann \*(-- \s-1AT\s0 \*(-- gfz\-potsdam.de\fR. Include the version 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.3.0
+Copyright (C) 2004\-2018 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 sent in bug reports, feature suggestions, and other feedback.
diff --git a/support/latexdiff/latexrevise b/support/latexdiff/latexrevise
new file mode 100755
index 0000000000..956d13e506
--- /dev/null
+++ b/support/latexdiff/latexrevise
@@ -0,0 +1,538 @@
+#!/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)
+#
+# Repository: https://github.com/ftilmann/latexdiff
+# CTAN page: http://www.ctan.org/pkg/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 <http://www.gnu.org/licenses/>.
+#
+# 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=<<EOF ;
+This is LATEXREVISE 1.0.2
+ (c) 2005-2012 F J Tilmann
+EOF
+
+# Markup strings (make sure that this are set to the same value as in
+# latexdiff)
+# If at all possible, do not change these as parts of the program
+# depend on the actual name.
+# At the very least adapt subroutine postprocess to new tokens.
+
+# note: have to use three backslashes to mean one literal one (reason
+# unknown
+my $ADDMARKOPEN='\\\DIFaddbegin(?:FL)? '; # Token to mark begin of appended text
+my $ADDMARKCLOSE='\\\DIFaddend(?:FL)?(?: |\z)'; # Token to mark end of appended text (|\z only deals with the case of \DIFaddend right before \end{document}
+my $ADDOPEN='\\\DIFadd(?:FL)?{'; # To mark begin of added text passage
+my $ADDCLOSE='}'; # To mark end of added text passage
+my $ADDCOMMENT='DIF > '; # To mark added comment line
+my $DELMARKOPEN='\\\DIFdelbegin(?:FL)? '; # Token to mark begin of deleted text
+my $DELMARKCLOSE='\\\DIFdelend(?:FL)?(?: |\z)'; # Token to mark end of deleted text
+my $DELOPEN='\\\DIFdel(?:FL)?{'; # To mark begin of deleted text passage
+my $DELCLOSE='}'; # To mark end of deleted text passage
+my $ALTEXT='FL'; # string which might be appended to above commands
+my $DELCMDOPEN='%DIFDELCMD < '; # To mark begin of deleted commands (must begin with %, i.e., be a comment
+my $DELCMDCLOSE="%%%\n"; # To mark end of deleted commands (must end with a new line)
+my $AUXCMD='%DIFAUXCMD' ; # follows auxiliary commands put in by latexdiff to make difference file legal
+my $DELCOMMENT='DIF < '; # To mark deleted comment line
+
+my $PREAMBLEXTBEG='^%DIF PREAMBLE EXTENSION ADDED BY LATEXDIFF$';
+my $PREAMBLEXTEND='^%DIF END PREAMBLE EXTENSION ADDED BY LATEXDIFF$';
+
+
+my $pat0 = '(?:[^{}]|\\\{|\\\})*';
+my $pat1 = '(?:[^{}]|\\\{|\\\}|\{'.$pat0.'\})*';
+my $pat2 = '(?:[^{}]|\\\{|\\\}|\{'.$pat1.'\})*';
+my $pat3 = '(?:[^{}]|\\\{|\\\}|\{'.$pat2.'\})*';
+my $pat4 = '(?:[^{}]|\\\{|\\\}|\{'.$pat3.'\})*';
+my $brat0 = '(?:[^\[\]]|\\\[|\\\])*';
+
+
+my ($input,$preamble,$body,$post);
+my (@matches);
+my ($cnt,$prematch,$postmatch);
+my ($help,$version);
+my ($verbose,$quiet,$accept,$decline,$simplify)=(0,0,0,0,0);
+my ($comment,$comenv,$markup,$markenv);
+
+# A word unlikely ever to be used in a real latex file
+my $someword='gobbledegooksygook';
+
+Getopt::Long::Configure('bundling');
+GetOptions('accept|a' => \$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 <<EOF ;
+There is a problem with nesting of $ADDMARKOPEN, $ADDMARKCLOSE,
+$DELMARKOPEN, and $DELMARKCLOSE tokens that prevents me from
+processing the file. Exiting ...
+EOF
+ }
+ }
+}
+
+# ($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.
+#
+# same subroutine as in latexdiff
+sub splitdoc {
+ my ($text,$word1,$word2)=@_;
+ my $l1 = length $word1 ;
+ my $l2 = length $word2 ;
+
+ my $i = index($text,$word1);
+ my $j = index($text,$word2);
+
+ my ($part1,$part2,$part3)=("","","");
+
+ if ( $i<0 && $j<0) {
+ # no $word1 or $word2
+ print STDERR "Old Document not a complete latex file. Assuming it is a tex file with no preamble.\n";
+ $part2 = $text;
+ } elsif ( $i>=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<latexrevise> [ B<OPTIONS> ] [ F<diff.tex> ] > F<revised.tex>
+
+=head1 DESCRIPTION
+
+I<latexrevise> reads a file C<diff.tex> (output of I<latexdiff>), and remove the markup commands.
+If no filename is given the input is read from standard input. The command can be used
+in I<ACCEPT>, I<DECLINE>, or I<SIMPLIFY> 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<ACCEPT> mode, all appended text fragments (or preamble lines)
+are kept, and all discarded text fragments (or preamble lines) are
+deleted.
+In I<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 I<latexrevise> 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<SIMPLIFY> mode, C<\DIFaddbegin, \DIFaddend, \DIFdelbegin, \DIFdelend>
+tokens and their corresponding C<FL> varieties are kept but all other markup (e.g. C<DIFadd> 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<ACCEPT> or I<DECLINE> mode.
+In I<SIMPLIFY> mode the preamble is left unmodified.
+
+=head1 OPTIONS
+
+=over 4
+
+=item B<-a> or B<--accept>
+
+Run in I<ACCEPT> mode (delete all blocks marked by C<\DIFdelbegin> and C<\DIFdelend>).
+
+=item B<-d> or B<--decline>
+
+Run in I<DECLINE> mode (delete all blocks marked by C<\DIFaddbegin>
+and C<\DIFaddend>).
+
+=item B<-s> or B<--simplify>
+
+Run in I<SIMPLIFY> 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<latexrevise> 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<cmd> 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<abc>.
+
+=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 using the issue tracker of the github repository page I<https://github.com/ftilmann/latexdiff.git>,
+or send them to I<tilmann -- AT -- gfz-potsdam.de>.. Include the serial number of I<latexrevise>
+(Option --version). If you come across latexdiff
+output which is not processed correctly by I<latexrevise> 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<latexrevise> gets confused by commented C<\begin{document}> or
+C<\end{document}> statements
+
+=head1 SEE ALSO
+
+L<latexdiff>
+
+=head1 PORTABILITY
+
+I<latexrevise> 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
diff --git a/support/latexdiff/latexrevise.1 b/support/latexdiff/latexrevise.1
new file mode 100644
index 0000000000..49c8c35471
--- /dev/null
+++ b/support/latexdiff/latexrevise.1
@@ -0,0 +1,243 @@
+.\" Automatically generated by Pod::Man 2.28 (Pod::Simple 3.29)
+.\"
+.\" 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" ''
+. ds C`
+. ds C'
+'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.
+.\"
+.\" Avoid warning from groff about undefined register 'F'.
+.de IX
+..
+.nr rF 0
+.if \n(.g .if rF .nr rF 1
+.if (\n(rF:(\n(.g==0)) \{
+. if \nF \{
+. de IX
+. tm Index:\\$1\t\\n%\t"\\$2"
+..
+. if !\nF==2 \{
+. nr % 0
+. nr F 2
+. \}
+. \}
+.\}
+.rr rF
+.\"
+.\" 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 "2015-12-27" "perl v5.22.1" " "
+.\" 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 using the issue tracker of the github repository page \fIhttps://github.com/ftilmann/latexdiff.git\fR,
+or send them to \fItilmann \*(-- \s-1AT\s0 \*(-- gfz\-potsdam.de\fR.. Include the serial number of \fIlatexrevise\fR
+(Option \-\-version). 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