diff -Nru wikidiff2-1.11.0/debian/changelog wikidiff2-1.13.0/debian/changelog --- wikidiff2-1.11.0/debian/changelog 2021-05-22 03:27:51.000000000 +0000 +++ wikidiff2-1.13.0/debian/changelog 2021-10-27 00:21:42.000000000 +0000 @@ -1,8 +1,26 @@ -wikidiff2 (1.11.0-1build1) impish; urgency=medium +wikidiff2 (1.13.0-1build1) jammy; urgency=medium - * No change rebuild for PHP 8.0 + * No change rebuild for PHP 8.1 - -- Bryce Harrington Sat, 22 May 2021 03:27:51 +0000 + -- Bryce Harrington Wed, 27 Oct 2021 00:21:42 +0000 + +wikidiff2 (1.13.0-1) unstable; urgency=medium + + [ Kunal Mehta ] + * New upstream version 1.13.0 + + [ Debian Janitor ] + * Remove constraints unnecessary since buster: + + Remove 2 maintscript entries from 1 files. + + -- Kunal Mehta Wed, 20 Oct 2021 13:41:04 -0700 + +wikidiff2 (1.12.0-1) unstable; urgency=medium + + * New upstream version 1.12.0 + * Add Restrictions: allow-stderr to autopkgtest + + -- Kunal Mehta Mon, 30 Aug 2021 23:23:40 -0700 wikidiff2 (1.11.0-1) unstable; urgency=medium diff -Nru wikidiff2-1.11.0/debian/control wikidiff2-1.13.0/debian/control --- wikidiff2-1.11.0/debian/control 2020-12-09 01:38:27.000000000 +0000 +++ wikidiff2-1.13.0/debian/control 2021-10-27 00:21:17.000000000 +0000 @@ -1,7 +1,8 @@ Source: wikidiff2 Section: php Priority: optional -Maintainer: MediaWiki packaging team +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: MediaWiki packaging team Uploaders: Romain Beauxis , Kunal Mehta Build-Depends: debhelper-compat (= 13), dh-php, php-dev, libthai-dev, pkg-config, php-cli Homepage: https://www.mediawiki.org/wiki/Extension:Wikidiff2 diff -Nru wikidiff2-1.11.0/debian/php-wikidiff2.maintscript wikidiff2-1.13.0/debian/php-wikidiff2.maintscript --- wikidiff2-1.11.0/debian/php-wikidiff2.maintscript 2019-10-11 19:34:56.000000000 +0000 +++ wikidiff2-1.13.0/debian/php-wikidiff2.maintscript 2021-10-08 08:10:30.000000000 +0000 @@ -1,3 +1 @@ -rm_conffile /etc/mediawiki-extensions/extensions-enabled/wikidiff2.php 1.4.1-1 -rm_conffile /etc/mediawiki-extensions/extensions-available/wikidiff2.php 1.4.1-1 diff -Nru wikidiff2-1.11.0/debian/tests/control wikidiff2-1.13.0/debian/tests/control --- wikidiff2-1.11.0/debian/tests/control 2019-10-11 19:34:56.000000000 +0000 +++ wikidiff2-1.13.0/debian/tests/control 2021-08-30 06:50:32.000000000 +0000 @@ -1,2 +1,3 @@ Tests: unittests Depends: @, php-cli, php-dev +Restrictions: allow-stderr diff -Nru wikidiff2-1.11.0/TableDiff.cpp wikidiff2-1.13.0/TableDiff.cpp --- wikidiff2-1.11.0/TableDiff.cpp 2020-12-08 20:12:38.000000000 +0000 +++ wikidiff2-1.13.0/TableDiff.cpp 2021-09-28 10:22:55.000000000 +0000 @@ -6,9 +6,9 @@ int offsetTo) { result += "\n" - "  \n" - " +\n" - " "; + " \n" + " \n" + " "; printTextWithDiv(line); result += "\n\n"; } @@ -17,11 +17,11 @@ int offsetTo) { result += "\n" - " −\n" - " "; + " \n" + " "; printTextWithDiv(line); result += "\n" - "  \n" + " \n" "\n"; } @@ -41,37 +41,39 @@ // print left side or blank placeholder. if (printLeft) { - result += " "; if(dstAnchor != "") - result += "⚫"; + result += " " + "⚫" + "\n"; else - result += "−"; - result += "\n"; - result += "
"; + result += " \n"; + + result += "
"; if(srcAnchor != "") result += ""; printWordDiffSide(worddiff, false); result += "
\n"; } else { - result += "  \n"; + result += " \n"; } // print right side or blank placeholder. if (printRight) { - result += " "; if(dstAnchor != "") - result += "⚫"; + result += " " + "⚫" + "\n"; else - result += "+"; - result += "\n"; - result += "
"; + result += " \n"; + + result += "
"; if(srcAnchor != "") result += ""; printWordDiffSide(worddiff, true); result += "
\n" "\n"; } else { - result += "  \n" + result += " \n" "\n"; } } @@ -122,6 +124,9 @@ result.append("
"); printHtmlEncodedText(input); result.append("
"); + } else { + // Else add a
to preserve line breaks when copying + result += "
"; } } @@ -142,13 +147,13 @@ { result += "\n" - "  \n" - " "; + " \n" + " "; printTextWithDiv(input); result += "\n" - "  \n" - " "; + " \n" + " "; printTextWithDiv(input); result += "\n\n"; } diff -Nru wikidiff2-1.11.0/tests/001.phpt wikidiff2-1.13.0/tests/001.phpt --- wikidiff2-1.11.0/tests/001.phpt 2020-12-08 20:12:38.000000000 +0000 +++ wikidiff2-1.13.0/tests/001.phpt 2021-09-28 10:22:55.000000000 +0000 @@ -123,274 +123,274 @@ -   -
== Added line ==
-   -
== Added line ==
+ +
== Added line ==
+ +
== Added line ==
-   - -   - + +
+ +
-   - + -
sjgfkdjfgb
+ + +
sjgfkdjfgb
-   -
== Removed line ==
-   -
== Removed line ==
+ +
== Removed line ==
+ +
== Removed line ==
-   - -   - + +
+ +
- − -
kjahegwnygw
-   + +
kjahegwnygw
+ -   -
== Moved text ==
-   -
== Moved text ==
+ +
== Moved text ==
+ +
== Moved text ==
-   -
a
-   -
a
+ +
a
+ +
a
⚫ -
---line---
-   +
---line---
+ -   -
a
-   -
a
+ +
a
+ +
a
-   -
a
-   -
a
+ +
a
+ +
a
-   -
a
-   -
a
+ +
a
+ +
a
-   -
a
-   -
a
+ +
a
+ +
a
-   + ⚫ -
---line---
+
---line---
-   -
a
-   -
a
+ +
a
+ +
a
-   -
a
-   -
a
+ +
a
+ +
a
-   -
a
-   -
a
+ +
a
+ +
a
-   -
a
-   -
a
+ +
a
+ +
a
⚫ -
--line1--
-   +
--line1--
+ ⚫ -
--line2--
-   +
--line2--
+ -   -
a
-   -
a
+ +
a
+ +
a
-   -
a
-   -
a
+ +
a
+ +
a
-   -
a
-   -
a
+ +
a
+ +
a
-   -
a
-   -
a
+ +
a
+ +
a
-   + ⚫ -
--line1--
+
--line1--
-   + ⚫ -
--line2--
+
--line2--
-   -
a
-   -
a
+ +
a
+ +
a
-   -
a
-   -
a
+ +
a
+ +
a
-   -
a
-   -
a
+ +
a
+ +
a
-   -
== Shortest sequence in Y ==
-   -
== Shortest sequence in Y ==
+ +
== Shortest sequence in Y ==
+ +
== Shortest sequence in Y ==
- − -
x1
-   + +
x1
+ -   -
x2
-   -
x2
+ +
x2
+ +
x2
-   -
x1
-   -
x1
+ +
x1
+ +
x1
-   -
x2
-   -
x2
+ +
x2
+ +
x2
-   -
x1
-   -
x1
+ +
x1
+ +
x1
- − -
x2
-   + +
x2
+ - − -
x1
-   + +
x1
+ - − -
x2
-   + +
x2
+ -   -
context
-   -
context
+ +
context
+ +
context
-   -
context
-   -
context
+ +
context
+ +
context
-   -
context
-   -
context
+ +
context
+ +
context
-   -
== Changed line ==
-   -
== Changed line ==
+ +
== Changed line ==
+ +
== Changed line ==
- − -
blah blah blah 1
- + -
blah blah blah 2
+ +
blah blah blah 1
+ +
blah blah blah 2
-   - -   - + +
+ +
diff -Nru wikidiff2-1.11.0/tests/002.phpt wikidiff2-1.13.0/tests/002.phpt --- wikidiff2-1.11.0/tests/002.phpt 2020-12-08 20:12:38.000000000 +0000 +++ wikidiff2-1.13.0/tests/002.phpt 2021-09-28 10:22:55.000000000 +0000 @@ -49,64 +49,64 @@ -   -
== Shortest sequence in X ==
-   -
== Shortest sequence in X ==
+ +
== Shortest sequence in X ==
+ +
== Shortest sequence in X ==
-   - + -
x1
+ + +
x1
-   -
x2
-   -
x2
+ +
x2
+ +
x2
-   -
x1
-   -
x1
+ +
x1
+ +
x1
-   -
x2
-   -
x2
+ +
x2
+ +
x2
-   -
x1
-   -
x1
+ +
x1
+ +
x1
-   - + -
x2
+ + +
x2
-   - + -
x1
+ + +
x1
-   - + -
x2
+ + +
x2
-   -
context
-   -
context
+ +
context
+ +
context
-   -
context
-   -
context
+ +
context
+ +
context
diff -Nru wikidiff2-1.11.0/tests/003.phpt wikidiff2-1.13.0/tests/003.phpt --- wikidiff2-1.11.0/tests/003.phpt 2020-12-08 20:12:38.000000000 +0000 +++ wikidiff2-1.13.0/tests/003.phpt 2021-09-28 10:22:55.000000000 +0000 @@ -25,8 +25,8 @@ - − -
!!FUZZY!!Rajaa
- + -
Rajaa
+ +
!!FUZZY!!Rajaa
+ +
Rajaa
diff -Nru wikidiff2-1.11.0/tests/005.phpt wikidiff2-1.13.0/tests/005.phpt --- wikidiff2-1.11.0/tests/005.phpt 2020-12-08 20:12:38.000000000 +0000 +++ wikidiff2-1.13.0/tests/005.phpt 2021-09-28 10:22:55.000000000 +0000 @@ -16,8 +16,8 @@ - − -
test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test
- + -
test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test bloody test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test
+ +
test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test
+ +
test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test bloody test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test
diff -Nru wikidiff2-1.11.0/tests/007.phpt wikidiff2-1.13.0/tests/007.phpt --- wikidiff2-1.11.0/tests/007.phpt 2020-12-08 20:12:38.000000000 +0000 +++ wikidiff2-1.13.0/tests/007.phpt 2021-09-28 10:22:55.000000000 +0000 @@ -42,71 +42,71 @@ ⚫ -
Substance, in the truest and primary and most definite sense of the word, is that which is neither predicable of a subject nor present in a subject; for instance, the individual man or horse. But in a secondary sense those things are called substances within which, as species, the primary substances are included; also those which, as genera, include the species. For instance, the individual man is included in the species 'man', and the genus to which the species belongs is 'animal'; these, therefore—that is to say, the species 'man' and the genus 'animal,-are termed secondary substances.
-   +
Substance, in the truest and primary and most definite sense of the word, is that which is neither predicable of a subject nor present in a subject; for instance, the individual man or horse. But in a secondary sense those things are called substances within which, as species, the primary substances are included; also those which, as genera, include the species. For instance, the individual man is included in the species 'man', and the genus to which the species belongs is 'animal'; these, therefore—that is to say, the species 'man' and the genus 'animal,-are termed secondary substances.
+ - − - -   + +
+ -   -
It is plain from what has been said that both the name and the definition of the predicate must be predicable of the subject. For instance, 'man' is predicated of the individual man. Now in this case the name of the species 'man' is applied to the individual, for we use the term 'man' in describing the individual; and the definition of 'man' will also be predicated of the individual man, for the individual man is both man and animal. Thus, both the name and the definition of the species are predicable of the individual.
-   -
It is plain from what has been said that both the name and the definition of the predicate must be predicable of the subject. For instance, 'man' is predicated of the individual man. Now in this case the name of the species 'man' is applied to the individual, for we use the term 'man' in describing the individual; and the definition of 'man' will also be predicated of the individual man, for the individual man is both man and animal. Thus, both the name and the definition of the species are predicable of the individual.
+ +
It is plain from what has been said that both the name and the definition of the predicate must be predicable of the subject. For instance, 'man' is predicated of the individual man. Now in this case the name of the species 'man' is applied to the individual, for we use the term 'man' in describing the individual; and the definition of 'man' will also be predicated of the individual man, for the individual man is both man and animal. Thus, both the name and the definition of the species are predicable of the individual.
+ +
It is plain from what has been said that both the name and the definition of the predicate must be predicable of the subject. For instance, 'man' is predicated of the individual man. Now in this case the name of the species 'man' is applied to the individual, for we use the term 'man' in describing the individual; and the definition of 'man' will also be predicated of the individual man, for the individual man is both man and animal. Thus, both the name and the definition of the species are predicable of the individual.
-   - + - + + +
-   + ⚫ -
Everything except primary substances is either predicable of a primary substance or present in a primary substance. This becomes evident by reference to particular instances which occur. 'Animal' is predicated of the species 'man', therefore of the individual man, for if there were no individual man of whom it could be predicated, it could not be predicated of the species 'man' at all. Again, colour is present in body, therefore in individual bodies, for if there were no individual body in which it was present, it could not be present in body at all. Thus everything except primary substances is either predicated of primary substances, or is present in them, and if these last did not exist, it would be impossible for anything else to exist. Never underestimate lawns.
+
Everything except primary substances is either predicable of a primary substance or present in a primary substance. This becomes evident by reference to particular instances which occur. 'Animal' is predicated of the species 'man', therefore of the individual man, for if there were no individual man of whom it could be predicated, it could not be predicated of the species 'man' at all. Again, colour is present in body, therefore in individual bodies, for if there were no individual body in which it was present, it could not be present in body at all. Thus everything except primary substances is either predicated of primary substances, or is present in them, and if these last did not exist, it would be impossible for anything else to exist. Never underestimate lawns.
-   - -   - + +
+ +
-   -
With regard, on the other hand, to those things which are present in a subject, it is generally the case that neither their name nor their definition is predicable of that in which they are present. Though, however, the definition is never predicable, there is nothing in certain cases to prevent the name being used. For instance, 'white' being present in a body is predicated of that in which it is present, for a body is called white: the definition, however, of the colour 'white' is never predicable of the body.
-   -
With regard, on the other hand, to those things which are present in a subject, it is generally the case that neither their name nor their definition is predicable of that in which they are present. Though, however, the definition is never predicable, there is nothing in certain cases to prevent the name being used. For instance, 'white' being present in a body is predicated of that in which it is present, for a body is called white: the definition, however, of the colour 'white' is never predicable of the body.
+ +
With regard, on the other hand, to those things which are present in a subject, it is generally the case that neither their name nor their definition is predicable of that in which they are present. Though, however, the definition is never predicable, there is nothing in certain cases to prevent the name being used. For instance, 'white' being present in a body is predicated of that in which it is present, for a body is called white: the definition, however, of the colour 'white' is never predicable of the body.
+ +
With regard, on the other hand, to those things which are present in a subject, it is generally the case that neither their name nor their definition is predicable of that in which they are present. Though, however, the definition is never predicable, there is nothing in certain cases to prevent the name being used. For instance, 'white' being present in a body is predicated of that in which it is present, for a body is called white: the definition, however, of the colour 'white' is never predicable of the body.
- − - -   + +
+ ⚫ -
Everything except primary substances is either predicable of a primary substance or present in a primary substance. This becomes evident by reference to particular instances which occur. 'Animal' is predicated of the species 'man', therefore of the individual man, for if there were no individual man of whom it could be predicated, it could not be predicated of the species 'man' at all. Again, colour is present in body, therefore in individual bodies, for if there were no individual body in which it was present, it could not be present in body at all. Thus everything except primary substances is either predicated of primary substances, or is present in them, and if these last did not exist, it would be impossible for anything else to exist.
-   +
Everything except primary substances is either predicable of a primary substance or present in a primary substance. This becomes evident by reference to particular instances which occur. 'Animal' is predicated of the species 'man', therefore of the individual man, for if there were no individual man of whom it could be predicated, it could not be predicated of the species 'man' at all. Again, colour is present in body, therefore in individual bodies, for if there were no individual body in which it was present, it could not be present in body at all. Thus everything except primary substances is either predicated of primary substances, or is present in them, and if these last did not exist, it would be impossible for anything else to exist.
+ -   - -   - + +
+ +
-   -
Lawns are very important. Never underestimate lawns. Never underestimate the power of hot rollers for your hair and eyelash curlers for your eyelashes. You can never underestimate the stupidity of the general public.
-   -
Lawns are very important. Never underestimate lawns. Never underestimate the power of hot rollers for your hair and eyelash curlers for your eyelashes. You can never underestimate the stupidity of the general public.
+ +
Lawns are very important. Never underestimate lawns. Never underestimate the power of hot rollers for your hair and eyelash curlers for your eyelashes. You can never underestimate the stupidity of the general public.
+ +
Lawns are very important. Never underestimate lawns. Never underestimate the power of hot rollers for your hair and eyelash curlers for your eyelashes. You can never underestimate the stupidity of the general public.
-   - + - + + +
-   + ⚫ -
Substance, in the truest and most definite sense of the word, is that which is neither predicable of a subject nor present in a subject; for instance, the individual man or horse. But in a secondary sense those things are called substances within which, as species, the primary substances are included; also those which, as genera, include the species. For instance, the individual man is included in the species 'man', and the genus to which the species belongs is 'animal'; these, therefore—that is to say, the species 'man' and the genus 'animal,-are termed secondary substances.
+
Substance, in the truest and most definite sense of the word, is that which is neither predicable of a subject nor present in a subject; for instance, the individual man or horse. But in a secondary sense those things are called substances within which, as species, the primary substances are included; also those which, as genera, include the species. For instance, the individual man is included in the species 'man', and the genus to which the species belongs is 'animal'; these, therefore—that is to say, the species 'man' and the genus 'animal,-are termed secondary substances.
diff -Nru wikidiff2-1.11.0/tests/008.phpt wikidiff2-1.13.0/tests/008.phpt --- wikidiff2-1.11.0/tests/008.phpt 2020-12-08 20:12:38.000000000 +0000 +++ wikidiff2-1.13.0/tests/008.phpt 2021-09-28 10:22:55.000000000 +0000 @@ -29,20 +29,20 @@ - − -
AAAAA AAAAA AAAAA AAAAA AAAAA AAAAA AAAAA AAAAA AAAAA AAAAA
- + -
AAAAA AAAAA BBBBB BBBBB BBBBB BBBBB BBBBB BBBBB BBBBB BBBBB
+ +
AAAAA AAAAA AAAAA AAAAA AAAAA AAAAA AAAAA AAAAA AAAAA AAAAA
+ +
AAAAA AAAAA BBBBB BBBBB BBBBB BBBBB BBBBB BBBBB BBBBB BBBBB
-   - -   - + +
+ +
- − -
AAAAA AAAAA AAAAA AAAAA AAAAA AAAAA AAAAA AAAAA AAAAA AAAAA
- + -
AAAAA BBBBB BBBBB BBBBB BBBBB BBBBB BBBBB BBBBB BBBBB BBBBB
+ +
AAAAA AAAAA AAAAA AAAAA AAAAA AAAAA AAAAA AAAAA AAAAA AAAAA
+ +
AAAAA BBBBB BBBBB BBBBB BBBBB BBBBB BBBBB BBBBB BBBBB BBBBB
diff -Nru wikidiff2-1.11.0/tests/009.phpt wikidiff2-1.13.0/tests/009.phpt --- wikidiff2-1.11.0/tests/009.phpt 2020-12-08 20:12:38.000000000 +0000 +++ wikidiff2-1.13.0/tests/009.phpt 2021-09-28 10:22:55.000000000 +0000 @@ -34,55 +34,55 @@ -   -
== Priser & Utmärkelser ==
-   -
== Priser & Utmärkelser ==
+ +
== Priser & Utmärkelser ==
+ +
== Priser & Utmärkelser ==
- − -
3: 1
- + -
*3: 1
+ +
3: 1
+ +
*3: 1
-   + ⚫ -
*4: 1
+
*4: 1
- − - -   + +
+ - − -
4: 1
- + -
*5: 1
+ +
4: 1
+ +
*5: 1
-   + ⚫ -
*6: 1
+
*6: 1
- − - -   + +
+ ⚫ -
5: 1
-   +
5: 1
+ - − - -   + +
+ ⚫ -
6: 1
-   +
6: 1
+ diff -Nru wikidiff2-1.11.0/tests/010.phpt wikidiff2-1.13.0/tests/010.phpt --- wikidiff2-1.11.0/tests/010.phpt 2020-12-08 20:12:38.000000000 +0000 +++ wikidiff2-1.13.0/tests/010.phpt 2021-09-28 10:22:55.000000000 +0000 @@ -40,89 +40,89 @@ - − -
<includeonly>{{#switch:{{{статус|}}}
- + -
{{#switch: {{{статус|}}}
+ +
<includeonly>{{#switch:{{{статус|}}}
+ +
{{#switch: {{{статус|}}}
-   - + -
| администратора = {{#invoke: Votes | count
+ + +
| администратора = {{#invoke: Votes | count
⚫ -
|администратора={{#invoke:Votes|count|page={{#if:{{{1|}}}|Википедия:Заявки на статус администратора/{{{1}}}}}{{#if: {{{номер|}}}|_{{{номер}}}}}|template=Шаблон:Результат выборов администратора}}
-   +
|администратора={{#invoke:Votes|count|page={{#if:{{{1|}}}|Википедия:Заявки на статус администратора/{{{1}}}}}{{#if: {{{номер|}}}|_{{{номер}}}}}|template=Шаблон:Результат выборов администратора}}
+ - − -
|бюрократа={{#invoke:Votes|count|page={{#if:{{{1|}}}|Википедия:Заявки на статус бюрократа/{{{1}}}}}{{#if: {{{номер|}}}|_{{{номер}}}}}|template=Шаблон:Результат выборов бюрократа}}
- + -
| page = {{#if: {{{1|}}} | Википедия:Заявки на статус администратора/{{{1}}}{{#if: {{{номер|}}} | _{{{номер}}} }} }}
+ +
|бюрократа={{#invoke:Votes|count|page={{#if:{{{1|}}}|Википедия:Заявки на статус бюрократа/{{{1}}}}}{{#if: {{{номер|}}}|_{{{номер}}}}}|template=Шаблон:Результат выборов бюрократа}}
+ +
| page = {{#if: {{{1|}}} | Википедия:Заявки на статус администратора/{{{1}}}{{#if: {{{номер|}}} | _{{{номер}}} }} }}
-   - + -
| template = Шаблон:Результат выборов администратора
+ + +
| template = Шаблон:Результат выборов администратора
- − -
|{{#invoke:Votes|count|page={{{на странице|}}}|template={{{шаблон|}}}}}
-   + +
|{{#invoke:Votes|count|page={{{на странице|}}}|template={{{шаблон|}}}}}
+ -   - + -
}}
+ + +
}}
⚫ -
}}</includeonly><noinclude>{{doc}}</noinclude>
-   +
}}</includeonly><noinclude>{{doc}}</noinclude>
+ -   - + -
| бюрократа = {{#invoke: Votes | count
+ + +
| бюрократа = {{#invoke: Votes | count
-   + ⚫ -
| page = {{#if: {{{1|}}} | Википедия:Заявки на статус бюрократа/{{{1}}}{{#if: {{{номер|}}} | _{{{номер}}} }} }}
+
| page = {{#if: {{{1|}}} | Википедия:Заявки на статус бюрократа/{{{1}}}{{#if: {{{номер|}}} | _{{{номер}}} }} }}
-   - + -
| template = Шаблон:Результат выборов бюрократа
+ + +
| template = Шаблон:Результат выборов бюрократа
-   - + -
}}
+ + +
}}
-   - + -
| {{#invoke: Votes | count
+ + +
| {{#invoke: Votes | count
-   - + -
| page = {{{на странице|}}}
+ + +
| page = {{{на странице|}}}
-   - + -
| template = {{{шаблон|}}}
+ + +
| template = {{{шаблон|}}}
-   - + -
}}
+ + +
}}
-   + ⚫ -
}}<noinclude>{{doc}}</noinclude>
+
}}<noinclude>{{doc}}</noinclude>
diff -Nru wikidiff2-1.11.0/tests/011.phpt wikidiff2-1.13.0/tests/011.phpt --- wikidiff2-1.11.0/tests/011.phpt 2020-12-08 20:12:38.000000000 +0000 +++ wikidiff2-1.13.0/tests/011.phpt 2021-09-28 10:22:55.000000000 +0000 @@ -45,106 +45,106 @@ -   - + -
==Non-participating athletes==
+ + +
==Non-participating athletes==
- − -
==Squads==
-   + +
==Squads==
+ -   - + -
{{columns-list|2|
+ + +
{{columns-list|2|
- − -
Athletes who did not participate in any matches
-   + +
Athletes who did not participate in any matches
+ -   + ⚫ -
*{{flagIOC2athlete|[[Sarah Al-Zayani]]|BRN|2006 Asian Games}}
+
*{{flagIOC2athlete|[[Sarah Al-Zayani]]|BRN|2006 Asian Games}}
- − -
{{col-begin}}
-   + +
{{col-begin}}
+ -   + ⚫ -
*{{flagIOC2athlete|[[Peng Shuai]]|CHN|2006 Asian Games}}
+
*{{flagIOC2athlete|[[Peng Shuai]]|CHN|2006 Asian Games}}
- − -
{{Col-1-of-3}}
-   + +
{{Col-1-of-3}}
+ - − -
* {{flagIOC2athlete|[[Sarah Al-Zayani]]|BRN|2006 Asian Games}}
- + -
*{{flagIOC2athlete|[[Yan Zi]]|CHN|2006 Asian Games}}
+ +
* {{flagIOC2athlete|[[Sarah Al-Zayani]]|BRN|2006 Asian Games}}
+ +
*{{flagIOC2athlete|[[Yan Zi]]|CHN|2006 Asian Games}}
- − -
* {{flagIOC2athlete|[[Peng Shuai]]|CHN|2006 Asian Games}}
- + -
*{{flagIOC2athlete|[[Angelique Widjaja]]|INA|2006 Asian Games}}
+ +
* {{flagIOC2athlete|[[Peng Shuai]]|CHN|2006 Asian Games}}
+ +
*{{flagIOC2athlete|[[Angelique Widjaja]]|INA|2006 Asian Games}}
- − -
* {{flagIOC2athlete|[[Yan Zi]]|CHN|2006 Asian Games}}
- + -
*{{flagIOC2athlete|[[Asrar Abdulmajid]]|KUW|2006 Asian Games}}
+ +
* {{flagIOC2athlete|[[Yan Zi]]|CHN|2006 Asian Games}}
+ +
*{{flagIOC2athlete|[[Asrar Abdulmajid]]|KUW|2006 Asian Games}}
-   + ⚫ -
*{{flagIOC2athlete|[[Sarah Behbehani]]|KUW|2006 Asian Games}}
+
*{{flagIOC2athlete|[[Sarah Behbehani]]|KUW|2006 Asian Games}}
- − -
{{Col-1-of-3}}
-   + +
{{Col-1-of-3}}
+ - − -
* {{flagIOC2athlete|[[Angelique Widjaja]]|INA|2006 Asian Games}}
- + -
*{{flagIOC2athlete|[[Chan Chin-wei]]|TPE|2006 Asian Games}}
+ +
* {{flagIOC2athlete|[[Angelique Widjaja]]|INA|2006 Asian Games}}
+ +
*{{flagIOC2athlete|[[Chan Chin-wei]]|TPE|2006 Asian Games}}
-   - + -
}}
+ + +
}}
⚫ -
* {{flagIOC2athlete|[[Asrar Abdulmajid]]|KUW|2006 Asian Games}}
-   +
* {{flagIOC2athlete|[[Asrar Abdulmajid]]|KUW|2006 Asian Games}}
+ ⚫ -
* {{flagIOC2athlete|[[Sarah Behbehani]]|KUW|2006 Asian Games}}
-   +
* {{flagIOC2athlete|[[Sarah Behbehani]]|KUW|2006 Asian Games}}
+ - − -
{{Col-1-of-3}}
-   + +
{{Col-1-of-3}}
+ ⚫ -
* {{flagIOC2athlete|[[Chan Chin-wei]]|TPE|2006 Asian Games}}
-   +
* {{flagIOC2athlete|[[Chan Chin-wei]]|TPE|2006 Asian Games}}
+ - − -
{{col-end}}
-   + +
{{col-end}}
+ diff -Nru wikidiff2-1.11.0/tests/012.phpt wikidiff2-1.13.0/tests/012.phpt --- wikidiff2-1.11.0/tests/012.phpt 2020-12-08 20:12:38.000000000 +0000 +++ wikidiff2-1.13.0/tests/012.phpt 2021-09-28 10:22:55.000000000 +0000 @@ -31,32 +31,32 @@ -   -
* [[Startpage]]
-   -
* [[Startpage]]
+ +
* [[Startpage]]
+ +
* [[Startpage]]
-   -
* [[MetaGer]]
-   -
* [[MetaGer]]
+ +
* [[MetaGer]]
+ +
* [[MetaGer]]
- − -
* [https://search.disconnect.me Disconnect] (externe Seite)
- + -
* [[Disconnect]]
+ +
* [https://search.disconnect.me Disconnect] (externe Seite)
+ +
* [[Disconnect]]
-   - -   - + +
+ +
-   -
== Weblinks ==
-   -
== Weblinks ==
+ +
== Weblinks ==
+ +
== Weblinks ==
diff -Nru wikidiff2-1.11.0/tests/013.phpt wikidiff2-1.13.0/tests/013.phpt --- wikidiff2-1.11.0/tests/013.phpt 2020-12-08 20:12:38.000000000 +0000 +++ wikidiff2-1.13.0/tests/013.phpt 2021-09-28 10:22:55.000000000 +0000 @@ -31,40 +31,40 @@ -   -
=== Erste Erfolge ===
-   -
=== Erste Erfolge ===
+ +
=== Erste Erfolge ===
+ +
=== Erste Erfolge ===
-   + ⚫ -
Heubaum nahm seine musikalischen Ideen, die er nicht mit dem vorausgegangenem Projekt verwirklichen konnte und probte mit Bielefelder Musikern. Einige dieser Musiker spielten zuvor in einer gemeinsamen Band mit dem Bassisten Roland Krueger.<ref Name="MSBio"/><ref Name="AMBio">{{Internetquelle|url=http://www.allmusic.com/artist/xandria-mn0000513830/biography|titel=Xandria|hrsg=Allmusic|autor=Jason Birchmeier|zugriff=2017-09-21}}</ref> Als Studioprojekt unter der musikalischen Leitung Heubaums spielten die Musiker das Demo ''Kill the Sun'' ein. ''Kill the Sun'' wurde zum Download angeboten. Die beteiligten Musiker wurden indes nicht klar benannt und durch die Namen der [[Liste ägyptischer Götter|ägyptischen Gottheiten]] Osiris, Isis, Anubis, Horus und Seth anonymisiert. Später gab die Gruppe an das Demo sei mit dem Schlagzeuger Gerit Lamm und einer regionalen Sängerin, die noch vor der Produktion des Debütalbums ausstieg, aufgenommen worden. Durch die Veröffentlichung als Download erreichte Xandria noch vor Abschluss eines Plattenvertrages ein breites Publikum.<ref Name="EMP">{{Internetquelle|url=http://www.emp.de/art_420455/|titel=Xandria: Kill the Sun|autor=|hrsg=EMP|zugriff=2017-09-21}}</ref><ref Name="MSBio"/>
+
Heubaum nahm seine musikalischen Ideen, die er nicht mit dem vorausgegangenem Projekt verwirklichen konnte und probte mit Bielefelder Musikern. Einige dieser Musiker spielten zuvor in einer gemeinsamen Band mit dem Bassisten Roland Krueger.<ref Name="MSBio"/><ref Name="AMBio">{{Internetquelle|url=http://www.allmusic.com/artist/xandria-mn0000513830/biography|titel=Xandria|hrsg=Allmusic|autor=Jason Birchmeier|zugriff=2017-09-21}}</ref> Als Studioprojekt unter der musikalischen Leitung Heubaums spielten die Musiker das Demo ''Kill the Sun'' ein. ''Kill the Sun'' wurde zum Download angeboten. Die beteiligten Musiker wurden indes nicht klar benannt und durch die Namen der [[Liste ägyptischer Götter|ägyptischen Gottheiten]] Osiris, Isis, Anubis, Horus und Seth anonymisiert. Später gab die Gruppe an das Demo sei mit dem Schlagzeuger Gerit Lamm und einer regionalen Sängerin, die noch vor der Produktion des Debütalbums ausstieg, aufgenommen worden. Durch die Veröffentlichung als Download erreichte Xandria noch vor Abschluss eines Plattenvertrages ein breites Publikum.<ref Name="EMP">{{Internetquelle|url=http://www.emp.de/art_420455/|titel=Xandria: Kill the Sun|autor=|hrsg=EMP|zugriff=2017-09-21}}</ref><ref Name="MSBio"/>
⚫ -
[[Bild:Lisa - Xandria (Unifest 2006).jpg|mini|links|hochkant|Lisa Middelhauve mit Xandria 2006]]
-   +
[[Bild:Lisa - Xandria (Unifest 2006).jpg|mini|links|hochkant|Lisa Middelhauve mit Xandria 2006]]
+ ⚫ -
Heubaum nahm seine musikalischen Ideen, die er nicht mit dem vorausgegangenem Projekt verwirklichen konnte und probte mit Bielefelder Musikern. Einige dieser Musiker spielten zuvor in einer gemeinsamen Band mit dem Bassisten Roland Krueger.<ref Name="MSBio"/><ref Name="AMBio">{{Internetquelle|url=http://www.allmusic.com/artist/xandria-mn0000513830/biography|titel=Xandria|hrsg=Allmusic|autor=Jason Birchmeier|zugriff=2017-09-21}}</ref> Als Studioprojekt unter der musikalischen Leitung Heubaums spielten die Musiker das Demo ''Kill the Sun'' ein. ''Kill the Sun'' wurde zum Download angeboten. Die beteiligten Musiker wurden indes nicht klar benannt und durch die Namen der [[Liste ägyptischer Götter|ägyptischen Gottheiten]] Osiris, Isis, Anubis, Horus und Seth anonymisiert. Später gab die Gruppe an das Demo sei mit dem Schlagzeuger Gerit Lamm und einer regionalen Sängerin, die noch vor der Produktion des Debütalbums ausstieg, aufgenommen worden. Durch die Veröffentlichung als Download erreichte Xandria noch vor Abschluss eines Plattenvertrages ein breites Publikum.<ref>{{Internetquelle|url=http://www.emp.de/art_420455/|titel=Xandria: Kill the Sun|autor=|hrsg=EMP|zugriff=2017-09-21}}</ref><ref Name="MSBio"/>
-   +
Heubaum nahm seine musikalischen Ideen, die er nicht mit dem vorausgegangenem Projekt verwirklichen konnte und probte mit Bielefelder Musikern. Einige dieser Musiker spielten zuvor in einer gemeinsamen Band mit dem Bassisten Roland Krueger.<ref Name="MSBio"/><ref Name="AMBio">{{Internetquelle|url=http://www.allmusic.com/artist/xandria-mn0000513830/biography|titel=Xandria|hrsg=Allmusic|autor=Jason Birchmeier|zugriff=2017-09-21}}</ref> Als Studioprojekt unter der musikalischen Leitung Heubaums spielten die Musiker das Demo ''Kill the Sun'' ein. ''Kill the Sun'' wurde zum Download angeboten. Die beteiligten Musiker wurden indes nicht klar benannt und durch die Namen der [[Liste ägyptischer Götter|ägyptischen Gottheiten]] Osiris, Isis, Anubis, Horus und Seth anonymisiert. Später gab die Gruppe an das Demo sei mit dem Schlagzeuger Gerit Lamm und einer regionalen Sängerin, die noch vor der Produktion des Debütalbums ausstieg, aufgenommen worden. Durch die Veröffentlichung als Download erreichte Xandria noch vor Abschluss eines Plattenvertrages ein breites Publikum.<ref>{{Internetquelle|url=http://www.emp.de/art_420455/|titel=Xandria: Kill the Sun|autor=|hrsg=EMP|zugriff=2017-09-21}}</ref><ref Name="MSBio"/>
+ -   - -   - + +
+ +
-   + ⚫ -
[[Bild:Lisa - Xandria (Unifest 2006).jpg|mini|links|hochkant|Lisa Middelhauve mit Xandria 2006]]
+
[[Bild:Lisa - Xandria (Unifest 2006).jpg|mini|links|hochkant|Lisa Middelhauve mit Xandria 2006]]
-   -
Udo Zimmer
-   -
Udo Zimmer
+ +
Udo Zimmer
+ +
Udo Zimmer
diff -Nru wikidiff2-1.11.0/tests/014.phpt wikidiff2-1.13.0/tests/014.phpt --- wikidiff2-1.11.0/tests/014.phpt 2020-12-08 20:12:38.000000000 +0000 +++ wikidiff2-1.13.0/tests/014.phpt 2021-09-28 10:22:55.000000000 +0000 @@ -30,35 +30,35 @@ -   -
Die Gemeinde Frankenhardt setzt sich aus 39 Dörfern, Weilern, Höfen und Häusern zusammen.<ref>''Das Land Baden-Württemberg. Amtliche Beschreibung nach Kreisen und Gemeinden. Band IV: Regierungsbezirk Stuttgart, Regionalverbände Franken und Ostwürttemberg.'' Kohlhammer, Stuttgart 1980, ISBN 3-17-005708-1. S. 442–447</ref>
-   -
Die Gemeinde Frankenhardt setzt sich aus 39 Dörfern, Weilern, Höfen und Häusern zusammen.<ref>''Das Land Baden-Württemberg. Amtliche Beschreibung nach Kreisen und Gemeinden. Band IV: Regierungsbezirk Stuttgart, Regionalverbände Franken und Ostwürttemberg.'' Kohlhammer, Stuttgart 1980, ISBN 3-17-005708-1. S. 442–447</ref>
+ +
Die Gemeinde Frankenhardt setzt sich aus 39 Dörfern, Weilern, Höfen und Häusern zusammen.<ref>''Das Land Baden-Württemberg. Amtliche Beschreibung nach Kreisen und Gemeinden. Band IV: Regierungsbezirk Stuttgart, Regionalverbände Franken und Ostwürttemberg.'' Kohlhammer, Stuttgart 1980, ISBN 3-17-005708-1. S. 442–447</ref>
+ +
Die Gemeinde Frankenhardt setzt sich aus 39 Dörfern, Weilern, Höfen und Häusern zusammen.<ref>''Das Land Baden-Württemberg. Amtliche Beschreibung nach Kreisen und Gemeinden. Band IV: Regierungsbezirk Stuttgart, Regionalverbände Franken und Ostwürttemberg.'' Kohlhammer, Stuttgart 1980, ISBN 3-17-005708-1. S. 442–447</ref>
-   - -   - + +
+ +
-   + ⚫ -
[[Datei:Wappen Honhardt.png|links|30px|Honhardt]] Zur ehemaligen Gemeinde Honhardt gehören das Dorf Honhardt, die Weiler Altenfelden, Appensee, Bechhof, Eckarrot, Gauchshausen, Hirschhof, Ipshof, Mainkling, Neuhaus, Reifenhof, Reishof, Sandhof, Steinbach an der Jagst, Unterspeltach, Vorderuhlberg und Zum Wagner, das Gehöft Belzhof und die Wohnplätze Fleckenbacher Sägmühle, Grunbachsägmühle, Henkensägmühle und Tiefensägmühle.
+
[[Datei:Wappen Honhardt.png|links|30px|Honhardt]] Zur ehemaligen Gemeinde Honhardt gehören das Dorf Honhardt, die Weiler Altenfelden, Appensee, Bechhof, Eckarrot, Gauchshausen, Hirschhof, Ipshof, Mainkling, Neuhaus, Reifenhof, Reishof, Sandhof, Steinbach an der Jagst, Unterspeltach, Vorderuhlberg und Zum Wagner, das Gehöft Belzhof und die Wohnplätze Fleckenbacher Sägmühle, Grunbachsägmühle, Henkensägmühle und Tiefensägmühle.
- − -
[[Datei:Wappen Honhardt.png|links|60px|Honhardt]]
-   + +
[[Datei:Wappen Honhardt.png|links|60px|Honhardt]]
+ ⚫ -
Zur ehemaligen Gemeinde Honhardt gehören das Dorf Honhardt, die Weiler Altenfelden, Appensee, Bechhof, Eckarrot, Gauchshausen, Hirschhof, Ipshof, Mainkling, Neuhaus, Reifenhof, Reishof, Sandhof, Steinbach an der Jagst, Unterspeltach, Vorderuhlberg und Zum Wagner, das Gehöft Belzhof und die Wohnplätze Fleckenbacher Sägmühle, Grunbachsägmühle, Henkensägmühle und Tiefensägmühle.
-   +
Zur ehemaligen Gemeinde Honhardt gehören das Dorf Honhardt, die Weiler Altenfelden, Appensee, Bechhof, Eckarrot, Gauchshausen, Hirschhof, Ipshof, Mainkling, Neuhaus, Reifenhof, Reishof, Sandhof, Steinbach an der Jagst, Unterspeltach, Vorderuhlberg und Zum Wagner, das Gehöft Belzhof und die Wohnplätze Fleckenbacher Sägmühle, Grunbachsägmühle, Henkensägmühle und Tiefensägmühle.
+ -   -
[[Datei:Honhardt.jpg|mini|Der Teilort Honhardt mit Kirche und Schloss. Blick vom Sandberg in Richtung Norden.]]
-   -
[[Datei:Honhardt.jpg|mini|Der Teilort Honhardt mit Kirche und Schloss. Blick vom Sandberg in Richtung Norden.]]
+ +
[[Datei:Honhardt.jpg|mini|Der Teilort Honhardt mit Kirche und Schloss. Blick vom Sandberg in Richtung Norden.]]
+ +
[[Datei:Honhardt.jpg|mini|Der Teilort Honhardt mit Kirche und Schloss. Blick vom Sandberg in Richtung Norden.]]
diff -Nru wikidiff2-1.11.0/tests/015.phpt wikidiff2-1.13.0/tests/015.phpt --- wikidiff2-1.11.0/tests/015.phpt 2020-12-08 20:12:38.000000000 +0000 +++ wikidiff2-1.13.0/tests/015.phpt 2021-09-28 10:22:55.000000000 +0000 @@ -34,51 +34,51 @@ -   -
* [http://www.nationalregisterofhistoricplaces.com/az/state.html National Register of Historic Places – Arizona]
-   -
* [http://www.nationalregisterofhistoricplaces.com/az/state.html National Register of Historic Places – Arizona]
+ +
* [http://www.nationalregisterofhistoricplaces.com/az/state.html National Register of Historic Places – Arizona]
+ +
* [http://www.nationalregisterofhistoricplaces.com/az/state.html National Register of Historic Places – Arizona]
-   - -   - + +
+ +
-   + ⚫ -
{{Navigationsleiste Listen der National Historic Places der Vereinigten Staaten}}
+
{{Navigationsleiste Listen der National Historic Places der Vereinigten Staaten}}
- − -
{{NaviBlock
-   + +
{{NaviBlock
+ - − -
|Navigationsleiste Einträge im National Register of Historic Places in Arizona
-   + +
|Navigationsleiste Einträge im National Register of Historic Places in Arizona
+ ⚫ -
|Navigationsleiste Listen der National Historic Places der Vereinigten Staaten
-   +
|Navigationsleiste Listen der National Historic Places der Vereinigten Staaten
+ - − -
}}
-   + +
}}
+ -   - -   - + +
+ +
-   -
[[Kategorie:Denkmal im National Register of Historic Places (Arizona)| ]]
-   -
[[Kategorie:Denkmal im National Register of Historic Places (Arizona)| ]]
+ +
[[Kategorie:Denkmal im National Register of Historic Places (Arizona)| ]]
+ +
[[Kategorie:Denkmal im National Register of Historic Places (Arizona)| ]]
diff -Nru wikidiff2-1.11.0/tests/016.phpt wikidiff2-1.13.0/tests/016.phpt --- wikidiff2-1.11.0/tests/016.phpt 2020-12-08 20:12:38.000000000 +0000 +++ wikidiff2-1.13.0/tests/016.phpt 2021-09-28 10:22:55.000000000 +0000 @@ -77,140 +77,140 @@ -   -
"Wulfson",
-   -
"Wulfson",
+ +
"Wulfson",
+ +
"Wulfson",
-   -
"Zanka",
-   -
"Zanka",
+ +
"Zanka",
+ +
"Zanka",
⚫ -
"АлександрВв",
-   +
"АлександрВв",
+ -   -
"Андрей Романенко",
-   -
"Андрей Романенко",
+ +
"Андрей Романенко",
+ +
"Андрей Романенко",
-   -
"Всеслав Чародей"
-   -
"Всеслав Чародей"
+ +
"Всеслав Чародей"
+ +
"Всеслав Чародей"
-   -
"Oleksiy.golubov",
-   -
"Oleksiy.golubov",
+ +
"Oleksiy.golubov",
+ +
"Oleksiy.golubov",
-   -
"Postoronniy-13",
-   -
"Postoronniy-13",
+ +
"Postoronniy-13",
+ +
"Postoronniy-13",
-   + ⚫ -
"Saint Johann",
+
"Saint Johann",
-   -
"Saramag",
-   -
"Saramag",
+ +
"Saramag",
+ +
"Saramag",
-   -
"Stormare.henk",
-   -
"Stormare.henk",
+ +
"Stormare.henk",
+ +
"Stormare.henk",
-   -
"K": [
-   -
"K": [
+ +
"K": [
+ +
"K": [
-   -
"Biathlon",
-   -
"Biathlon",
+ +
"Biathlon",
+ +
"Biathlon",
-   + ⚫ -
"Michgrig",
+
"Michgrig",
-   + ⚫ -
"TenBaseT",
+
"TenBaseT",
-   -
"Q-bit array"
-   -
"Q-bit array"
+ +
"Q-bit array"
+ +
"Q-bit array"
-   -
],
-   -
],
+ +
],
+ +
],
-   -
"Ar": [
-   -
"Ar": [
+ +
"Ar": [
+ +
"Ar": [
- − -
"Drbug",
-   + +
"Drbug",
+ ⚫ -
"Michgrig",
-   +
"Michgrig",
+ - − -
"Sir Shurf",
-   + +
"Sir Shurf",
+ ⚫ -
"TenBaseT",
-   +
"TenBaseT",
+ -   -
"Alexander Roumega",
-   -
"Alexander Roumega",
+ +
"Alexander Roumega",
+ +
"Alexander Roumega",
-   -
"Deltahead"
-   -
"Deltahead"
+ +
"Deltahead"
+ +
"Deltahead"
diff -Nru wikidiff2-1.11.0/tests/017.phpt wikidiff2-1.13.0/tests/017.phpt --- wikidiff2-1.11.0/tests/017.phpt 2020-12-08 20:12:38.000000000 +0000 +++ wikidiff2-1.13.0/tests/017.phpt 2021-09-28 10:22:55.000000000 +0000 @@ -51,124 +51,124 @@ -   - + -
{{Infobox NH Route
+ + +
{{Infobox NH Route
- − -
{{Infobox_road
-   + +
{{Infobox_road
+ -   - + -
|previous_type=NH
+ + +
|previous_type=NH
- − -
| system = [[New Hampshire Highway System]]
-   + +
| system = [[New Hampshire Highway System]]
+ -   - + -
|previous_route=142
+ + +
|previous_route=142
- − -
| browse = {{nh browse|previous_type=NH|previous_route=142|next_type=NH|next_route=149}}
-   + +
| browse = {{nh browse|previous_type=NH|previous_route=142|next_type=NH|next_route=149}}
+ -   - + -
|next_type=NH
+ + +
|next_type=NH
⚫ -
}}'''New Hampshire Route 145''' ('''NH 145''') is a north–south highway in [[Coos County, New Hampshire|Coos County]] in northern [[New Hampshire]]. The highway runs between [[Colebrook, New Hampshire|Colebrook]] and [[Pittsburg, New Hampshire|Pittsburg]].
-   +
}}'''New Hampshire Route 145''' ('''NH 145''') is a north–south highway in [[Coos County, New Hampshire|Coos County]] in northern [[New Hampshire]]. The highway runs between [[Colebrook, New Hampshire|Colebrook]] and [[Pittsburg, New Hampshire|Pittsburg]].
+ -   - + -
|next_route=149
+ + +
|next_route=149
-   - + -
}}
+ + +
}}
-   + ⚫ -
'''New Hampshire Route 145''' (abbreviated '''NH 145''') is a 13.12&#160;mile long north–south [[state highway]] in [[Coos County, New Hampshire|Coos County]] in northern [[New Hampshire]]. The highway runs between [[Colebrook, New Hampshire|Colebrook]] and [[Pittsburg, New Hampshire|Pittsburg]].
+
'''New Hampshire Route 145''' (abbreviated '''NH 145''') is a 13.12&#160;mile long north–south [[state highway]] in [[Coos County, New Hampshire|Coos County]] in northern [[New Hampshire]]. The highway runs between [[Colebrook, New Hampshire|Colebrook]] and [[Pittsburg, New Hampshire|Pittsburg]].
-   - -   - + +
+ +
- − -
The southern terminus of NH 145 is at the junction with [[U.S. Highway 3|US 3]] in Colebrook on the [[Vermont]] border. The highway passes through [[Clarksville, New Hampshire|Clarksville]] township and the village center. The northern terminus of NH 145 is in Pittsburg at the junction with US 3. Total length of the highway is approximately 13.2 miles (21.3 km).
- + -
The southern terminus of NH 145 is at [[U.S. Route 3 (New Hampshire)|U.S. Route 3]] in Colebrook on the [[Vermont]] border. The highway passes through [[Clarksville, New Hampshire|Clarksville]] township and the village center. The northern terminus of NH 145 is in Pittsburg at US 3.
+ +
The southern terminus of NH 145 is at the junction with [[U.S. Highway 3|US 3]] in Colebrook on the [[Vermont]] border. The highway passes through [[Clarksville, New Hampshire|Clarksville]] township and the village center. The northern terminus of NH 145 is in Pittsburg at the junction with US 3. Total length of the highway is approximately 13.2 miles (21.3 km).
+ +
The southern terminus of NH 145 is at [[U.S. Route 3 (New Hampshire)|U.S. Route 3]] in Colebrook on the [[Vermont]] border. The highway passes through [[Clarksville, New Hampshire|Clarksville]] township and the village center. The northern terminus of NH 145 is in Pittsburg at US 3.
-   - -   - + +
+ +
- − -
== See also ==
- + -
==References==
+ +
== See also ==
+ +
==References==
-   - + -
<references/>
+ + +
<references/>
⚫ -
*[[List of New Hampshire numbered highways]]
-   +
*[[List of New Hampshire numbered highways]]
+ -   - -   - + +
+ +
-   + ⚫ -
[[Category:New Hampshire state highways|145]]
+
[[Category:New Hampshire state highways|145]]
-   + ⚫ -
[[Category:Coos County, New Hampshire]]
+
[[Category:Coos County, New Hampshire]]
-   - -   - + +
+ +
-   -
{{NewHampshire-State-Highway-stub}}
-   -
{{NewHampshire-State-Highway-stub}}
+ +
{{NewHampshire-State-Highway-stub}}
+ +
{{NewHampshire-State-Highway-stub}}
⚫ -
[[Category:New Hampshire state highways|145]]
-   +
[[Category:New Hampshire state highways|145]]
+ diff -Nru wikidiff2-1.11.0/tests/thai1.phpt wikidiff2-1.13.0/tests/thai1.phpt --- wikidiff2-1.11.0/tests/thai1.phpt 2020-12-08 20:12:38.000000000 +0000 +++ wikidiff2-1.13.0/tests/thai1.phpt 2021-09-28 10:22:55.000000000 +0000 @@ -9,8 +9,9 @@ - − -
สุนัขจิ้งจอกกระโดดข้ามสุนัข
- + -
สุนัขจิ้งจอกกระโดดข้ามแมว
+ +
สุนัขจิ้งจอกกระโดดข้ามสุนัข
+ +
สุนัขจิ้งจอกกระโดดข้ามแมว
+ diff -Nru wikidiff2-1.11.0/Wikidiff2.h wikidiff2-1.13.0/Wikidiff2.h --- wikidiff2-1.11.0/Wikidiff2.h 2020-12-08 20:12:38.000000000 +0000 +++ wikidiff2-1.13.0/Wikidiff2.h 2021-09-28 10:22:55.000000000 +0000 @@ -10,7 +10,7 @@ #include #include -#define WIKIDIFF2_VERSION_STRING "1.11.0" +#define WIKIDIFF2_VERSION_STRING "1.13.0" // uncomment this for inline HTML debug output related to moved lines //#define DEBUG_MOVED_LINES