aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorShulhan <ms@kilabit.info>2026-04-10 12:35:21 +0700
committerShulhan <ms@kilabit.info>2026-04-10 14:49:55 +0700
commit44aa2ea2da7a02eb7d52d500e40fe4fd7b5752e3 (patch)
treeae473cbaa940e9286046e28aaf9b15428c18dd64 /lib
parent2515c8a3b0b24be4520e6967fcde4bd6323a6fb2 (diff)
downloadpakakeh.go-44aa2ea2da7a02eb7d52d500e40fe4fd7b5752e3.tar.xz
text/diff: refactoring to use local Line instead from text package
The reason for refactoring is we will add more fields to the Line type to handle unified diff. In the ParseLines, we changes the line number to start from 1, to make it consistent with ReadLines and file line numbering. This causes a lot of changes in the expectation files in testdata.
Diffstat (limited to 'lib')
-rw-r--r--lib/text/diff/diff.go74
-rw-r--r--lib/text/diff/diff_test.go8
-rw-r--r--lib/text/diff/diffinterface.go41
-rw-r--r--lib/text/diff/line.go43
-rw-r--r--lib/text/diff/linechange.go10
-rw-r--r--lib/text/diff/testdata/List_of_United_Nations_diff_LevelLines22
-rw-r--r--lib/text/diff/testdata/List_of_United_Nations_diff_LevelLines_reverse22
-rw-r--r--lib/text/diff/testdata/List_of_United_Nations_diff_LevelWords22
-rw-r--r--lib/text/diff/testdata/List_of_United_Nations_diff_LevelWords_reverse22
-rw-r--r--lib/text/diff/testdata/Psusennes_II_diff_LevelLines130
-rw-r--r--lib/text/diff/testdata/Psusennes_II_diff_LevelLines_reverse130
-rw-r--r--lib/text/diff/testdata/Psusennes_II_diff_LevelWords130
-rw-r--r--lib/text/diff/testdata/Psusennes_II_diff_LevelWords_reverse130
-rw-r--r--lib/text/diff/testdata/Top_Gear_Series_14_diff_LevelLines4
-rw-r--r--lib/text/diff/testdata/Top_Gear_Series_14_diff_LevelLines_reverse4
-rw-r--r--lib/text/diff/testdata/Top_Gear_Series_14_diff_LevelWords4
-rw-r--r--lib/text/diff/testdata/Top_Gear_Series_14_diff_LevelWords_reverse4
-rw-r--r--lib/text/diff/testdata/empty_lines_diff_LevelLines2
-rw-r--r--lib/text/diff/testdata/empty_lines_diff_LevelLines_reverse2
-rw-r--r--lib/text/diff/testdata/empty_lines_diff_LevelWords2
-rw-r--r--lib/text/diff/testdata/empty_lines_diff_LevelWords_reverse2
-rw-r--r--lib/text/diff/testdata/peeps_diff_LevelLines8
-rw-r--r--lib/text/diff/testdata/peeps_diff_LevelLines_reverse8
-rw-r--r--lib/text/diff/testdata/peeps_diff_LevelWords8
-rw-r--r--lib/text/diff/testdata/peeps_diff_LevelWords_reverse8
-rw-r--r--lib/text/diff/testdata/text01_diff_LevelLines4
-rw-r--r--lib/text/diff/testdata/text01_diff_LevelLines_reverse4
-rw-r--r--lib/text/diff/testdata/text01_diff_LevelWords4
-rw-r--r--lib/text/diff/testdata/text01_diff_LevelWords_reverse4
-rw-r--r--lib/text/diff/testdata/text02_diff_LevelLines4
-rw-r--r--lib/text/diff/testdata/text02_diff_LevelLines_reverse4
-rw-r--r--lib/text/diff/testdata/text02_diff_LevelWords4
-rw-r--r--lib/text/diff/testdata/text02_diff_LevelWords_reverse4
-rw-r--r--lib/text/diff/testdata/the_singles_collection_diff_LevelLines184
-rw-r--r--lib/text/diff/testdata/the_singles_collection_diff_LevelLines_reverse184
-rw-r--r--lib/text/diff/testdata/the_singles_collection_diff_LevelWords184
-rw-r--r--lib/text/diff/testdata/the_singles_collection_diff_LevelWords_reverse184
37 files changed, 796 insertions, 812 deletions
diff --git a/lib/text/diff/diff.go b/lib/text/diff/diff.go
index 1286cde1..947e13db 100644
--- a/lib/text/diff/diff.go
+++ b/lib/text/diff/diff.go
@@ -17,11 +17,10 @@ var (
DefDelimiter = byte('\n')
)
-// Data represent additions, deletions, and changes between two text.
-// If no difference found, the IsMatched will be true.
+// Data stores additions, deletions, and changes between two texts.
type Data struct {
- Adds text.Lines
- Dels text.Lines
+ Adds []Line
+ Dels []Line
Changes LineChanges
IsMatched bool
@@ -29,13 +28,13 @@ type Data struct {
// Text search the difference between two texts.
func Text(before, after []byte, level int) (diffs Data) {
- beforeLines := text.ParseLines(before)
- afterLines := text.ParseLines(after)
+ beforeLines := ParseLines(before)
+ afterLines := ParseLines(after)
return Lines(beforeLines, afterLines, level)
}
// Lines search the difference between two Lines.
-func Lines(oldlines, newlines text.Lines, level int) (diffs Data) {
+func Lines(oldlines, newlines []Line, level int) (diffs Data) {
oldlen := len(oldlines)
newlen := len(newlines)
x := 0
@@ -43,34 +42,30 @@ func Lines(oldlines, newlines text.Lines, level int) (diffs Data) {
for x < oldlen {
if y == newlen {
- // New text has been full examined. Leave out the old
- // text that means deletion at the end of text.
+ // New text has been fully examined.
+ // The rest is the old text.
+ // That means deletion at the end of text.
diffs.PushDel(oldlines[x])
- oldlines[x].V = nil
x++
continue
}
// Compare old line with new line.
- if IsEqual(oldlines[x].V, newlines[y].V) {
- oldlines[x].V = nil
- newlines[y].V = nil
+ if IsEqual(oldlines[x].Val, newlines[y].Val) {
x++
y++
continue
}
// Check for whitespace changes
- oldlinetrim := bytes.TrimSpace(oldlines[x].V)
- newlinetrim := bytes.TrimSpace(newlines[y].V)
+ oldlinetrim := bytes.TrimSpace(oldlines[x].Val)
+ newlinetrim := bytes.TrimSpace(newlines[y].Val)
oldtrimlen := len(oldlinetrim)
newtrimlen := len(newlinetrim)
// Both are empty, probably one of them is changing
- if oldtrimlen <= 0 && newtrimlen <= 0 {
+ if oldtrimlen == 0 && newtrimlen == 0 {
diffs.PushChange(oldlines[x], newlines[y])
- oldlines[x].V = nil
- newlines[y].V = nil
x++
y++
continue
@@ -79,7 +74,6 @@ func Lines(oldlines, newlines text.Lines, level int) (diffs Data) {
// Old is empty or contain only whitespaces.
if oldtrimlen <= 0 {
diffs.PushDel(oldlines[x])
- oldlines[x].V = nil
x++
continue
}
@@ -87,20 +81,17 @@ func Lines(oldlines, newlines text.Lines, level int) (diffs Data) {
// New is empty or contain only whitespaces.
if newtrimlen <= 0 {
diffs.PushAdd(newlines[y])
- newlines[y].V = nil
y++
continue
}
- ratio, _, _ := BytesRatio(oldlines[x].V, newlines[y].V,
+ ratio, _, _ := BytesRatio(oldlines[x].Val, newlines[y].Val,
DefMatchLen)
if ratio > DefMatchRatio {
// Ratio of similar bytes is higher than minimum
// expectation. So, it must be changes
diffs.PushChange(oldlines[x], newlines[y])
- oldlines[x].V = nil
- newlines[y].V = nil
x++
y++
continue
@@ -115,8 +106,6 @@ func Lines(oldlines, newlines text.Lines, level int) (diffs Data) {
// Both line is missing, its mean changes on current line
if !foundx && !foundy {
diffs.PushChange(oldlines[x], newlines[y])
- oldlines[x].V = nil
- newlines[y].V = nil
x++
y++
continue
@@ -126,7 +115,6 @@ func Lines(oldlines, newlines text.Lines, level int) (diffs Data) {
if !foundx && foundy {
for ; x < yatx && x < oldlen; x++ {
diffs.PushDel(oldlines[x])
- oldlines[x].V = nil
}
continue
}
@@ -135,7 +123,6 @@ func Lines(oldlines, newlines text.Lines, level int) (diffs Data) {
if foundx && !foundy {
for ; y < xaty && y < newlen; y++ {
diffs.PushAdd(newlines[y])
- newlines[y].V = nil
}
continue
}
@@ -150,7 +137,6 @@ func Lines(oldlines, newlines text.Lines, level int) (diffs Data) {
case addlen < dellen:
for ; y < xaty && y < newlen; y++ {
diffs.PushAdd(newlines[y])
- newlines[y].V = nil
}
case addlen == dellen:
@@ -158,15 +144,12 @@ func Lines(oldlines, newlines text.Lines, level int) (diffs Data) {
for x < yatx && y < xaty {
diffs.PushChange(oldlines[x],
newlines[y])
- oldlines[x].V = nil
- newlines[y].V = nil
x++
y++
}
default:
for ; x < yatx && x < oldlen; x++ {
diffs.PushDel(oldlines[x])
- oldlines[x].V = nil
}
}
continue
@@ -176,13 +159,12 @@ func Lines(oldlines, newlines text.Lines, level int) (diffs Data) {
// Check if there is a left over from new text.
for ; y < newlen; y++ {
diffs.PushAdd(newlines[y])
- newlines[y].V = nil
}
if level == LevelWords {
// Process each changes to find modified chunkes.
for x, change := range diffs.Changes {
- adds, dels := Bytes(change.Old.V, change.New.V, 0, 0)
+ adds, dels := Bytes(change.Old.Val, change.New.Val, 0, 0)
diffs.Changes[x].Adds = adds
diffs.Changes[x].Dels = dels
}
@@ -208,17 +190,17 @@ func (diffs *Data) checkIsMatched() {
}
// PushAdd will add new line to diff set.
-func (diffs *Data) PushAdd(new text.Line) {
+func (diffs *Data) PushAdd(new Line) {
diffs.Adds = append(diffs.Adds, new)
}
// PushDel will add deletion line to diff set.
-func (diffs *Data) PushDel(old text.Line) {
+func (diffs *Data) PushDel(old Line) {
diffs.Dels = append(diffs.Dels, old)
}
// PushChange set to diff data.
-func (diffs *Data) PushChange(old, new text.Line) {
+func (diffs *Data) PushChange(old, new Line) {
change := NewLineChange(old, new)
diffs.Changes = append(diffs.Changes, *change)
@@ -227,7 +209,7 @@ func (diffs *Data) PushChange(old, new text.Line) {
// GetAllAdds return chunks of additions including in line changes.
func (diffs *Data) GetAllAdds() (chunks text.Chunks) {
for _, add := range diffs.Adds {
- chunks = append(chunks, text.Chunk{StartAt: 0, V: add.V})
+ chunks = append(chunks, text.Chunk{StartAt: 0, V: add.Val})
}
chunks = append(chunks, diffs.Changes.GetAllAdds()...)
return
@@ -236,7 +218,7 @@ func (diffs *Data) GetAllAdds() (chunks text.Chunks) {
// GetAllDels return chunks of deletions including in line changes.
func (diffs *Data) GetAllDels() (chunks text.Chunks) {
for _, del := range diffs.Dels {
- chunks = append(chunks, text.Chunk{StartAt: 0, V: del.V})
+ chunks = append(chunks, text.Chunk{StartAt: 0, V: del.Val})
}
chunks = append(chunks, diffs.Changes.GetAllDels()...)
return
@@ -244,29 +226,25 @@ func (diffs *Data) GetAllDels() (chunks text.Chunks) {
// String return formatted data.
func (diffs Data) String() (s string) {
- var (
- sb strings.Builder
- line text.Line
- change LineChange
- )
+ var sb strings.Builder
if len(diffs.Dels) > 0 {
sb.WriteString("----\n")
- for _, line = range diffs.Dels {
- fmt.Fprintf(&sb, "%d - %q\n", line.N, line.V)
+ for _, line := range diffs.Dels {
+ fmt.Fprintf(&sb, "%d - %q\n", line.Num, line.Val)
}
}
if len(diffs.Adds) > 0 {
sb.WriteString("++++\n")
- for _, line = range diffs.Adds {
- fmt.Fprintf(&sb, "%d + %q\n", line.N, line.V)
+ for _, line := range diffs.Adds {
+ fmt.Fprintf(&sb, "%d + %q\n", line.Num, line.Val)
}
}
if len(diffs.Changes) > 0 {
sb.WriteString("--++\n")
- for _, change = range diffs.Changes {
+ for _, change := range diffs.Changes {
sb.WriteString(change.String())
}
}
diff --git a/lib/text/diff/diff_test.go b/lib/text/diff/diff_test.go
index 0cc6a002..76dd174c 100644
--- a/lib/text/diff/diff_test.go
+++ b/lib/text/diff/diff_test.go
@@ -222,8 +222,8 @@ func TestText(t *testing.T) {
expStr = string(exp)
if !reflect.DeepEqual(expStr, got) {
- t.Fatalf("%s - %s: LevelLines not matched:\n<<< want:\n%s\n<<< got:\n%s",
- c.textBefore, c.textAfter, expStr, got)
+ t.Fatalf("%s not matched:\n<<< want:\n%s\n<<< got:\n%s",
+ c.diffLevelLines, expStr, got)
}
diffs = Text(before, after, LevelWords)
@@ -236,8 +236,8 @@ func TestText(t *testing.T) {
expStr = string(exp)
if !reflect.DeepEqual(expStr, got) {
- t.Fatalf("%s - %s: LevelWords not matched:\n<<< want:\n%s\n<<< got:\n%s",
- c.textBefore, c.textAfter, expStr, got)
+ t.Fatalf("%s not matched:\n<<< want:\n%s\n<<< got:\n%s",
+ c.diffLevelWords, expStr, got)
}
}
}
diff --git a/lib/text/diff/diffinterface.go b/lib/text/diff/diffinterface.go
index 0f8df1b2..507d5b14 100644
--- a/lib/text/diff/diffinterface.go
+++ b/lib/text/diff/diffinterface.go
@@ -4,11 +4,6 @@
package diff
import (
- "bufio"
- "errors"
- "io"
- "os"
-
inbytes "git.sr.ht/~shulhan/pakakeh.go/internal/bytes"
"git.sr.ht/~shulhan/pakakeh.go/lib/text"
)
@@ -30,38 +25,6 @@ const (
DefMatchRatio = 0.7
)
-// ReadLines return lines in the file `f`.
-func ReadLines(f string) (lines text.Lines, e error) {
- var fd *os.File
-
- fd, e = os.Open(f)
- if e != nil {
- return
- }
-
- var (
- reader = bufio.NewReader(fd)
- n = 1
- line []byte
- )
- for {
- line, e = reader.ReadBytes(DefDelimiter)
- if e != nil {
- if errors.Is(e, io.EOF) {
- break
- }
- return lines, e
- }
-
- lines = append(lines, text.Line{N: n, V: line})
- n++
- }
-
- e = fd.Close()
-
- return lines, e
-}
-
// IsEqual compare two slice of bytes and return true if equal or false
// otherwise.
func IsEqual(oldb, newb []byte) (equal bool) {
@@ -192,14 +155,14 @@ func BytesRatio(old, newline []byte, minTokenLen int) (ratio float32, m int, max
// findLine return true if line is found in text beginning at line `startat`.
// It also return line number of matching line.
// If no match found, it will return false and `startat` value.
-func findLine(line text.Line, text text.Lines, startat int) (
+func findLine(line Line, text []Line, startat int) (
found bool,
n int,
) {
textlen := len(text)
for n = startat; n < textlen; n++ {
- if IsEqual(line.V, text[n].V) {
+ if IsEqual(line.Val, text[n].Val) {
return true, n
}
}
diff --git a/lib/text/diff/line.go b/lib/text/diff/line.go
new file mode 100644
index 00000000..9fe3f878
--- /dev/null
+++ b/lib/text/diff/line.go
@@ -0,0 +1,43 @@
+// SPDX-License-Identifier: BSD-3-Clause
+// SPDX-FileCopyrightText: 2026 M. Shulhan <ms@kilabit.info>
+
+package diff
+
+import (
+ "bytes"
+ "fmt"
+ "os"
+)
+
+// Line represents single line from file or stream of bytes.
+type Line struct {
+ Val []byte // The line value.
+ Num int // The line number, started from 1.
+}
+
+// ParseLines returns lines from reading raw bytes.
+// The line number returned in lines started from 1.
+func ParseLines(raw []byte) (lines []Line) {
+ rawlines := bytes.Split(raw, []byte("\n"))
+ lenraw := len(rawlines)
+ if len(rawlines[lenraw-1]) == 0 {
+ rawlines = rawlines[:lenraw-1]
+ }
+ lines = make([]Line, 0, len(rawlines))
+ for x, line := range rawlines {
+ lines = append(lines, Line{Num: x + 1, Val: line})
+ }
+ return lines
+}
+
+// ReadLines returns lines in the file.
+// The line number returned in lines started from 1.
+func ReadLines(file string) (lines []Line, err error) {
+ logp := `ReadLines`
+ raw, err := os.ReadFile(file)
+ if err != nil {
+ return nil, fmt.Errorf(`%s: %w`, logp, err)
+ }
+ lines = ParseLines(raw)
+ return lines, nil
+}
diff --git a/lib/text/diff/linechange.go b/lib/text/diff/linechange.go
index 999fe002..44425353 100644
--- a/lib/text/diff/linechange.go
+++ b/lib/text/diff/linechange.go
@@ -15,12 +15,12 @@ type LineChange struct {
Adds text.Chunks
Dels text.Chunks
- Old text.Line
- New text.Line
+ Old Line
+ New Line
}
// NewLineChange create a pointer to new LineChange object.
-func NewLineChange(old, new text.Line) *LineChange {
+func NewLineChange(old, new Line) *LineChange {
return &LineChange{
Adds: text.Chunks{},
Dels: text.Chunks{},
@@ -36,8 +36,8 @@ func (change LineChange) String() string {
chunk text.Chunk
)
- fmt.Fprintf(&sb, "%d - %q\n", change.Old.N, change.Old.V)
- fmt.Fprintf(&sb, "%d + %q\n", change.New.N, change.New.V)
+ fmt.Fprintf(&sb, "%d - %q\n", change.Old.Num, change.Old.Val)
+ fmt.Fprintf(&sb, "%d + %q\n", change.New.Num, change.New.Val)
for _, chunk = range change.Dels {
fmt.Fprintf(&sb, "^%d - %q\n", chunk.StartAt, chunk.V)
diff --git a/lib/text/diff/testdata/List_of_United_Nations_diff_LevelLines b/lib/text/diff/testdata/List_of_United_Nations_diff_LevelLines
index 33d6e4bd..b521d459 100644
--- a/lib/text/diff/testdata/List_of_United_Nations_diff_LevelLines
+++ b/lib/text/diff/testdata/List_of_United_Nations_diff_LevelLines
@@ -1,13 +1,13 @@
----
-5 - "The [[United States]] has regularly voted alone and against international consensus, using its [[United Nations Security Council veto power|veto power]] to block the adoption of proposed UN Security Council resolutions supporting the [[PLO]] and calling for a two-state solution to the [[Israeli-Palestinian conflict]].<ref>[http://books.google.ca/books?id=CHL5SwGvobQC&pg=PA168&dq=US+veto+Israel+regularly#v=onepage&q=US%20veto%20Israel%20regularly&f=false Pirates and emperors, old and new: international terrorism in the real world], [[Noam Chomsky]], p. 168.</ref><ref>The US has also used its veto to block resolutions that are critical of Israel.[http://books.google.ca/books?id=yzmpDAz7ZAwC&pg=PT251&dq=US+veto+Israel+regularly&lr=#v=onepage&q=US%20veto%20Israel%20regularly&f=false Uneasy neighbors], David T. Jones and David Kilgour, p. 235.</ref> The United States responded to the frequent criticism from UN organs by adopting the [[Negroponte doctrine]]. \r"
-6 - "\r"
-7 - " \r"
-8 - "\r"
-247 - "==References==\r"
-248 - "{{reflist}}\r"
-249 - "\r"
+6 - "The [[United States]] has regularly voted alone and against international consensus, using its [[United Nations Security Council veto power|veto power]] to block the adoption of proposed UN Security Council resolutions supporting the [[PLO]] and calling for a two-state solution to the [[Israeli-Palestinian conflict]].<ref>[http://books.google.ca/books?id=CHL5SwGvobQC&pg=PA168&dq=US+veto+Israel+regularly#v=onepage&q=US%20veto%20Israel%20regularly&f=false Pirates and emperors, old and new: international terrorism in the real world], [[Noam Chomsky]], p. 168.</ref><ref>The US has also used its veto to block resolutions that are critical of Israel.[http://books.google.ca/books?id=yzmpDAz7ZAwC&pg=PT251&dq=US+veto+Israel+regularly&lr=#v=onepage&q=US%20veto%20Israel%20regularly&f=false Uneasy neighbors], David T. Jones and David Kilgour, p. 235.</ref> The United States responded to the frequent criticism from UN organs by adopting the [[Negroponte doctrine]]. \r"
+7 - "\r"
+8 - " \r"
+9 - "\r"
+248 - "==References==\r"
+249 - "{{reflist}}\r"
+250 - "\r"
++++
-267 + "==References==\r"
-268 + "{{reflist}}\r"
-269 + "\r"
-270 + ""
+268 + "==References==\r"
+269 + "{{reflist}}\r"
+270 + "\r"
+271 + ""
diff --git a/lib/text/diff/testdata/List_of_United_Nations_diff_LevelLines_reverse b/lib/text/diff/testdata/List_of_United_Nations_diff_LevelLines_reverse
index 2d0fd9dd..214d0290 100644
--- a/lib/text/diff/testdata/List_of_United_Nations_diff_LevelLines_reverse
+++ b/lib/text/diff/testdata/List_of_United_Nations_diff_LevelLines_reverse
@@ -1,13 +1,13 @@
----
-267 - "==References==\r"
-268 - "{{reflist}}\r"
-269 - "\r"
-270 - ""
+268 - "==References==\r"
+269 - "{{reflist}}\r"
+270 - "\r"
+271 - ""
++++
-5 + "The [[United States]] has regularly voted alone and against international consensus, using its [[United Nations Security Council veto power|veto power]] to block the adoption of proposed UN Security Council resolutions supporting the [[PLO]] and calling for a two-state solution to the [[Israeli-Palestinian conflict]].<ref>[http://books.google.ca/books?id=CHL5SwGvobQC&pg=PA168&dq=US+veto+Israel+regularly#v=onepage&q=US%20veto%20Israel%20regularly&f=false Pirates and emperors, old and new: international terrorism in the real world], [[Noam Chomsky]], p. 168.</ref><ref>The US has also used its veto to block resolutions that are critical of Israel.[http://books.google.ca/books?id=yzmpDAz7ZAwC&pg=PT251&dq=US+veto+Israel+regularly&lr=#v=onepage&q=US%20veto%20Israel%20regularly&f=false Uneasy neighbors], David T. Jones and David Kilgour, p. 235.</ref> The United States responded to the frequent criticism from UN organs by adopting the [[Negroponte doctrine]]. \r"
-6 + "\r"
-7 + " \r"
-8 + "\r"
-247 + "==References==\r"
-248 + "{{reflist}}\r"
-249 + "\r"
+6 + "The [[United States]] has regularly voted alone and against international consensus, using its [[United Nations Security Council veto power|veto power]] to block the adoption of proposed UN Security Council resolutions supporting the [[PLO]] and calling for a two-state solution to the [[Israeli-Palestinian conflict]].<ref>[http://books.google.ca/books?id=CHL5SwGvobQC&pg=PA168&dq=US+veto+Israel+regularly#v=onepage&q=US%20veto%20Israel%20regularly&f=false Pirates and emperors, old and new: international terrorism in the real world], [[Noam Chomsky]], p. 168.</ref><ref>The US has also used its veto to block resolutions that are critical of Israel.[http://books.google.ca/books?id=yzmpDAz7ZAwC&pg=PT251&dq=US+veto+Israel+regularly&lr=#v=onepage&q=US%20veto%20Israel%20regularly&f=false Uneasy neighbors], David T. Jones and David Kilgour, p. 235.</ref> The United States responded to the frequent criticism from UN organs by adopting the [[Negroponte doctrine]]. \r"
+7 + "\r"
+8 + " \r"
+9 + "\r"
+248 + "==References==\r"
+249 + "{{reflist}}\r"
+250 + "\r"
diff --git a/lib/text/diff/testdata/List_of_United_Nations_diff_LevelWords b/lib/text/diff/testdata/List_of_United_Nations_diff_LevelWords
index 33d6e4bd..b521d459 100644
--- a/lib/text/diff/testdata/List_of_United_Nations_diff_LevelWords
+++ b/lib/text/diff/testdata/List_of_United_Nations_diff_LevelWords
@@ -1,13 +1,13 @@
----
-5 - "The [[United States]] has regularly voted alone and against international consensus, using its [[United Nations Security Council veto power|veto power]] to block the adoption of proposed UN Security Council resolutions supporting the [[PLO]] and calling for a two-state solution to the [[Israeli-Palestinian conflict]].<ref>[http://books.google.ca/books?id=CHL5SwGvobQC&pg=PA168&dq=US+veto+Israel+regularly#v=onepage&q=US%20veto%20Israel%20regularly&f=false Pirates and emperors, old and new: international terrorism in the real world], [[Noam Chomsky]], p. 168.</ref><ref>The US has also used its veto to block resolutions that are critical of Israel.[http://books.google.ca/books?id=yzmpDAz7ZAwC&pg=PT251&dq=US+veto+Israel+regularly&lr=#v=onepage&q=US%20veto%20Israel%20regularly&f=false Uneasy neighbors], David T. Jones and David Kilgour, p. 235.</ref> The United States responded to the frequent criticism from UN organs by adopting the [[Negroponte doctrine]]. \r"
-6 - "\r"
-7 - " \r"
-8 - "\r"
-247 - "==References==\r"
-248 - "{{reflist}}\r"
-249 - "\r"
+6 - "The [[United States]] has regularly voted alone and against international consensus, using its [[United Nations Security Council veto power|veto power]] to block the adoption of proposed UN Security Council resolutions supporting the [[PLO]] and calling for a two-state solution to the [[Israeli-Palestinian conflict]].<ref>[http://books.google.ca/books?id=CHL5SwGvobQC&pg=PA168&dq=US+veto+Israel+regularly#v=onepage&q=US%20veto%20Israel%20regularly&f=false Pirates and emperors, old and new: international terrorism in the real world], [[Noam Chomsky]], p. 168.</ref><ref>The US has also used its veto to block resolutions that are critical of Israel.[http://books.google.ca/books?id=yzmpDAz7ZAwC&pg=PT251&dq=US+veto+Israel+regularly&lr=#v=onepage&q=US%20veto%20Israel%20regularly&f=false Uneasy neighbors], David T. Jones and David Kilgour, p. 235.</ref> The United States responded to the frequent criticism from UN organs by adopting the [[Negroponte doctrine]]. \r"
+7 - "\r"
+8 - " \r"
+9 - "\r"
+248 - "==References==\r"
+249 - "{{reflist}}\r"
+250 - "\r"
++++
-267 + "==References==\r"
-268 + "{{reflist}}\r"
-269 + "\r"
-270 + ""
+268 + "==References==\r"
+269 + "{{reflist}}\r"
+270 + "\r"
+271 + ""
diff --git a/lib/text/diff/testdata/List_of_United_Nations_diff_LevelWords_reverse b/lib/text/diff/testdata/List_of_United_Nations_diff_LevelWords_reverse
index 2d0fd9dd..214d0290 100644
--- a/lib/text/diff/testdata/List_of_United_Nations_diff_LevelWords_reverse
+++ b/lib/text/diff/testdata/List_of_United_Nations_diff_LevelWords_reverse
@@ -1,13 +1,13 @@
----
-267 - "==References==\r"
-268 - "{{reflist}}\r"
-269 - "\r"
-270 - ""
+268 - "==References==\r"
+269 - "{{reflist}}\r"
+270 - "\r"
+271 - ""
++++
-5 + "The [[United States]] has regularly voted alone and against international consensus, using its [[United Nations Security Council veto power|veto power]] to block the adoption of proposed UN Security Council resolutions supporting the [[PLO]] and calling for a two-state solution to the [[Israeli-Palestinian conflict]].<ref>[http://books.google.ca/books?id=CHL5SwGvobQC&pg=PA168&dq=US+veto+Israel+regularly#v=onepage&q=US%20veto%20Israel%20regularly&f=false Pirates and emperors, old and new: international terrorism in the real world], [[Noam Chomsky]], p. 168.</ref><ref>The US has also used its veto to block resolutions that are critical of Israel.[http://books.google.ca/books?id=yzmpDAz7ZAwC&pg=PT251&dq=US+veto+Israel+regularly&lr=#v=onepage&q=US%20veto%20Israel%20regularly&f=false Uneasy neighbors], David T. Jones and David Kilgour, p. 235.</ref> The United States responded to the frequent criticism from UN organs by adopting the [[Negroponte doctrine]]. \r"
-6 + "\r"
-7 + " \r"
-8 + "\r"
-247 + "==References==\r"
-248 + "{{reflist}}\r"
-249 + "\r"
+6 + "The [[United States]] has regularly voted alone and against international consensus, using its [[United Nations Security Council veto power|veto power]] to block the adoption of proposed UN Security Council resolutions supporting the [[PLO]] and calling for a two-state solution to the [[Israeli-Palestinian conflict]].<ref>[http://books.google.ca/books?id=CHL5SwGvobQC&pg=PA168&dq=US+veto+Israel+regularly#v=onepage&q=US%20veto%20Israel%20regularly&f=false Pirates and emperors, old and new: international terrorism in the real world], [[Noam Chomsky]], p. 168.</ref><ref>The US has also used its veto to block resolutions that are critical of Israel.[http://books.google.ca/books?id=yzmpDAz7ZAwC&pg=PT251&dq=US+veto+Israel+regularly&lr=#v=onepage&q=US%20veto%20Israel%20regularly&f=false Uneasy neighbors], David T. Jones and David Kilgour, p. 235.</ref> The United States responded to the frequent criticism from UN organs by adopting the [[Negroponte doctrine]]. \r"
+7 + "\r"
+8 + " \r"
+9 + "\r"
+248 + "==References==\r"
+249 + "{{reflist}}\r"
+250 + "\r"
diff --git a/lib/text/diff/testdata/Psusennes_II_diff_LevelLines b/lib/text/diff/testdata/Psusennes_II_diff_LevelLines
index 2d4de759..bd078304 100644
--- a/lib/text/diff/testdata/Psusennes_II_diff_LevelLines
+++ b/lib/text/diff/testdata/Psusennes_II_diff_LevelLines
@@ -1,67 +1,67 @@
++++
-53 + "{{DEFAULTSORT:Psusennes Ii}}\r"
+54 + "{{DEFAULTSORT:Psusennes Ii}}\r"
--++
-0 - "{{Pharaoh Infobox | \r"
-0 + "{{Infobox pharaoh\r"
-1 - " Name= Psusennes II | \r"
-1 + "| Name= Psusennes II \r"
-2 - " Alt= Pasebakhaenniut II<ref>[http://www.digitalegypt.ucl.ac.uk/chronology/psusennesii.html Pasebakhenniut II]</ref> |\r"
-2 + "| Alt= Pasebakhaenniut II<ref>[http://www.digitalegypt.ucl.ac.uk/chronology/psusennesii.html Pasebakhenniut II]</ref> \r"
-3 - " Image= |\r"
-3 + "| Image= \r"
-4 - " NomenHiero= <hiero>M17-Y5:N35:U7-G40-N14*N28-N35:O49</hiero>|\r"
-4 + "| NomenHiero= <hiero>M17-Y5:N35:U7-G40-N14*N28-N35:O49</hiero>\r"
-5 - " Nomen=''Hor-Pasebakhaenniut''|\r"
-5 + "| Nomen=''Hor-Pasebakhaenniut''\r"
-6 - " PrenomenHiero= <hiero>ra:D17-xpr-Z3-stp:n-ra</hiero>|\r"
-6 + "| PrenomenHiero= <hiero>ra:D17-xpr-Z3-stp:n-ra</hiero>\r"
-7 - "Prenomen=''Titkheperure/Tyetkheperre''|\r"
-7 + "|Prenomen=''Titkheperure/Tyetkheperre''\r"
-8 - " Golden= |\r"
-8 + "| Golden= \r"
-9 - " Nebty= |\r"
-9 + "| Nebty= \r"
-10 - " Horus= |\r"
-10 + "| Horus= \r"
-11 - " GoldenHiero= | \r"
-11 + "| GoldenHiero= \r"
-12 - " NebtyHiero= |\r"
-12 + "| NebtyHiero= \r"
-13 - " HorusHiero= |\r"
-13 + "| HorusHiero= \r"
-14 - " Reign=967 &ndash; 943 BC | \r"
-14 + "| Reign=967 &ndash; 943 BC \r"
-15 - " Predecessor= [[Siamun]] |\r"
-15 + "| Predecessor= [[Siamun]] \r"
-16 - " Successor= [[Shoshenq I]] |\r"
-16 + "| Successor= [[Shoshenq I]] \r"
-17 - " Spouse= |\r"
-17 + "| Spouse= \r"
-18 - " Children= [[Maatkare (daughter of Psusennes II)|Maatkare]] |\r"
-18 + "| Children= [[Maatkare (daughter of Psusennes II)|Maatkare]] \r"
-19 - " Dynasty= [[Twenty-first dynasty of Egypt|21st Dynasty]] |\r"
-19 + "| Dynasty= [[Twenty-first dynasty of Egypt|21st Dynasty]] \r"
-20 - " Father= |\r"
-20 + "| Father= \r"
-21 - " Mother= |\r"
-21 + "| Mother= \r"
-22 - " Died= [[943 BC]] |\r"
-22 + "| Died= [[943 BC]] \r"
-23 - " Burial= Unknown |\r"
-23 + "| Burial= Unknown \r"
-24 - " Monuments= |\r"
-24 + "| Monuments=\r"
-29 - "Items which can be added to this list include a Year 5 Mummy linen that was written with the High Priest Psusennes III's name. It is generally assumed that a '''Year 13 III Peret 10+X''' date in fragment 3B, line 6 of the Karnak Priestly Annals belongs to his reign.<ref>K.A. Kitchen, The Third Intermediate Period in Egypt (1100–650 BC) 3rd ed., Warminster: Aris & Phillips Ltd, p.423</ref> Unfortunately, however, the king's name is not stated and the only thing which is certain is that the fragment must be dated after Siamun's reign whose Year 17 is mentioned in lines 3-5.<ref>Kitchen, p.423</ref> Hence, it belongs to either Psusennes II or possibly Shoshenq I's reign. More impressive are the number of objects which associate Psusennes II together with his successor, Shoshenq I, such as an old statue of [[Thutmose III]] which contains two parallel columns of texts &ndash; one referring to Psusennes II and the other to [[Shoshenq I]] &ndash; a recently unearthed block from [[Basta]] which preserves the nomen of Shoshenq I together with the prenomen of Psusennes II, and a now lost graffito from [[TT18|Theban Tomb 18]].<ref>Aidan Dodson, \"Psusennes II and Shoshenq I,\" JEA 79(1993), pp.267-268</ref> \r"
-29 + "Items which can be added to this list include a Year 5 Mummy linen that was written with the High Priest Psusennes III's name. It is generally assumed that a '''Year 13 III Peret 10+X''' date in fragment 3B, line 6 of the Karnak Priestly Annals belongs to his reign.<ref>K.A. Kitchen, The Third Intermediate Period in Egypt (1100–650 BC) 3rd ed., Warminster: Aris & Phillips Ltd, p.423</ref> Unfortunately, however, the king's name is not stated and the only thing which is certain is that the fragment must be dated after Siamun's reign whose Year 17 is mentioned in lines 3-5.<ref name=\"Kitchen, p.423\">Kitchen, p.423</ref> Hence, it belongs to either Psusennes II or possibly Shoshenq I's reign. More impressive are the number of objects which associate Psusennes II together with his successor, Shoshenq I, such as an old statue of [[Thutmose III]] which contains two parallel columns of texts &ndash; one referring to Psusennes II and the other to [[Shoshenq I]] &ndash; a recently unearthed block from [[Basta]] which preserves the nomen of Shoshenq I together with the prenomen of Psusennes II, and a now lost graffito from [[TT18|Theban Tomb 18]].<ref>Aidan Dodson, \"Psusennes II and Shoshenq I,\" JEA 79(1993), pp.267-268</ref> \r"
-31 - "Recently, the first conclusive date for king Psusennes II was revealed in a newly published priestly annal stone block. This document, which has been designated as 'Block Karnak 94, CL 2149,' records the induction of a priest named Nesankhefenmaat into the chapel of Amun-Re within the Karnak precint in Year 11 the first month of Shemu day 13 of a king named Psusennes.<ref>Frederic Payraudeau, ''De nouvelles annales sacerdotales de Siamon, Psousennès II et Osorkon Ier.'', BIFAO 108 (2008), p.294</ref> The preceding line of this document recorded the induction of Nesankhefenmaat's father, a certain Nesamun, into the priesthood of Amun-Re in king Siamun's reign.<ref>Payraudeau, BIFAO 108, p.294</ref> Siamun was the predecessor of Psusennes II at Tanis. The identification of the aforementioned Psusennes with Psusennes II is certain since the same fragmentary annal document next records--in the following line--the induction of Hor, the son of Nesankhefenmaat, into the priesthood of the chapel of Amun-Re at Karnak in Year 3 the second month of Akhet day 14 of king Osorkon I's reign just one generation later.<ref>Payraudeau, BIFAO 108, p.294</ref> Therefore, the Year 11 date can only be assigned to Psusennes II and constitutes the first securely attested date for this pharaoh's reign. \r"
-31 + "Recently, the first conclusive date for king Psusennes II was revealed in a newly published priestly annal stone block. This document, which has been designated as 'Block Karnak 94, CL 2149,' records the induction of a priest named Nesankhefenmaat into the chapel of Amun-Re within the Karnak precint in Year 11 the first month of Shemu day 13 of a king named Psusennes.<ref>Frederic Payraudeau, ''De nouvelles annales sacerdotales de Siamon, Psousennès II et Osorkon Ier.'', BIFAO 108 (2008), p.294</ref> The preceding line of this document recorded the induction of Nesankhefenmaat's father, a certain Nesamun, into the priesthood of Amun-Re in king Siamun's reign.<ref name=\"Payraudeau, BIFAO 108, p.294\">Payraudeau, BIFAO 108, p.294</ref> Siamun was the predecessor of Psusennes II at Tanis. The identification of the aforementioned Psusennes with Psusennes II is certain since the same fragmentary annal document next records—in the following line—the induction of Hor, the son of Nesankhefenmaat, into the priesthood of the chapel of Amun-Re at Karnak in Year 3 the second month of Akhet day 14 of king Osorkon I's reign just one generation later.<ref name=\"Payraudeau, BIFAO 108, p.294\"/> Therefore, the Year 11 date can only be assigned to Psusennes II and constitutes the first securely attested date for this pharaoh's reign. \r"
-36 - "In Year 5 of Shoshenq I, this king and the founder of the 22nd Dynasty dispatched a certain [[Meshwesh|Ma]] (ie. Libyan) subordinate named Wayheset to the desert oasis town of Dakhla in order to restore the king's authority over the western oasis region of Upper Egypt. Wayheset's titles include Prince and Governor of the Oasis. His activities are recorded in the Large Dakhla stela.<ref>Kitchen, p.290</ref> This stela states that Wayheset adjudicated in a certain water dispute by consulting a land-register which is explicitly dated to Year 19 of a \"Pharaoh Psusennes\" in order to determine the water rights of a man named Nysu-Bastet.<ref>[[Alan H. Gardiner]], The Large Dakhla stela, JEA 19 (1930), pp.19-30</ref> Kitchen notes that this individual made an appeal to the Year 19 cadastral land-register of king Psusennes which belonged to his mother which historians assumed was made some \"80 years\" ago during the reign of Psusennes I.<ref>Kitchen, p.290</ref> The land register recorded that certain water rights were formerly owned by Nysu-Bastet's mother Tewhunet in Year 19 of a king Psusennes. This ruler was generally assumed by Egyptologists to be Psusennes I rather than Psusennes II since the latter's reign was believed to have lasted only 14-15 years. Based on the land register evidence, Wayheset ordered that these watering rights should now be granted to Nysu-Bastet himself. However, if the oracle dated to Year 19 of Psusennes I as many scholars traditionally assumed, Nysu-Bastet would have been separated from his mother by a total of 80 years from this date into Year 5 of Shoshenq I--a figure which is highly unlikely since Nysu-Bastet would not have waited until extreme old age to uphold his mother's watering rights. This implies that the aforementioned king Psusennes here must be identified with Psusennes II instead--Shoshenq I's immediate predecessor and, more significantly, that Psusennes II enjoyed a minimum reign of 19 years. \r"
-36 + "In Year 5 of Shoshenq I, this king and the founder of the 22nd Dynasty dispatched a certain [[Meshwesh|Ma]] (ie. Libyan) subordinate named Wayheset to the desert oasis town of Dakhla in order to restore the king's authority over the western oasis region of Upper Egypt. Wayheset's titles include Prince and Governor of the Oasis. His activities are recorded in the Large Dakhla stela.<ref name=\"Kitchen, p.290\">Kitchen, p.290</ref> This stela states that Wayheset adjudicated in a certain water dispute by consulting a land-register which is explicitly dated to Year 19 of a \"Pharaoh Psusennes\" in order to determine the water rights of a man named Nysu-Bastet.<ref>[[Alan H. Gardiner]], The Large Dakhla stela, JEA 19 (1930), pp.19-30</ref> Kitchen notes that this individual made an appeal to the Year 19 cadastral land-register of king Psusennes which belonged to his mother which historians assumed was made some \"80 years\" ago during the reign of Psusennes I.<ref name=\"Kitchen, p.290\"/> The land register recorded that certain water rights were formerly owned by Nysu-Bastet's mother Tewhunet in Year 19 of a king Psusennes. This ruler was generally assumed by Egyptologists to be Psusennes I rather than Psusennes II since the latter's reign was believed to have lasted only 14–15 years. Based on the land register evidence, Wayheset ordered that these watering rights should now be granted to Nysu-Bastet himself. However, if the oracle dated to Year 19 of Psusennes I as many scholars traditionally assumed, Nysu-Bastet would have been separated from his mother by a total of 80 years from this date into Year 5 of Shoshenq I—a figure which is highly unlikely since Nysu-Bastet would not have waited until extreme old age to uphold his mother's watering rights. This implies that the aforementioned king Psusennes here must be identified with Psusennes II instead—Shoshenq I's immediate predecessor and, more significantly, that Psusennes II enjoyed a minimum reign of 19 years. \r"
-38 - "The term \"mother\" in ancient Egypt could also be an allusion to an ancestress, the matriarch of a lineage whereby Nysu-Bastet may have been petitioning for his hereditary water rights that belonged to his grandmother, whose family name was Tewhunet. However, this argument does not account for the use of Pharaoh as a title in the Dakhla stela--a literary device which first occurs late during the reign of Siamun, an Egyptian king who ruled between 45 to 64 years after Year 19 of Psusennes I. \r"
-38 + "The term \"mother\" in ancient Egypt could also be an allusion to an ancestress, the matriarch of a lineage whereby Nysu-Bastet may have been petitioning for his hereditary water rights that belonged to his grandmother, whose family name was Tewhunet. However, this argument does not account for the use of Pharaoh as a title in the Dakhla stela—a literary device which first occurs late during the reign of Siamun, an Egyptian king who ruled between 45 to 64 years after Year 19 of Psusennes I. \r"
-40 - "The most significant component of the Great Dakhla stela is its palaeography: the use of the title Pharaoh Psusennes. A scholar named Helen Jacquet-Gordon believed in the 1970s that the large Dakhla stela belonged to [[Shoshenq III]]'s reign due to its use of the title 'Pharaoh' directly with the ruling king's birth name--ie: \"'''Pharaoh Shoshenq'''\"--which was an important palaeographical development in Egyptian history. Throughout the Old, Middle and New Kingdoms of Ancient Egypt, the word pharaoh was never employed as a title such as Mr. and Mrs. or attached to a king's [[Ancient Egyptian royal titulary#Personal name (nomen)|nomen]] such as ''Pharaoh Ramesses'' or ''Pharaoh Amenhotep''; instead, the word '''pr-`3''' or pharaoh was used as a noun to refer to the ''activities'' of the king (i.e., it was \"Pharaoh\" who ordered the creation of a temple or statue, or the digging of a well, etc.). Rolf Krauss aptly observes that the earliest attested use of the word pharaoh as a title is documented in Year 17 of the 21st Dynasty king [[Siamun]] from Karnak Priestly Annals fragment 3B<ref>J-M Kruchten, Les annales des prētres de Karnak (OLA) 1989. pp.47-48</ref> while a second use of the title ''''[Pharaoh] [birth name]'''' occurs during Psusennes II's reign where a hieratic graffito in the Ptah chapel of the Abydos temple of Seti I explicitly refers to Psusennes II as the \"High Priest of Amen-Re, King of the Gods, the Leader, '''Pharaoh Psusennes'''.\"<ref>M.A. Murray, The Osireion at Abydos (London, 1989), 36; pl. XXI</ref><ref>Krauss, DE 62, pp.43-44</ref> Consequently, the practice of attaching the title ''pr-`3'' or pharaoh with a king's royal birth name had already started prior to the beginning of Shoshenq I's reign, let alone Shoshenq III. Hence, the Shoshenq mentioned in the large Year 5 Dakhla stela must have been Shoshenq I while the Psusennes mentioned in the same document likewise can only be Psusennes II which means that only 5 years (or 10 years if Psusennes II ruled Egypt for 24 years) would separate Nysu-Bastet from his mother.<ref>Krauss, DE 62, pp.43-48</ref> The additional fact that the Large Dakhla stela contains a Year 5 IV Peret day 25 lunar date has helped date the aforementioned king Shoshenq's accession to 943 BC and demonstrates that the ruler here must be Shoshenq I, not Shoshenq III who ruled a century later.<ref>Krauss, DE 62, pp.43-48</ref> Helen Jacquet-Gordon did not know of the two prior examples pertaining to Siamun and Psusennes II.\r"
-40 + "The most significant component of the Great Dakhla stela is its palaeography: the use of the title Pharaoh Psusennes. A scholar named Helen Jacquet-Gordon believed in the 1970s that the large Dakhla stela belonged to [[Shoshenq III]]'s reign due to its use of the title 'Pharaoh' directly with the ruling king's birth name—ie: \"'''Pharaoh Shoshenq'''\"--which was an important palaeographical development in Egyptian history. Throughout the Old, Middle and New Kingdoms of Ancient Egypt, the word pharaoh was never employed as a title such as Mr. and Mrs. or attached to a king's [[Ancient Egyptian royal titulary#Personal name (nomen)|nomen]] such as ''Pharaoh Ramesses'' or ''Pharaoh Amenhotep''; instead, the word '''pr-`3''' or pharaoh was used as a noun to refer to the ''activities'' of the king (i.e., it was \"Pharaoh\" who ordered the creation of a temple or statue, or the digging of a well, etc.). Rolf Krauss aptly observes that the earliest attested use of the word pharaoh as a title is documented in Year 17 of the 21st Dynasty king [[Siamun]] from Karnak Priestly Annals fragment 3B<ref>J-M Kruchten, Les annales des prētres de Karnak (OLA) 1989. pp.47-48</ref> while a second use of the title ''''[Pharaoh] [birth name]'''' occurs during Psusennes II's reign where a hieratic graffito in the Ptah chapel of the Abydos temple of Seti I explicitly refers to Psusennes II as the \"High Priest of Amen-Re, King of the Gods, the Leader, '''Pharaoh Psusennes'''.\"<ref>M.A. Murray, The Osireion at Abydos (London, 1989), 36; pl. XXI</ref><ref>Krauss, DE 62, pp.43-44</ref> Consequently, the practice of attaching the title ''pr-`3'' or pharaoh with a king's royal birth name had already started prior to the beginning of Shoshenq I's reign, let alone Shoshenq III. Hence, the Shoshenq mentioned in the large Year 5 Dakhla stela must have been Shoshenq I while the Psusennes mentioned in the same document likewise can only be Psusennes II which means that only 5 years (or 10 years if Psusennes II ruled Egypt for 24 years) would separate Nysu-Bastet from his mother.<ref name=\"Krauss, DE 62, pp.43-48\">Krauss, DE 62, pp.43-48</ref> The additional fact that the Large Dakhla stela contains a Year 5 IV Peret day 25 lunar date has helped date the aforementioned king Shoshenq's accession to 943 BC and demonstrates that the ruler here must be Shoshenq I, not Shoshenq III who ruled a century later.<ref name=\"Krauss, DE 62, pp.43-48\"/> Helen Jacquet-Gordon did not know of the two prior examples pertaining to Siamun and Psusennes II.\r"
-43 - "The editors of the recent 2006 book on titled 'Handbook on Ancient Egyptian Chronology'--Erik Hornung, Rolf Krauss and David Warburton--accept this logical reasoning and have amended Manetho's original figure of 14 years for Psusennes II to 24 years instead to Psusennes II.<ref>Erik Hornung, Rolf Krauss & David Warburton (editors), Handbook of Ancient Egyptian Chronology (Handbook of Oriental Studies), Brill: 2006, p.474 & p.488</ref> This is not unprecedented since previous Egyptologists had previously amended the reign of Siamun by a decade from 9 years--as preserved in surviving copies of Manetho's Epitome--to 19 years based on certain Year 16 and Year 17 dates attested for the latter.<ref>Kitchen, p.423</ref> Psusennes II ruled Egypt for a minimum of 19 years based on the internal chronology of the Large Dakhla stela. However, a calculation of a lunar ''Tepi Shemu'' feast which records the induction of Hori son of Nespaneferhor into the Amun priesthood in regnal year 17 of [[Siamun]], Psusennes II's predecessor--demonstrates that this date was equivalent to 970 BC.<ref>Hornung, Krauss & Warburton, pp.474-475</ref> Since Siamun enjoyed a reign of 19 years, he would have died 2 years later in 968/967 BC and been succeeded by Psusennes II by 967 BC at the latest. Consequently, a reign of 24 years or 967-943 BC is now likely for Psusennes II; hence, his reign has been raised from 14 to 24 years.\r"
-43 + "The editors of the recent 2006 book on titled 'Handbook on Ancient Egyptian Chronology'--Erik Hornung, Rolf Krauss and David Warburton—accept this logical reasoning and have amended Manetho's original figure of 14 years for Psusennes II to 24 years instead to Psusennes II.<ref>Erik Hornung, Rolf Krauss & David Warburton (editors), Handbook of Ancient Egyptian Chronology (Handbook of Oriental Studies), Brill: 2006, p.474 & p.488</ref> This is not unprecedented since previous Egyptologists had previously amended the reign of Siamun by a decade from 9 years—as preserved in surviving copies of Manetho's Epitome—to 19 years based on certain Year 16 and Year 17 dates attested for the latter.<ref name=\"Kitchen, p.423\"/> Psusennes II ruled Egypt for a minimum of 19 years based on the internal chronology of the Large Dakhla stela. However, a calculation of a lunar ''Tepi Shemu'' feast which records the induction of Hori son of Nespaneferhor into the Amun priesthood in regnal year 17 of [[Siamun]], Psusennes II's predecessor—demonstrates that this date was equivalent to 970 BC.<ref>Hornung, Krauss & Warburton, pp.474-475</ref> Since Siamun enjoyed a reign of 19 years, he would have died 2 years later in 968/967 BC and been succeeded by Psusennes II by 967 BC at the latest. Consequently, a reign of 24 years or 967-943 BC is now likely for Psusennes II; hence, his reign has been raised from 14 to 24 years.\r"
-50 - "* Aidan Dodson, RdE 38(1987), pp.50-51.\r"
-50 + "* Aidan Dodson, RdE 38(1987), pp.&nbsp;50-51.\r"
+1 - "{{Pharaoh Infobox | \r"
+1 + "{{Infobox pharaoh\r"
+2 - " Name= Psusennes II | \r"
+2 + "| Name= Psusennes II \r"
+3 - " Alt= Pasebakhaenniut II<ref>[http://www.digitalegypt.ucl.ac.uk/chronology/psusennesii.html Pasebakhenniut II]</ref> |\r"
+3 + "| Alt= Pasebakhaenniut II<ref>[http://www.digitalegypt.ucl.ac.uk/chronology/psusennesii.html Pasebakhenniut II]</ref> \r"
+4 - " Image= |\r"
+4 + "| Image= \r"
+5 - " NomenHiero= <hiero>M17-Y5:N35:U7-G40-N14*N28-N35:O49</hiero>|\r"
+5 + "| NomenHiero= <hiero>M17-Y5:N35:U7-G40-N14*N28-N35:O49</hiero>\r"
+6 - " Nomen=''Hor-Pasebakhaenniut''|\r"
+6 + "| Nomen=''Hor-Pasebakhaenniut''\r"
+7 - " PrenomenHiero= <hiero>ra:D17-xpr-Z3-stp:n-ra</hiero>|\r"
+7 + "| PrenomenHiero= <hiero>ra:D17-xpr-Z3-stp:n-ra</hiero>\r"
+8 - "Prenomen=''Titkheperure/Tyetkheperre''|\r"
+8 + "|Prenomen=''Titkheperure/Tyetkheperre''\r"
+9 - " Golden= |\r"
+9 + "| Golden= \r"
+10 - " Nebty= |\r"
+10 + "| Nebty= \r"
+11 - " Horus= |\r"
+11 + "| Horus= \r"
+12 - " GoldenHiero= | \r"
+12 + "| GoldenHiero= \r"
+13 - " NebtyHiero= |\r"
+13 + "| NebtyHiero= \r"
+14 - " HorusHiero= |\r"
+14 + "| HorusHiero= \r"
+15 - " Reign=967 &ndash; 943 BC | \r"
+15 + "| Reign=967 &ndash; 943 BC \r"
+16 - " Predecessor= [[Siamun]] |\r"
+16 + "| Predecessor= [[Siamun]] \r"
+17 - " Successor= [[Shoshenq I]] |\r"
+17 + "| Successor= [[Shoshenq I]] \r"
+18 - " Spouse= |\r"
+18 + "| Spouse= \r"
+19 - " Children= [[Maatkare (daughter of Psusennes II)|Maatkare]] |\r"
+19 + "| Children= [[Maatkare (daughter of Psusennes II)|Maatkare]] \r"
+20 - " Dynasty= [[Twenty-first dynasty of Egypt|21st Dynasty]] |\r"
+20 + "| Dynasty= [[Twenty-first dynasty of Egypt|21st Dynasty]] \r"
+21 - " Father= |\r"
+21 + "| Father= \r"
+22 - " Mother= |\r"
+22 + "| Mother= \r"
+23 - " Died= [[943 BC]] |\r"
+23 + "| Died= [[943 BC]] \r"
+24 - " Burial= Unknown |\r"
+24 + "| Burial= Unknown \r"
+25 - " Monuments= |\r"
+25 + "| Monuments=\r"
+30 - "Items which can be added to this list include a Year 5 Mummy linen that was written with the High Priest Psusennes III's name. It is generally assumed that a '''Year 13 III Peret 10+X''' date in fragment 3B, line 6 of the Karnak Priestly Annals belongs to his reign.<ref>K.A. Kitchen, The Third Intermediate Period in Egypt (1100–650 BC) 3rd ed., Warminster: Aris & Phillips Ltd, p.423</ref> Unfortunately, however, the king's name is not stated and the only thing which is certain is that the fragment must be dated after Siamun's reign whose Year 17 is mentioned in lines 3-5.<ref>Kitchen, p.423</ref> Hence, it belongs to either Psusennes II or possibly Shoshenq I's reign. More impressive are the number of objects which associate Psusennes II together with his successor, Shoshenq I, such as an old statue of [[Thutmose III]] which contains two parallel columns of texts &ndash; one referring to Psusennes II and the other to [[Shoshenq I]] &ndash; a recently unearthed block from [[Basta]] which preserves the nomen of Shoshenq I together with the prenomen of Psusennes II, and a now lost graffito from [[TT18|Theban Tomb 18]].<ref>Aidan Dodson, \"Psusennes II and Shoshenq I,\" JEA 79(1993), pp.267-268</ref> \r"
+30 + "Items which can be added to this list include a Year 5 Mummy linen that was written with the High Priest Psusennes III's name. It is generally assumed that a '''Year 13 III Peret 10+X''' date in fragment 3B, line 6 of the Karnak Priestly Annals belongs to his reign.<ref>K.A. Kitchen, The Third Intermediate Period in Egypt (1100–650 BC) 3rd ed., Warminster: Aris & Phillips Ltd, p.423</ref> Unfortunately, however, the king's name is not stated and the only thing which is certain is that the fragment must be dated after Siamun's reign whose Year 17 is mentioned in lines 3-5.<ref name=\"Kitchen, p.423\">Kitchen, p.423</ref> Hence, it belongs to either Psusennes II or possibly Shoshenq I's reign. More impressive are the number of objects which associate Psusennes II together with his successor, Shoshenq I, such as an old statue of [[Thutmose III]] which contains two parallel columns of texts &ndash; one referring to Psusennes II and the other to [[Shoshenq I]] &ndash; a recently unearthed block from [[Basta]] which preserves the nomen of Shoshenq I together with the prenomen of Psusennes II, and a now lost graffito from [[TT18|Theban Tomb 18]].<ref>Aidan Dodson, \"Psusennes II and Shoshenq I,\" JEA 79(1993), pp.267-268</ref> \r"
+32 - "Recently, the first conclusive date for king Psusennes II was revealed in a newly published priestly annal stone block. This document, which has been designated as 'Block Karnak 94, CL 2149,' records the induction of a priest named Nesankhefenmaat into the chapel of Amun-Re within the Karnak precint in Year 11 the first month of Shemu day 13 of a king named Psusennes.<ref>Frederic Payraudeau, ''De nouvelles annales sacerdotales de Siamon, Psousennès II et Osorkon Ier.'', BIFAO 108 (2008), p.294</ref> The preceding line of this document recorded the induction of Nesankhefenmaat's father, a certain Nesamun, into the priesthood of Amun-Re in king Siamun's reign.<ref>Payraudeau, BIFAO 108, p.294</ref> Siamun was the predecessor of Psusennes II at Tanis. The identification of the aforementioned Psusennes with Psusennes II is certain since the same fragmentary annal document next records--in the following line--the induction of Hor, the son of Nesankhefenmaat, into the priesthood of the chapel of Amun-Re at Karnak in Year 3 the second month of Akhet day 14 of king Osorkon I's reign just one generation later.<ref>Payraudeau, BIFAO 108, p.294</ref> Therefore, the Year 11 date can only be assigned to Psusennes II and constitutes the first securely attested date for this pharaoh's reign. \r"
+32 + "Recently, the first conclusive date for king Psusennes II was revealed in a newly published priestly annal stone block. This document, which has been designated as 'Block Karnak 94, CL 2149,' records the induction of a priest named Nesankhefenmaat into the chapel of Amun-Re within the Karnak precint in Year 11 the first month of Shemu day 13 of a king named Psusennes.<ref>Frederic Payraudeau, ''De nouvelles annales sacerdotales de Siamon, Psousennès II et Osorkon Ier.'', BIFAO 108 (2008), p.294</ref> The preceding line of this document recorded the induction of Nesankhefenmaat's father, a certain Nesamun, into the priesthood of Amun-Re in king Siamun's reign.<ref name=\"Payraudeau, BIFAO 108, p.294\">Payraudeau, BIFAO 108, p.294</ref> Siamun was the predecessor of Psusennes II at Tanis. The identification of the aforementioned Psusennes with Psusennes II is certain since the same fragmentary annal document next records—in the following line—the induction of Hor, the son of Nesankhefenmaat, into the priesthood of the chapel of Amun-Re at Karnak in Year 3 the second month of Akhet day 14 of king Osorkon I's reign just one generation later.<ref name=\"Payraudeau, BIFAO 108, p.294\"/> Therefore, the Year 11 date can only be assigned to Psusennes II and constitutes the first securely attested date for this pharaoh's reign. \r"
+37 - "In Year 5 of Shoshenq I, this king and the founder of the 22nd Dynasty dispatched a certain [[Meshwesh|Ma]] (ie. Libyan) subordinate named Wayheset to the desert oasis town of Dakhla in order to restore the king's authority over the western oasis region of Upper Egypt. Wayheset's titles include Prince and Governor of the Oasis. His activities are recorded in the Large Dakhla stela.<ref>Kitchen, p.290</ref> This stela states that Wayheset adjudicated in a certain water dispute by consulting a land-register which is explicitly dated to Year 19 of a \"Pharaoh Psusennes\" in order to determine the water rights of a man named Nysu-Bastet.<ref>[[Alan H. Gardiner]], The Large Dakhla stela, JEA 19 (1930), pp.19-30</ref> Kitchen notes that this individual made an appeal to the Year 19 cadastral land-register of king Psusennes which belonged to his mother which historians assumed was made some \"80 years\" ago during the reign of Psusennes I.<ref>Kitchen, p.290</ref> The land register recorded that certain water rights were formerly owned by Nysu-Bastet's mother Tewhunet in Year 19 of a king Psusennes. This ruler was generally assumed by Egyptologists to be Psusennes I rather than Psusennes II since the latter's reign was believed to have lasted only 14-15 years. Based on the land register evidence, Wayheset ordered that these watering rights should now be granted to Nysu-Bastet himself. However, if the oracle dated to Year 19 of Psusennes I as many scholars traditionally assumed, Nysu-Bastet would have been separated from his mother by a total of 80 years from this date into Year 5 of Shoshenq I--a figure which is highly unlikely since Nysu-Bastet would not have waited until extreme old age to uphold his mother's watering rights. This implies that the aforementioned king Psusennes here must be identified with Psusennes II instead--Shoshenq I's immediate predecessor and, more significantly, that Psusennes II enjoyed a minimum reign of 19 years. \r"
+37 + "In Year 5 of Shoshenq I, this king and the founder of the 22nd Dynasty dispatched a certain [[Meshwesh|Ma]] (ie. Libyan) subordinate named Wayheset to the desert oasis town of Dakhla in order to restore the king's authority over the western oasis region of Upper Egypt. Wayheset's titles include Prince and Governor of the Oasis. His activities are recorded in the Large Dakhla stela.<ref name=\"Kitchen, p.290\">Kitchen, p.290</ref> This stela states that Wayheset adjudicated in a certain water dispute by consulting a land-register which is explicitly dated to Year 19 of a \"Pharaoh Psusennes\" in order to determine the water rights of a man named Nysu-Bastet.<ref>[[Alan H. Gardiner]], The Large Dakhla stela, JEA 19 (1930), pp.19-30</ref> Kitchen notes that this individual made an appeal to the Year 19 cadastral land-register of king Psusennes which belonged to his mother which historians assumed was made some \"80 years\" ago during the reign of Psusennes I.<ref name=\"Kitchen, p.290\"/> The land register recorded that certain water rights were formerly owned by Nysu-Bastet's mother Tewhunet in Year 19 of a king Psusennes. This ruler was generally assumed by Egyptologists to be Psusennes I rather than Psusennes II since the latter's reign was believed to have lasted only 14–15 years. Based on the land register evidence, Wayheset ordered that these watering rights should now be granted to Nysu-Bastet himself. However, if the oracle dated to Year 19 of Psusennes I as many scholars traditionally assumed, Nysu-Bastet would have been separated from his mother by a total of 80 years from this date into Year 5 of Shoshenq I—a figure which is highly unlikely since Nysu-Bastet would not have waited until extreme old age to uphold his mother's watering rights. This implies that the aforementioned king Psusennes here must be identified with Psusennes II instead—Shoshenq I's immediate predecessor and, more significantly, that Psusennes II enjoyed a minimum reign of 19 years. \r"
+39 - "The term \"mother\" in ancient Egypt could also be an allusion to an ancestress, the matriarch of a lineage whereby Nysu-Bastet may have been petitioning for his hereditary water rights that belonged to his grandmother, whose family name was Tewhunet. However, this argument does not account for the use of Pharaoh as a title in the Dakhla stela--a literary device which first occurs late during the reign of Siamun, an Egyptian king who ruled between 45 to 64 years after Year 19 of Psusennes I. \r"
+39 + "The term \"mother\" in ancient Egypt could also be an allusion to an ancestress, the matriarch of a lineage whereby Nysu-Bastet may have been petitioning for his hereditary water rights that belonged to his grandmother, whose family name was Tewhunet. However, this argument does not account for the use of Pharaoh as a title in the Dakhla stela—a literary device which first occurs late during the reign of Siamun, an Egyptian king who ruled between 45 to 64 years after Year 19 of Psusennes I. \r"
+41 - "The most significant component of the Great Dakhla stela is its palaeography: the use of the title Pharaoh Psusennes. A scholar named Helen Jacquet-Gordon believed in the 1970s that the large Dakhla stela belonged to [[Shoshenq III]]'s reign due to its use of the title 'Pharaoh' directly with the ruling king's birth name--ie: \"'''Pharaoh Shoshenq'''\"--which was an important palaeographical development in Egyptian history. Throughout the Old, Middle and New Kingdoms of Ancient Egypt, the word pharaoh was never employed as a title such as Mr. and Mrs. or attached to a king's [[Ancient Egyptian royal titulary#Personal name (nomen)|nomen]] such as ''Pharaoh Ramesses'' or ''Pharaoh Amenhotep''; instead, the word '''pr-`3''' or pharaoh was used as a noun to refer to the ''activities'' of the king (i.e., it was \"Pharaoh\" who ordered the creation of a temple or statue, or the digging of a well, etc.). Rolf Krauss aptly observes that the earliest attested use of the word pharaoh as a title is documented in Year 17 of the 21st Dynasty king [[Siamun]] from Karnak Priestly Annals fragment 3B<ref>J-M Kruchten, Les annales des prētres de Karnak (OLA) 1989. pp.47-48</ref> while a second use of the title ''''[Pharaoh] [birth name]'''' occurs during Psusennes II's reign where a hieratic graffito in the Ptah chapel of the Abydos temple of Seti I explicitly refers to Psusennes II as the \"High Priest of Amen-Re, King of the Gods, the Leader, '''Pharaoh Psusennes'''.\"<ref>M.A. Murray, The Osireion at Abydos (London, 1989), 36; pl. XXI</ref><ref>Krauss, DE 62, pp.43-44</ref> Consequently, the practice of attaching the title ''pr-`3'' or pharaoh with a king's royal birth name had already started prior to the beginning of Shoshenq I's reign, let alone Shoshenq III. Hence, the Shoshenq mentioned in the large Year 5 Dakhla stela must have been Shoshenq I while the Psusennes mentioned in the same document likewise can only be Psusennes II which means that only 5 years (or 10 years if Psusennes II ruled Egypt for 24 years) would separate Nysu-Bastet from his mother.<ref>Krauss, DE 62, pp.43-48</ref> The additional fact that the Large Dakhla stela contains a Year 5 IV Peret day 25 lunar date has helped date the aforementioned king Shoshenq's accession to 943 BC and demonstrates that the ruler here must be Shoshenq I, not Shoshenq III who ruled a century later.<ref>Krauss, DE 62, pp.43-48</ref> Helen Jacquet-Gordon did not know of the two prior examples pertaining to Siamun and Psusennes II.\r"
+41 + "The most significant component of the Great Dakhla stela is its palaeography: the use of the title Pharaoh Psusennes. A scholar named Helen Jacquet-Gordon believed in the 1970s that the large Dakhla stela belonged to [[Shoshenq III]]'s reign due to its use of the title 'Pharaoh' directly with the ruling king's birth name—ie: \"'''Pharaoh Shoshenq'''\"--which was an important palaeographical development in Egyptian history. Throughout the Old, Middle and New Kingdoms of Ancient Egypt, the word pharaoh was never employed as a title such as Mr. and Mrs. or attached to a king's [[Ancient Egyptian royal titulary#Personal name (nomen)|nomen]] such as ''Pharaoh Ramesses'' or ''Pharaoh Amenhotep''; instead, the word '''pr-`3''' or pharaoh was used as a noun to refer to the ''activities'' of the king (i.e., it was \"Pharaoh\" who ordered the creation of a temple or statue, or the digging of a well, etc.). Rolf Krauss aptly observes that the earliest attested use of the word pharaoh as a title is documented in Year 17 of the 21st Dynasty king [[Siamun]] from Karnak Priestly Annals fragment 3B<ref>J-M Kruchten, Les annales des prētres de Karnak (OLA) 1989. pp.47-48</ref> while a second use of the title ''''[Pharaoh] [birth name]'''' occurs during Psusennes II's reign where a hieratic graffito in the Ptah chapel of the Abydos temple of Seti I explicitly refers to Psusennes II as the \"High Priest of Amen-Re, King of the Gods, the Leader, '''Pharaoh Psusennes'''.\"<ref>M.A. Murray, The Osireion at Abydos (London, 1989), 36; pl. XXI</ref><ref>Krauss, DE 62, pp.43-44</ref> Consequently, the practice of attaching the title ''pr-`3'' or pharaoh with a king's royal birth name had already started prior to the beginning of Shoshenq I's reign, let alone Shoshenq III. Hence, the Shoshenq mentioned in the large Year 5 Dakhla stela must have been Shoshenq I while the Psusennes mentioned in the same document likewise can only be Psusennes II which means that only 5 years (or 10 years if Psusennes II ruled Egypt for 24 years) would separate Nysu-Bastet from his mother.<ref name=\"Krauss, DE 62, pp.43-48\">Krauss, DE 62, pp.43-48</ref> The additional fact that the Large Dakhla stela contains a Year 5 IV Peret day 25 lunar date has helped date the aforementioned king Shoshenq's accession to 943 BC and demonstrates that the ruler here must be Shoshenq I, not Shoshenq III who ruled a century later.<ref name=\"Krauss, DE 62, pp.43-48\"/> Helen Jacquet-Gordon did not know of the two prior examples pertaining to Siamun and Psusennes II.\r"
+44 - "The editors of the recent 2006 book on titled 'Handbook on Ancient Egyptian Chronology'--Erik Hornung, Rolf Krauss and David Warburton--accept this logical reasoning and have amended Manetho's original figure of 14 years for Psusennes II to 24 years instead to Psusennes II.<ref>Erik Hornung, Rolf Krauss & David Warburton (editors), Handbook of Ancient Egyptian Chronology (Handbook of Oriental Studies), Brill: 2006, p.474 & p.488</ref> This is not unprecedented since previous Egyptologists had previously amended the reign of Siamun by a decade from 9 years--as preserved in surviving copies of Manetho's Epitome--to 19 years based on certain Year 16 and Year 17 dates attested for the latter.<ref>Kitchen, p.423</ref> Psusennes II ruled Egypt for a minimum of 19 years based on the internal chronology of the Large Dakhla stela. However, a calculation of a lunar ''Tepi Shemu'' feast which records the induction of Hori son of Nespaneferhor into the Amun priesthood in regnal year 17 of [[Siamun]], Psusennes II's predecessor--demonstrates that this date was equivalent to 970 BC.<ref>Hornung, Krauss & Warburton, pp.474-475</ref> Since Siamun enjoyed a reign of 19 years, he would have died 2 years later in 968/967 BC and been succeeded by Psusennes II by 967 BC at the latest. Consequently, a reign of 24 years or 967-943 BC is now likely for Psusennes II; hence, his reign has been raised from 14 to 24 years.\r"
+44 + "The editors of the recent 2006 book on titled 'Handbook on Ancient Egyptian Chronology'--Erik Hornung, Rolf Krauss and David Warburton—accept this logical reasoning and have amended Manetho's original figure of 14 years for Psusennes II to 24 years instead to Psusennes II.<ref>Erik Hornung, Rolf Krauss & David Warburton (editors), Handbook of Ancient Egyptian Chronology (Handbook of Oriental Studies), Brill: 2006, p.474 & p.488</ref> This is not unprecedented since previous Egyptologists had previously amended the reign of Siamun by a decade from 9 years—as preserved in surviving copies of Manetho's Epitome—to 19 years based on certain Year 16 and Year 17 dates attested for the latter.<ref name=\"Kitchen, p.423\"/> Psusennes II ruled Egypt for a minimum of 19 years based on the internal chronology of the Large Dakhla stela. However, a calculation of a lunar ''Tepi Shemu'' feast which records the induction of Hori son of Nespaneferhor into the Amun priesthood in regnal year 17 of [[Siamun]], Psusennes II's predecessor—demonstrates that this date was equivalent to 970 BC.<ref>Hornung, Krauss & Warburton, pp.474-475</ref> Since Siamun enjoyed a reign of 19 years, he would have died 2 years later in 968/967 BC and been succeeded by Psusennes II by 967 BC at the latest. Consequently, a reign of 24 years or 967-943 BC is now likely for Psusennes II; hence, his reign has been raised from 14 to 24 years.\r"
+51 - "* Aidan Dodson, RdE 38(1987), pp.50-51.\r"
+51 + "* Aidan Dodson, RdE 38(1987), pp.&nbsp;50-51.\r"
diff --git a/lib/text/diff/testdata/Psusennes_II_diff_LevelLines_reverse b/lib/text/diff/testdata/Psusennes_II_diff_LevelLines_reverse
index 3d584318..1444e683 100644
--- a/lib/text/diff/testdata/Psusennes_II_diff_LevelLines_reverse
+++ b/lib/text/diff/testdata/Psusennes_II_diff_LevelLines_reverse
@@ -1,67 +1,67 @@
----
-53 - "{{DEFAULTSORT:Psusennes Ii}}\r"
+54 - "{{DEFAULTSORT:Psusennes Ii}}\r"
--++
-0 - "{{Infobox pharaoh\r"
-0 + "{{Pharaoh Infobox | \r"
-1 - "| Name= Psusennes II \r"
-1 + " Name= Psusennes II | \r"
-2 - "| Alt= Pasebakhaenniut II<ref>[http://www.digitalegypt.ucl.ac.uk/chronology/psusennesii.html Pasebakhenniut II]</ref> \r"
-2 + " Alt= Pasebakhaenniut II<ref>[http://www.digitalegypt.ucl.ac.uk/chronology/psusennesii.html Pasebakhenniut II]</ref> |\r"
-3 - "| Image= \r"
-3 + " Image= |\r"
-4 - "| NomenHiero= <hiero>M17-Y5:N35:U7-G40-N14*N28-N35:O49</hiero>\r"
-4 + " NomenHiero= <hiero>M17-Y5:N35:U7-G40-N14*N28-N35:O49</hiero>|\r"
-5 - "| Nomen=''Hor-Pasebakhaenniut''\r"
-5 + " Nomen=''Hor-Pasebakhaenniut''|\r"
-6 - "| PrenomenHiero= <hiero>ra:D17-xpr-Z3-stp:n-ra</hiero>\r"
-6 + " PrenomenHiero= <hiero>ra:D17-xpr-Z3-stp:n-ra</hiero>|\r"
-7 - "|Prenomen=''Titkheperure/Tyetkheperre''\r"
-7 + "Prenomen=''Titkheperure/Tyetkheperre''|\r"
-8 - "| Golden= \r"
-8 + " Golden= |\r"
-9 - "| Nebty= \r"
-9 + " Nebty= |\r"
-10 - "| Horus= \r"
-10 + " Horus= |\r"
-11 - "| GoldenHiero= \r"
-11 + " GoldenHiero= | \r"
-12 - "| NebtyHiero= \r"
-12 + " NebtyHiero= |\r"
-13 - "| HorusHiero= \r"
-13 + " HorusHiero= |\r"
-14 - "| Reign=967 &ndash; 943 BC \r"
-14 + " Reign=967 &ndash; 943 BC | \r"
-15 - "| Predecessor= [[Siamun]] \r"
-15 + " Predecessor= [[Siamun]] |\r"
-16 - "| Successor= [[Shoshenq I]] \r"
-16 + " Successor= [[Shoshenq I]] |\r"
-17 - "| Spouse= \r"
-17 + " Spouse= |\r"
-18 - "| Children= [[Maatkare (daughter of Psusennes II)|Maatkare]] \r"
-18 + " Children= [[Maatkare (daughter of Psusennes II)|Maatkare]] |\r"
-19 - "| Dynasty= [[Twenty-first dynasty of Egypt|21st Dynasty]] \r"
-19 + " Dynasty= [[Twenty-first dynasty of Egypt|21st Dynasty]] |\r"
-20 - "| Father= \r"
-20 + " Father= |\r"
-21 - "| Mother= \r"
-21 + " Mother= |\r"
-22 - "| Died= [[943 BC]] \r"
-22 + " Died= [[943 BC]] |\r"
-23 - "| Burial= Unknown \r"
-23 + " Burial= Unknown |\r"
-24 - "| Monuments=\r"
-24 + " Monuments= |\r"
-29 - "Items which can be added to this list include a Year 5 Mummy linen that was written with the High Priest Psusennes III's name. It is generally assumed that a '''Year 13 III Peret 10+X''' date in fragment 3B, line 6 of the Karnak Priestly Annals belongs to his reign.<ref>K.A. Kitchen, The Third Intermediate Period in Egypt (1100–650 BC) 3rd ed., Warminster: Aris & Phillips Ltd, p.423</ref> Unfortunately, however, the king's name is not stated and the only thing which is certain is that the fragment must be dated after Siamun's reign whose Year 17 is mentioned in lines 3-5.<ref name=\"Kitchen, p.423\">Kitchen, p.423</ref> Hence, it belongs to either Psusennes II or possibly Shoshenq I's reign. More impressive are the number of objects which associate Psusennes II together with his successor, Shoshenq I, such as an old statue of [[Thutmose III]] which contains two parallel columns of texts &ndash; one referring to Psusennes II and the other to [[Shoshenq I]] &ndash; a recently unearthed block from [[Basta]] which preserves the nomen of Shoshenq I together with the prenomen of Psusennes II, and a now lost graffito from [[TT18|Theban Tomb 18]].<ref>Aidan Dodson, \"Psusennes II and Shoshenq I,\" JEA 79(1993), pp.267-268</ref> \r"
-29 + "Items which can be added to this list include a Year 5 Mummy linen that was written with the High Priest Psusennes III's name. It is generally assumed that a '''Year 13 III Peret 10+X''' date in fragment 3B, line 6 of the Karnak Priestly Annals belongs to his reign.<ref>K.A. Kitchen, The Third Intermediate Period in Egypt (1100–650 BC) 3rd ed., Warminster: Aris & Phillips Ltd, p.423</ref> Unfortunately, however, the king's name is not stated and the only thing which is certain is that the fragment must be dated after Siamun's reign whose Year 17 is mentioned in lines 3-5.<ref>Kitchen, p.423</ref> Hence, it belongs to either Psusennes II or possibly Shoshenq I's reign. More impressive are the number of objects which associate Psusennes II together with his successor, Shoshenq I, such as an old statue of [[Thutmose III]] which contains two parallel columns of texts &ndash; one referring to Psusennes II and the other to [[Shoshenq I]] &ndash; a recently unearthed block from [[Basta]] which preserves the nomen of Shoshenq I together with the prenomen of Psusennes II, and a now lost graffito from [[TT18|Theban Tomb 18]].<ref>Aidan Dodson, \"Psusennes II and Shoshenq I,\" JEA 79(1993), pp.267-268</ref> \r"
-31 - "Recently, the first conclusive date for king Psusennes II was revealed in a newly published priestly annal stone block. This document, which has been designated as 'Block Karnak 94, CL 2149,' records the induction of a priest named Nesankhefenmaat into the chapel of Amun-Re within the Karnak precint in Year 11 the first month of Shemu day 13 of a king named Psusennes.<ref>Frederic Payraudeau, ''De nouvelles annales sacerdotales de Siamon, Psousennès II et Osorkon Ier.'', BIFAO 108 (2008), p.294</ref> The preceding line of this document recorded the induction of Nesankhefenmaat's father, a certain Nesamun, into the priesthood of Amun-Re in king Siamun's reign.<ref name=\"Payraudeau, BIFAO 108, p.294\">Payraudeau, BIFAO 108, p.294</ref> Siamun was the predecessor of Psusennes II at Tanis. The identification of the aforementioned Psusennes with Psusennes II is certain since the same fragmentary annal document next records—in the following line—the induction of Hor, the son of Nesankhefenmaat, into the priesthood of the chapel of Amun-Re at Karnak in Year 3 the second month of Akhet day 14 of king Osorkon I's reign just one generation later.<ref name=\"Payraudeau, BIFAO 108, p.294\"/> Therefore, the Year 11 date can only be assigned to Psusennes II and constitutes the first securely attested date for this pharaoh's reign. \r"
-31 + "Recently, the first conclusive date for king Psusennes II was revealed in a newly published priestly annal stone block. This document, which has been designated as 'Block Karnak 94, CL 2149,' records the induction of a priest named Nesankhefenmaat into the chapel of Amun-Re within the Karnak precint in Year 11 the first month of Shemu day 13 of a king named Psusennes.<ref>Frederic Payraudeau, ''De nouvelles annales sacerdotales de Siamon, Psousennès II et Osorkon Ier.'', BIFAO 108 (2008), p.294</ref> The preceding line of this document recorded the induction of Nesankhefenmaat's father, a certain Nesamun, into the priesthood of Amun-Re in king Siamun's reign.<ref>Payraudeau, BIFAO 108, p.294</ref> Siamun was the predecessor of Psusennes II at Tanis. The identification of the aforementioned Psusennes with Psusennes II is certain since the same fragmentary annal document next records--in the following line--the induction of Hor, the son of Nesankhefenmaat, into the priesthood of the chapel of Amun-Re at Karnak in Year 3 the second month of Akhet day 14 of king Osorkon I's reign just one generation later.<ref>Payraudeau, BIFAO 108, p.294</ref> Therefore, the Year 11 date can only be assigned to Psusennes II and constitutes the first securely attested date for this pharaoh's reign. \r"
-36 - "In Year 5 of Shoshenq I, this king and the founder of the 22nd Dynasty dispatched a certain [[Meshwesh|Ma]] (ie. Libyan) subordinate named Wayheset to the desert oasis town of Dakhla in order to restore the king's authority over the western oasis region of Upper Egypt. Wayheset's titles include Prince and Governor of the Oasis. His activities are recorded in the Large Dakhla stela.<ref name=\"Kitchen, p.290\">Kitchen, p.290</ref> This stela states that Wayheset adjudicated in a certain water dispute by consulting a land-register which is explicitly dated to Year 19 of a \"Pharaoh Psusennes\" in order to determine the water rights of a man named Nysu-Bastet.<ref>[[Alan H. Gardiner]], The Large Dakhla stela, JEA 19 (1930), pp.19-30</ref> Kitchen notes that this individual made an appeal to the Year 19 cadastral land-register of king Psusennes which belonged to his mother which historians assumed was made some \"80 years\" ago during the reign of Psusennes I.<ref name=\"Kitchen, p.290\"/> The land register recorded that certain water rights were formerly owned by Nysu-Bastet's mother Tewhunet in Year 19 of a king Psusennes. This ruler was generally assumed by Egyptologists to be Psusennes I rather than Psusennes II since the latter's reign was believed to have lasted only 14–15 years. Based on the land register evidence, Wayheset ordered that these watering rights should now be granted to Nysu-Bastet himself. However, if the oracle dated to Year 19 of Psusennes I as many scholars traditionally assumed, Nysu-Bastet would have been separated from his mother by a total of 80 years from this date into Year 5 of Shoshenq I—a figure which is highly unlikely since Nysu-Bastet would not have waited until extreme old age to uphold his mother's watering rights. This implies that the aforementioned king Psusennes here must be identified with Psusennes II instead—Shoshenq I's immediate predecessor and, more significantly, that Psusennes II enjoyed a minimum reign of 19 years. \r"
-36 + "In Year 5 of Shoshenq I, this king and the founder of the 22nd Dynasty dispatched a certain [[Meshwesh|Ma]] (ie. Libyan) subordinate named Wayheset to the desert oasis town of Dakhla in order to restore the king's authority over the western oasis region of Upper Egypt. Wayheset's titles include Prince and Governor of the Oasis. His activities are recorded in the Large Dakhla stela.<ref>Kitchen, p.290</ref> This stela states that Wayheset adjudicated in a certain water dispute by consulting a land-register which is explicitly dated to Year 19 of a \"Pharaoh Psusennes\" in order to determine the water rights of a man named Nysu-Bastet.<ref>[[Alan H. Gardiner]], The Large Dakhla stela, JEA 19 (1930), pp.19-30</ref> Kitchen notes that this individual made an appeal to the Year 19 cadastral land-register of king Psusennes which belonged to his mother which historians assumed was made some \"80 years\" ago during the reign of Psusennes I.<ref>Kitchen, p.290</ref> The land register recorded that certain water rights were formerly owned by Nysu-Bastet's mother Tewhunet in Year 19 of a king Psusennes. This ruler was generally assumed by Egyptologists to be Psusennes I rather than Psusennes II since the latter's reign was believed to have lasted only 14-15 years. Based on the land register evidence, Wayheset ordered that these watering rights should now be granted to Nysu-Bastet himself. However, if the oracle dated to Year 19 of Psusennes I as many scholars traditionally assumed, Nysu-Bastet would have been separated from his mother by a total of 80 years from this date into Year 5 of Shoshenq I--a figure which is highly unlikely since Nysu-Bastet would not have waited until extreme old age to uphold his mother's watering rights. This implies that the aforementioned king Psusennes here must be identified with Psusennes II instead--Shoshenq I's immediate predecessor and, more significantly, that Psusennes II enjoyed a minimum reign of 19 years. \r"
-38 - "The term \"mother\" in ancient Egypt could also be an allusion to an ancestress, the matriarch of a lineage whereby Nysu-Bastet may have been petitioning for his hereditary water rights that belonged to his grandmother, whose family name was Tewhunet. However, this argument does not account for the use of Pharaoh as a title in the Dakhla stela—a literary device which first occurs late during the reign of Siamun, an Egyptian king who ruled between 45 to 64 years after Year 19 of Psusennes I. \r"
-38 + "The term \"mother\" in ancient Egypt could also be an allusion to an ancestress, the matriarch of a lineage whereby Nysu-Bastet may have been petitioning for his hereditary water rights that belonged to his grandmother, whose family name was Tewhunet. However, this argument does not account for the use of Pharaoh as a title in the Dakhla stela--a literary device which first occurs late during the reign of Siamun, an Egyptian king who ruled between 45 to 64 years after Year 19 of Psusennes I. \r"
-40 - "The most significant component of the Great Dakhla stela is its palaeography: the use of the title Pharaoh Psusennes. A scholar named Helen Jacquet-Gordon believed in the 1970s that the large Dakhla stela belonged to [[Shoshenq III]]'s reign due to its use of the title 'Pharaoh' directly with the ruling king's birth name—ie: \"'''Pharaoh Shoshenq'''\"--which was an important palaeographical development in Egyptian history. Throughout the Old, Middle and New Kingdoms of Ancient Egypt, the word pharaoh was never employed as a title such as Mr. and Mrs. or attached to a king's [[Ancient Egyptian royal titulary#Personal name (nomen)|nomen]] such as ''Pharaoh Ramesses'' or ''Pharaoh Amenhotep''; instead, the word '''pr-`3''' or pharaoh was used as a noun to refer to the ''activities'' of the king (i.e., it was \"Pharaoh\" who ordered the creation of a temple or statue, or the digging of a well, etc.). Rolf Krauss aptly observes that the earliest attested use of the word pharaoh as a title is documented in Year 17 of the 21st Dynasty king [[Siamun]] from Karnak Priestly Annals fragment 3B<ref>J-M Kruchten, Les annales des prētres de Karnak (OLA) 1989. pp.47-48</ref> while a second use of the title ''''[Pharaoh] [birth name]'''' occurs during Psusennes II's reign where a hieratic graffito in the Ptah chapel of the Abydos temple of Seti I explicitly refers to Psusennes II as the \"High Priest of Amen-Re, King of the Gods, the Leader, '''Pharaoh Psusennes'''.\"<ref>M.A. Murray, The Osireion at Abydos (London, 1989), 36; pl. XXI</ref><ref>Krauss, DE 62, pp.43-44</ref> Consequently, the practice of attaching the title ''pr-`3'' or pharaoh with a king's royal birth name had already started prior to the beginning of Shoshenq I's reign, let alone Shoshenq III. Hence, the Shoshenq mentioned in the large Year 5 Dakhla stela must have been Shoshenq I while the Psusennes mentioned in the same document likewise can only be Psusennes II which means that only 5 years (or 10 years if Psusennes II ruled Egypt for 24 years) would separate Nysu-Bastet from his mother.<ref name=\"Krauss, DE 62, pp.43-48\">Krauss, DE 62, pp.43-48</ref> The additional fact that the Large Dakhla stela contains a Year 5 IV Peret day 25 lunar date has helped date the aforementioned king Shoshenq's accession to 943 BC and demonstrates that the ruler here must be Shoshenq I, not Shoshenq III who ruled a century later.<ref name=\"Krauss, DE 62, pp.43-48\"/> Helen Jacquet-Gordon did not know of the two prior examples pertaining to Siamun and Psusennes II.\r"
-40 + "The most significant component of the Great Dakhla stela is its palaeography: the use of the title Pharaoh Psusennes. A scholar named Helen Jacquet-Gordon believed in the 1970s that the large Dakhla stela belonged to [[Shoshenq III]]'s reign due to its use of the title 'Pharaoh' directly with the ruling king's birth name--ie: \"'''Pharaoh Shoshenq'''\"--which was an important palaeographical development in Egyptian history. Throughout the Old, Middle and New Kingdoms of Ancient Egypt, the word pharaoh was never employed as a title such as Mr. and Mrs. or attached to a king's [[Ancient Egyptian royal titulary#Personal name (nomen)|nomen]] such as ''Pharaoh Ramesses'' or ''Pharaoh Amenhotep''; instead, the word '''pr-`3''' or pharaoh was used as a noun to refer to the ''activities'' of the king (i.e., it was \"Pharaoh\" who ordered the creation of a temple or statue, or the digging of a well, etc.). Rolf Krauss aptly observes that the earliest attested use of the word pharaoh as a title is documented in Year 17 of the 21st Dynasty king [[Siamun]] from Karnak Priestly Annals fragment 3B<ref>J-M Kruchten, Les annales des prētres de Karnak (OLA) 1989. pp.47-48</ref> while a second use of the title ''''[Pharaoh] [birth name]'''' occurs during Psusennes II's reign where a hieratic graffito in the Ptah chapel of the Abydos temple of Seti I explicitly refers to Psusennes II as the \"High Priest of Amen-Re, King of the Gods, the Leader, '''Pharaoh Psusennes'''.\"<ref>M.A. Murray, The Osireion at Abydos (London, 1989), 36; pl. XXI</ref><ref>Krauss, DE 62, pp.43-44</ref> Consequently, the practice of attaching the title ''pr-`3'' or pharaoh with a king's royal birth name had already started prior to the beginning of Shoshenq I's reign, let alone Shoshenq III. Hence, the Shoshenq mentioned in the large Year 5 Dakhla stela must have been Shoshenq I while the Psusennes mentioned in the same document likewise can only be Psusennes II which means that only 5 years (or 10 years if Psusennes II ruled Egypt for 24 years) would separate Nysu-Bastet from his mother.<ref>Krauss, DE 62, pp.43-48</ref> The additional fact that the Large Dakhla stela contains a Year 5 IV Peret day 25 lunar date has helped date the aforementioned king Shoshenq's accession to 943 BC and demonstrates that the ruler here must be Shoshenq I, not Shoshenq III who ruled a century later.<ref>Krauss, DE 62, pp.43-48</ref> Helen Jacquet-Gordon did not know of the two prior examples pertaining to Siamun and Psusennes II.\r"
-43 - "The editors of the recent 2006 book on titled 'Handbook on Ancient Egyptian Chronology'--Erik Hornung, Rolf Krauss and David Warburton—accept this logical reasoning and have amended Manetho's original figure of 14 years for Psusennes II to 24 years instead to Psusennes II.<ref>Erik Hornung, Rolf Krauss & David Warburton (editors), Handbook of Ancient Egyptian Chronology (Handbook of Oriental Studies), Brill: 2006, p.474 & p.488</ref> This is not unprecedented since previous Egyptologists had previously amended the reign of Siamun by a decade from 9 years—as preserved in surviving copies of Manetho's Epitome—to 19 years based on certain Year 16 and Year 17 dates attested for the latter.<ref name=\"Kitchen, p.423\"/> Psusennes II ruled Egypt for a minimum of 19 years based on the internal chronology of the Large Dakhla stela. However, a calculation of a lunar ''Tepi Shemu'' feast which records the induction of Hori son of Nespaneferhor into the Amun priesthood in regnal year 17 of [[Siamun]], Psusennes II's predecessor—demonstrates that this date was equivalent to 970 BC.<ref>Hornung, Krauss & Warburton, pp.474-475</ref> Since Siamun enjoyed a reign of 19 years, he would have died 2 years later in 968/967 BC and been succeeded by Psusennes II by 967 BC at the latest. Consequently, a reign of 24 years or 967-943 BC is now likely for Psusennes II; hence, his reign has been raised from 14 to 24 years.\r"
-43 + "The editors of the recent 2006 book on titled 'Handbook on Ancient Egyptian Chronology'--Erik Hornung, Rolf Krauss and David Warburton--accept this logical reasoning and have amended Manetho's original figure of 14 years for Psusennes II to 24 years instead to Psusennes II.<ref>Erik Hornung, Rolf Krauss & David Warburton (editors), Handbook of Ancient Egyptian Chronology (Handbook of Oriental Studies), Brill: 2006, p.474 & p.488</ref> This is not unprecedented since previous Egyptologists had previously amended the reign of Siamun by a decade from 9 years--as preserved in surviving copies of Manetho's Epitome--to 19 years based on certain Year 16 and Year 17 dates attested for the latter.<ref>Kitchen, p.423</ref> Psusennes II ruled Egypt for a minimum of 19 years based on the internal chronology of the Large Dakhla stela. However, a calculation of a lunar ''Tepi Shemu'' feast which records the induction of Hori son of Nespaneferhor into the Amun priesthood in regnal year 17 of [[Siamun]], Psusennes II's predecessor--demonstrates that this date was equivalent to 970 BC.<ref>Hornung, Krauss & Warburton, pp.474-475</ref> Since Siamun enjoyed a reign of 19 years, he would have died 2 years later in 968/967 BC and been succeeded by Psusennes II by 967 BC at the latest. Consequently, a reign of 24 years or 967-943 BC is now likely for Psusennes II; hence, his reign has been raised from 14 to 24 years.\r"
-50 - "* Aidan Dodson, RdE 38(1987), pp.&nbsp;50-51.\r"
-50 + "* Aidan Dodson, RdE 38(1987), pp.50-51.\r"
+1 - "{{Infobox pharaoh\r"
+1 + "{{Pharaoh Infobox | \r"
+2 - "| Name= Psusennes II \r"
+2 + " Name= Psusennes II | \r"
+3 - "| Alt= Pasebakhaenniut II<ref>[http://www.digitalegypt.ucl.ac.uk/chronology/psusennesii.html Pasebakhenniut II]</ref> \r"
+3 + " Alt= Pasebakhaenniut II<ref>[http://www.digitalegypt.ucl.ac.uk/chronology/psusennesii.html Pasebakhenniut II]</ref> |\r"
+4 - "| Image= \r"
+4 + " Image= |\r"
+5 - "| NomenHiero= <hiero>M17-Y5:N35:U7-G40-N14*N28-N35:O49</hiero>\r"
+5 + " NomenHiero= <hiero>M17-Y5:N35:U7-G40-N14*N28-N35:O49</hiero>|\r"
+6 - "| Nomen=''Hor-Pasebakhaenniut''\r"
+6 + " Nomen=''Hor-Pasebakhaenniut''|\r"
+7 - "| PrenomenHiero= <hiero>ra:D17-xpr-Z3-stp:n-ra</hiero>\r"
+7 + " PrenomenHiero= <hiero>ra:D17-xpr-Z3-stp:n-ra</hiero>|\r"
+8 - "|Prenomen=''Titkheperure/Tyetkheperre''\r"
+8 + "Prenomen=''Titkheperure/Tyetkheperre''|\r"
+9 - "| Golden= \r"
+9 + " Golden= |\r"
+10 - "| Nebty= \r"
+10 + " Nebty= |\r"
+11 - "| Horus= \r"
+11 + " Horus= |\r"
+12 - "| GoldenHiero= \r"
+12 + " GoldenHiero= | \r"
+13 - "| NebtyHiero= \r"
+13 + " NebtyHiero= |\r"
+14 - "| HorusHiero= \r"
+14 + " HorusHiero= |\r"
+15 - "| Reign=967 &ndash; 943 BC \r"
+15 + " Reign=967 &ndash; 943 BC | \r"
+16 - "| Predecessor= [[Siamun]] \r"
+16 + " Predecessor= [[Siamun]] |\r"
+17 - "| Successor= [[Shoshenq I]] \r"
+17 + " Successor= [[Shoshenq I]] |\r"
+18 - "| Spouse= \r"
+18 + " Spouse= |\r"
+19 - "| Children= [[Maatkare (daughter of Psusennes II)|Maatkare]] \r"
+19 + " Children= [[Maatkare (daughter of Psusennes II)|Maatkare]] |\r"
+20 - "| Dynasty= [[Twenty-first dynasty of Egypt|21st Dynasty]] \r"
+20 + " Dynasty= [[Twenty-first dynasty of Egypt|21st Dynasty]] |\r"
+21 - "| Father= \r"
+21 + " Father= |\r"
+22 - "| Mother= \r"
+22 + " Mother= |\r"
+23 - "| Died= [[943 BC]] \r"
+23 + " Died= [[943 BC]] |\r"
+24 - "| Burial= Unknown \r"
+24 + " Burial= Unknown |\r"
+25 - "| Monuments=\r"
+25 + " Monuments= |\r"
+30 - "Items which can be added to this list include a Year 5 Mummy linen that was written with the High Priest Psusennes III's name. It is generally assumed that a '''Year 13 III Peret 10+X''' date in fragment 3B, line 6 of the Karnak Priestly Annals belongs to his reign.<ref>K.A. Kitchen, The Third Intermediate Period in Egypt (1100–650 BC) 3rd ed., Warminster: Aris & Phillips Ltd, p.423</ref> Unfortunately, however, the king's name is not stated and the only thing which is certain is that the fragment must be dated after Siamun's reign whose Year 17 is mentioned in lines 3-5.<ref name=\"Kitchen, p.423\">Kitchen, p.423</ref> Hence, it belongs to either Psusennes II or possibly Shoshenq I's reign. More impressive are the number of objects which associate Psusennes II together with his successor, Shoshenq I, such as an old statue of [[Thutmose III]] which contains two parallel columns of texts &ndash; one referring to Psusennes II and the other to [[Shoshenq I]] &ndash; a recently unearthed block from [[Basta]] which preserves the nomen of Shoshenq I together with the prenomen of Psusennes II, and a now lost graffito from [[TT18|Theban Tomb 18]].<ref>Aidan Dodson, \"Psusennes II and Shoshenq I,\" JEA 79(1993), pp.267-268</ref> \r"
+30 + "Items which can be added to this list include a Year 5 Mummy linen that was written with the High Priest Psusennes III's name. It is generally assumed that a '''Year 13 III Peret 10+X''' date in fragment 3B, line 6 of the Karnak Priestly Annals belongs to his reign.<ref>K.A. Kitchen, The Third Intermediate Period in Egypt (1100–650 BC) 3rd ed., Warminster: Aris & Phillips Ltd, p.423</ref> Unfortunately, however, the king's name is not stated and the only thing which is certain is that the fragment must be dated after Siamun's reign whose Year 17 is mentioned in lines 3-5.<ref>Kitchen, p.423</ref> Hence, it belongs to either Psusennes II or possibly Shoshenq I's reign. More impressive are the number of objects which associate Psusennes II together with his successor, Shoshenq I, such as an old statue of [[Thutmose III]] which contains two parallel columns of texts &ndash; one referring to Psusennes II and the other to [[Shoshenq I]] &ndash; a recently unearthed block from [[Basta]] which preserves the nomen of Shoshenq I together with the prenomen of Psusennes II, and a now lost graffito from [[TT18|Theban Tomb 18]].<ref>Aidan Dodson, \"Psusennes II and Shoshenq I,\" JEA 79(1993), pp.267-268</ref> \r"
+32 - "Recently, the first conclusive date for king Psusennes II was revealed in a newly published priestly annal stone block. This document, which has been designated as 'Block Karnak 94, CL 2149,' records the induction of a priest named Nesankhefenmaat into the chapel of Amun-Re within the Karnak precint in Year 11 the first month of Shemu day 13 of a king named Psusennes.<ref>Frederic Payraudeau, ''De nouvelles annales sacerdotales de Siamon, Psousennès II et Osorkon Ier.'', BIFAO 108 (2008), p.294</ref> The preceding line of this document recorded the induction of Nesankhefenmaat's father, a certain Nesamun, into the priesthood of Amun-Re in king Siamun's reign.<ref name=\"Payraudeau, BIFAO 108, p.294\">Payraudeau, BIFAO 108, p.294</ref> Siamun was the predecessor of Psusennes II at Tanis. The identification of the aforementioned Psusennes with Psusennes II is certain since the same fragmentary annal document next records—in the following line—the induction of Hor, the son of Nesankhefenmaat, into the priesthood of the chapel of Amun-Re at Karnak in Year 3 the second month of Akhet day 14 of king Osorkon I's reign just one generation later.<ref name=\"Payraudeau, BIFAO 108, p.294\"/> Therefore, the Year 11 date can only be assigned to Psusennes II and constitutes the first securely attested date for this pharaoh's reign. \r"
+32 + "Recently, the first conclusive date for king Psusennes II was revealed in a newly published priestly annal stone block. This document, which has been designated as 'Block Karnak 94, CL 2149,' records the induction of a priest named Nesankhefenmaat into the chapel of Amun-Re within the Karnak precint in Year 11 the first month of Shemu day 13 of a king named Psusennes.<ref>Frederic Payraudeau, ''De nouvelles annales sacerdotales de Siamon, Psousennès II et Osorkon Ier.'', BIFAO 108 (2008), p.294</ref> The preceding line of this document recorded the induction of Nesankhefenmaat's father, a certain Nesamun, into the priesthood of Amun-Re in king Siamun's reign.<ref>Payraudeau, BIFAO 108, p.294</ref> Siamun was the predecessor of Psusennes II at Tanis. The identification of the aforementioned Psusennes with Psusennes II is certain since the same fragmentary annal document next records--in the following line--the induction of Hor, the son of Nesankhefenmaat, into the priesthood of the chapel of Amun-Re at Karnak in Year 3 the second month of Akhet day 14 of king Osorkon I's reign just one generation later.<ref>Payraudeau, BIFAO 108, p.294</ref> Therefore, the Year 11 date can only be assigned to Psusennes II and constitutes the first securely attested date for this pharaoh's reign. \r"
+37 - "In Year 5 of Shoshenq I, this king and the founder of the 22nd Dynasty dispatched a certain [[Meshwesh|Ma]] (ie. Libyan) subordinate named Wayheset to the desert oasis town of Dakhla in order to restore the king's authority over the western oasis region of Upper Egypt. Wayheset's titles include Prince and Governor of the Oasis. His activities are recorded in the Large Dakhla stela.<ref name=\"Kitchen, p.290\">Kitchen, p.290</ref> This stela states that Wayheset adjudicated in a certain water dispute by consulting a land-register which is explicitly dated to Year 19 of a \"Pharaoh Psusennes\" in order to determine the water rights of a man named Nysu-Bastet.<ref>[[Alan H. Gardiner]], The Large Dakhla stela, JEA 19 (1930), pp.19-30</ref> Kitchen notes that this individual made an appeal to the Year 19 cadastral land-register of king Psusennes which belonged to his mother which historians assumed was made some \"80 years\" ago during the reign of Psusennes I.<ref name=\"Kitchen, p.290\"/> The land register recorded that certain water rights were formerly owned by Nysu-Bastet's mother Tewhunet in Year 19 of a king Psusennes. This ruler was generally assumed by Egyptologists to be Psusennes I rather than Psusennes II since the latter's reign was believed to have lasted only 14–15 years. Based on the land register evidence, Wayheset ordered that these watering rights should now be granted to Nysu-Bastet himself. However, if the oracle dated to Year 19 of Psusennes I as many scholars traditionally assumed, Nysu-Bastet would have been separated from his mother by a total of 80 years from this date into Year 5 of Shoshenq I—a figure which is highly unlikely since Nysu-Bastet would not have waited until extreme old age to uphold his mother's watering rights. This implies that the aforementioned king Psusennes here must be identified with Psusennes II instead—Shoshenq I's immediate predecessor and, more significantly, that Psusennes II enjoyed a minimum reign of 19 years. \r"
+37 + "In Year 5 of Shoshenq I, this king and the founder of the 22nd Dynasty dispatched a certain [[Meshwesh|Ma]] (ie. Libyan) subordinate named Wayheset to the desert oasis town of Dakhla in order to restore the king's authority over the western oasis region of Upper Egypt. Wayheset's titles include Prince and Governor of the Oasis. His activities are recorded in the Large Dakhla stela.<ref>Kitchen, p.290</ref> This stela states that Wayheset adjudicated in a certain water dispute by consulting a land-register which is explicitly dated to Year 19 of a \"Pharaoh Psusennes\" in order to determine the water rights of a man named Nysu-Bastet.<ref>[[Alan H. Gardiner]], The Large Dakhla stela, JEA 19 (1930), pp.19-30</ref> Kitchen notes that this individual made an appeal to the Year 19 cadastral land-register of king Psusennes which belonged to his mother which historians assumed was made some \"80 years\" ago during the reign of Psusennes I.<ref>Kitchen, p.290</ref> The land register recorded that certain water rights were formerly owned by Nysu-Bastet's mother Tewhunet in Year 19 of a king Psusennes. This ruler was generally assumed by Egyptologists to be Psusennes I rather than Psusennes II since the latter's reign was believed to have lasted only 14-15 years. Based on the land register evidence, Wayheset ordered that these watering rights should now be granted to Nysu-Bastet himself. However, if the oracle dated to Year 19 of Psusennes I as many scholars traditionally assumed, Nysu-Bastet would have been separated from his mother by a total of 80 years from this date into Year 5 of Shoshenq I--a figure which is highly unlikely since Nysu-Bastet would not have waited until extreme old age to uphold his mother's watering rights. This implies that the aforementioned king Psusennes here must be identified with Psusennes II instead--Shoshenq I's immediate predecessor and, more significantly, that Psusennes II enjoyed a minimum reign of 19 years. \r"
+39 - "The term \"mother\" in ancient Egypt could also be an allusion to an ancestress, the matriarch of a lineage whereby Nysu-Bastet may have been petitioning for his hereditary water rights that belonged to his grandmother, whose family name was Tewhunet. However, this argument does not account for the use of Pharaoh as a title in the Dakhla stela—a literary device which first occurs late during the reign of Siamun, an Egyptian king who ruled between 45 to 64 years after Year 19 of Psusennes I. \r"
+39 + "The term \"mother\" in ancient Egypt could also be an allusion to an ancestress, the matriarch of a lineage whereby Nysu-Bastet may have been petitioning for his hereditary water rights that belonged to his grandmother, whose family name was Tewhunet. However, this argument does not account for the use of Pharaoh as a title in the Dakhla stela--a literary device which first occurs late during the reign of Siamun, an Egyptian king who ruled between 45 to 64 years after Year 19 of Psusennes I. \r"
+41 - "The most significant component of the Great Dakhla stela is its palaeography: the use of the title Pharaoh Psusennes. A scholar named Helen Jacquet-Gordon believed in the 1970s that the large Dakhla stela belonged to [[Shoshenq III]]'s reign due to its use of the title 'Pharaoh' directly with the ruling king's birth name—ie: \"'''Pharaoh Shoshenq'''\"--which was an important palaeographical development in Egyptian history. Throughout the Old, Middle and New Kingdoms of Ancient Egypt, the word pharaoh was never employed as a title such as Mr. and Mrs. or attached to a king's [[Ancient Egyptian royal titulary#Personal name (nomen)|nomen]] such as ''Pharaoh Ramesses'' or ''Pharaoh Amenhotep''; instead, the word '''pr-`3''' or pharaoh was used as a noun to refer to the ''activities'' of the king (i.e., it was \"Pharaoh\" who ordered the creation of a temple or statue, or the digging of a well, etc.). Rolf Krauss aptly observes that the earliest attested use of the word pharaoh as a title is documented in Year 17 of the 21st Dynasty king [[Siamun]] from Karnak Priestly Annals fragment 3B<ref>J-M Kruchten, Les annales des prētres de Karnak (OLA) 1989. pp.47-48</ref> while a second use of the title ''''[Pharaoh] [birth name]'''' occurs during Psusennes II's reign where a hieratic graffito in the Ptah chapel of the Abydos temple of Seti I explicitly refers to Psusennes II as the \"High Priest of Amen-Re, King of the Gods, the Leader, '''Pharaoh Psusennes'''.\"<ref>M.A. Murray, The Osireion at Abydos (London, 1989), 36; pl. XXI</ref><ref>Krauss, DE 62, pp.43-44</ref> Consequently, the practice of attaching the title ''pr-`3'' or pharaoh with a king's royal birth name had already started prior to the beginning of Shoshenq I's reign, let alone Shoshenq III. Hence, the Shoshenq mentioned in the large Year 5 Dakhla stela must have been Shoshenq I while the Psusennes mentioned in the same document likewise can only be Psusennes II which means that only 5 years (or 10 years if Psusennes II ruled Egypt for 24 years) would separate Nysu-Bastet from his mother.<ref name=\"Krauss, DE 62, pp.43-48\">Krauss, DE 62, pp.43-48</ref> The additional fact that the Large Dakhla stela contains a Year 5 IV Peret day 25 lunar date has helped date the aforementioned king Shoshenq's accession to 943 BC and demonstrates that the ruler here must be Shoshenq I, not Shoshenq III who ruled a century later.<ref name=\"Krauss, DE 62, pp.43-48\"/> Helen Jacquet-Gordon did not know of the two prior examples pertaining to Siamun and Psusennes II.\r"
+41 + "The most significant component of the Great Dakhla stela is its palaeography: the use of the title Pharaoh Psusennes. A scholar named Helen Jacquet-Gordon believed in the 1970s that the large Dakhla stela belonged to [[Shoshenq III]]'s reign due to its use of the title 'Pharaoh' directly with the ruling king's birth name--ie: \"'''Pharaoh Shoshenq'''\"--which was an important palaeographical development in Egyptian history. Throughout the Old, Middle and New Kingdoms of Ancient Egypt, the word pharaoh was never employed as a title such as Mr. and Mrs. or attached to a king's [[Ancient Egyptian royal titulary#Personal name (nomen)|nomen]] such as ''Pharaoh Ramesses'' or ''Pharaoh Amenhotep''; instead, the word '''pr-`3''' or pharaoh was used as a noun to refer to the ''activities'' of the king (i.e., it was \"Pharaoh\" who ordered the creation of a temple or statue, or the digging of a well, etc.). Rolf Krauss aptly observes that the earliest attested use of the word pharaoh as a title is documented in Year 17 of the 21st Dynasty king [[Siamun]] from Karnak Priestly Annals fragment 3B<ref>J-M Kruchten, Les annales des prētres de Karnak (OLA) 1989. pp.47-48</ref> while a second use of the title ''''[Pharaoh] [birth name]'''' occurs during Psusennes II's reign where a hieratic graffito in the Ptah chapel of the Abydos temple of Seti I explicitly refers to Psusennes II as the \"High Priest of Amen-Re, King of the Gods, the Leader, '''Pharaoh Psusennes'''.\"<ref>M.A. Murray, The Osireion at Abydos (London, 1989), 36; pl. XXI</ref><ref>Krauss, DE 62, pp.43-44</ref> Consequently, the practice of attaching the title ''pr-`3'' or pharaoh with a king's royal birth name had already started prior to the beginning of Shoshenq I's reign, let alone Shoshenq III. Hence, the Shoshenq mentioned in the large Year 5 Dakhla stela must have been Shoshenq I while the Psusennes mentioned in the same document likewise can only be Psusennes II which means that only 5 years (or 10 years if Psusennes II ruled Egypt for 24 years) would separate Nysu-Bastet from his mother.<ref>Krauss, DE 62, pp.43-48</ref> The additional fact that the Large Dakhla stela contains a Year 5 IV Peret day 25 lunar date has helped date the aforementioned king Shoshenq's accession to 943 BC and demonstrates that the ruler here must be Shoshenq I, not Shoshenq III who ruled a century later.<ref>Krauss, DE 62, pp.43-48</ref> Helen Jacquet-Gordon did not know of the two prior examples pertaining to Siamun and Psusennes II.\r"
+44 - "The editors of the recent 2006 book on titled 'Handbook on Ancient Egyptian Chronology'--Erik Hornung, Rolf Krauss and David Warburton—accept this logical reasoning and have amended Manetho's original figure of 14 years for Psusennes II to 24 years instead to Psusennes II.<ref>Erik Hornung, Rolf Krauss & David Warburton (editors), Handbook of Ancient Egyptian Chronology (Handbook of Oriental Studies), Brill: 2006, p.474 & p.488</ref> This is not unprecedented since previous Egyptologists had previously amended the reign of Siamun by a decade from 9 years—as preserved in surviving copies of Manetho's Epitome—to 19 years based on certain Year 16 and Year 17 dates attested for the latter.<ref name=\"Kitchen, p.423\"/> Psusennes II ruled Egypt for a minimum of 19 years based on the internal chronology of the Large Dakhla stela. However, a calculation of a lunar ''Tepi Shemu'' feast which records the induction of Hori son of Nespaneferhor into the Amun priesthood in regnal year 17 of [[Siamun]], Psusennes II's predecessor—demonstrates that this date was equivalent to 970 BC.<ref>Hornung, Krauss & Warburton, pp.474-475</ref> Since Siamun enjoyed a reign of 19 years, he would have died 2 years later in 968/967 BC and been succeeded by Psusennes II by 967 BC at the latest. Consequently, a reign of 24 years or 967-943 BC is now likely for Psusennes II; hence, his reign has been raised from 14 to 24 years.\r"
+44 + "The editors of the recent 2006 book on titled 'Handbook on Ancient Egyptian Chronology'--Erik Hornung, Rolf Krauss and David Warburton--accept this logical reasoning and have amended Manetho's original figure of 14 years for Psusennes II to 24 years instead to Psusennes II.<ref>Erik Hornung, Rolf Krauss & David Warburton (editors), Handbook of Ancient Egyptian Chronology (Handbook of Oriental Studies), Brill: 2006, p.474 & p.488</ref> This is not unprecedented since previous Egyptologists had previously amended the reign of Siamun by a decade from 9 years--as preserved in surviving copies of Manetho's Epitome--to 19 years based on certain Year 16 and Year 17 dates attested for the latter.<ref>Kitchen, p.423</ref> Psusennes II ruled Egypt for a minimum of 19 years based on the internal chronology of the Large Dakhla stela. However, a calculation of a lunar ''Tepi Shemu'' feast which records the induction of Hori son of Nespaneferhor into the Amun priesthood in regnal year 17 of [[Siamun]], Psusennes II's predecessor--demonstrates that this date was equivalent to 970 BC.<ref>Hornung, Krauss & Warburton, pp.474-475</ref> Since Siamun enjoyed a reign of 19 years, he would have died 2 years later in 968/967 BC and been succeeded by Psusennes II by 967 BC at the latest. Consequently, a reign of 24 years or 967-943 BC is now likely for Psusennes II; hence, his reign has been raised from 14 to 24 years.\r"
+51 - "* Aidan Dodson, RdE 38(1987), pp.&nbsp;50-51.\r"
+51 + "* Aidan Dodson, RdE 38(1987), pp.50-51.\r"
diff --git a/lib/text/diff/testdata/Psusennes_II_diff_LevelWords b/lib/text/diff/testdata/Psusennes_II_diff_LevelWords
index 2875d39d..6752360b 100644
--- a/lib/text/diff/testdata/Psusennes_II_diff_LevelWords
+++ b/lib/text/diff/testdata/Psusennes_II_diff_LevelWords
@@ -1,157 +1,157 @@
++++
-53 + "{{DEFAULTSORT:Psusennes Ii}}\r"
+54 + "{{DEFAULTSORT:Psusennes Ii}}\r"
--++
-0 - "{{Pharaoh Infobox | \r"
-0 + "{{Infobox pharaoh\r"
+1 - "{{Pharaoh Infobox | \r"
+1 + "{{Infobox pharaoh\r"
^2 - "Pharaoh "
^10 - "| "
^10 + "pharaoh"
-1 - " Name= Psusennes II | \r"
-1 + "| Name= Psusennes II \r"
+2 - " Name= Psusennes II | \r"
+2 + "| Name= Psusennes II \r"
^0 - " "
^3 - " "
^21 - " |"
^0 + "| "
-2 - " Alt= Pasebakhaenniut II<ref>[http://www.digitalegypt.ucl.ac.uk/chronology/psusennesii.html Pasebakhenniut II]</ref> |\r"
-2 + "| Alt= Pasebakhaenniut II<ref>[http://www.digitalegypt.ucl.ac.uk/chronology/psusennesii.html Pasebakhenniut II]</ref> \r"
+3 - " Alt= Pasebakhaenniut II<ref>[http://www.digitalegypt.ucl.ac.uk/chronology/psusennesii.html Pasebakhenniut II]</ref> |\r"
+3 + "| Alt= Pasebakhaenniut II<ref>[http://www.digitalegypt.ucl.ac.uk/chronology/psusennesii.html Pasebakhenniut II]</ref> \r"
^0 - " "
^3 - " "
^119 - "|"
^0 + "| "
-3 - " Image= |\r"
-3 + "| Image= \r"
+4 - " Image= |\r"
+4 + "| Image= \r"
^0 - " "
^3 - " "
^10 - "|"
^0 + "| "
-4 - " NomenHiero= <hiero>M17-Y5:N35:U7-G40-N14*N28-N35:O49</hiero>|\r"
-4 + "| NomenHiero= <hiero>M17-Y5:N35:U7-G40-N14*N28-N35:O49</hiero>\r"
+5 - " NomenHiero= <hiero>M17-Y5:N35:U7-G40-N14*N28-N35:O49</hiero>|\r"
+5 + "| NomenHiero= <hiero>M17-Y5:N35:U7-G40-N14*N28-N35:O49</hiero>\r"
^0 - " "
^3 - " "
^63 - "|"
^0 + "| "
-5 - " Nomen=''Hor-Pasebakhaenniut''|\r"
-5 + "| Nomen=''Hor-Pasebakhaenniut''\r"
+6 - " Nomen=''Hor-Pasebakhaenniut''|\r"
+6 + "| Nomen=''Hor-Pasebakhaenniut''\r"
^0 - " "
^3 - " "
^32 - "|"
^0 + "| "
-6 - " PrenomenHiero= <hiero>ra:D17-xpr-Z3-stp:n-ra</hiero>|\r"
-6 + "| PrenomenHiero= <hiero>ra:D17-xpr-Z3-stp:n-ra</hiero>\r"
+7 - " PrenomenHiero= <hiero>ra:D17-xpr-Z3-stp:n-ra</hiero>|\r"
+7 + "| PrenomenHiero= <hiero>ra:D17-xpr-Z3-stp:n-ra</hiero>\r"
^0 - " "
^3 - " "
^55 - "|"
^0 + "| "
-7 - "Prenomen=''Titkheperure/Tyetkheperre''|\r"
-7 + "|Prenomen=''Titkheperure/Tyetkheperre''\r"
+8 - "Prenomen=''Titkheperure/Tyetkheperre''|\r"
+8 + "|Prenomen=''Titkheperure/Tyetkheperre''\r"
^38 - "|"
^0 + "|"
-8 - " Golden= |\r"
-8 + "| Golden= \r"
+9 - " Golden= |\r"
+9 + "| Golden= \r"
^0 - " "
^3 - " "
^11 - "|"
^0 + "| "
-9 - " Nebty= |\r"
-9 + "| Nebty= \r"
+10 - " Nebty= |\r"
+10 + "| Nebty= \r"
^0 - " "
^3 - " "
^10 - "|"
^0 + "| "
-10 - " Horus= |\r"
-10 + "| Horus= \r"
+11 - " Horus= |\r"
+11 + "| Horus= \r"
^0 - " "
^3 - " "
^10 - "|"
^0 + "| "
-11 - " GoldenHiero= | \r"
-11 + "| GoldenHiero= \r"
+12 - " GoldenHiero= | \r"
+12 + "| GoldenHiero= \r"
^0 - " "
^3 - " "
^15 - " |"
^0 + "| "
-12 - " NebtyHiero= |\r"
-12 + "| NebtyHiero= \r"
+13 - " NebtyHiero= |\r"
+13 + "| NebtyHiero= \r"
^0 - " "
^3 - " "
^16 - "|"
^0 + "| "
-13 - " HorusHiero= |\r"
-13 + "| HorusHiero= \r"
+14 - " HorusHiero= |\r"
+14 + "| HorusHiero= \r"
^0 - " "
^3 - " "
^15 - "|"
^0 + "| "
-14 - " Reign=967 &ndash; 943 BC | \r"
-14 + "| Reign=967 &ndash; 943 BC \r"
+15 - " Reign=967 &ndash; 943 BC | \r"
+15 + "| Reign=967 &ndash; 943 BC \r"
^0 - " "
^3 - " "
^27 - " |"
^0 + "| "
-15 - " Predecessor= [[Siamun]] |\r"
-15 + "| Predecessor= [[Siamun]] \r"
+16 - " Predecessor= [[Siamun]] |\r"
+16 + "| Predecessor= [[Siamun]] \r"
^0 - " "
^3 - " "
^27 - "|"
^0 + "| "
-16 - " Successor= [[Shoshenq I]] |\r"
-16 + "| Successor= [[Shoshenq I]] \r"
+17 - " Successor= [[Shoshenq I]] |\r"
+17 + "| Successor= [[Shoshenq I]] \r"
^0 - " "
^3 - " "
^29 - "|"
^0 + "| "
-17 - " Spouse= |\r"
-17 + "| Spouse= \r"
+18 - " Spouse= |\r"
+18 + "| Spouse= \r"
^0 - " "
^3 - " "
^11 - "|"
^0 + "| "
-18 - " Children= [[Maatkare (daughter of Psusennes II)|Maatkare]] |\r"
-18 + "| Children= [[Maatkare (daughter of Psusennes II)|Maatkare]] \r"
+19 - " Children= [[Maatkare (daughter of Psusennes II)|Maatkare]] |\r"
+19 + "| Children= [[Maatkare (daughter of Psusennes II)|Maatkare]] \r"
^0 - " "
^3 - " "
^62 - "|"
^0 + "| "
-19 - " Dynasty= [[Twenty-first dynasty of Egypt|21st Dynasty]] |\r"
-19 + "| Dynasty= [[Twenty-first dynasty of Egypt|21st Dynasty]] \r"
+20 - " Dynasty= [[Twenty-first dynasty of Egypt|21st Dynasty]] |\r"
+20 + "| Dynasty= [[Twenty-first dynasty of Egypt|21st Dynasty]] \r"
^0 - " "
^60 - "|"
^0 + "|"
-20 - " Father= |\r"
-20 + "| Father= \r"
+21 - " Father= |\r"
+21 + "| Father= \r"
^0 - " "
^3 - " "
^11 - "|"
^0 + "| "
-21 - " Mother= |\r"
-21 + "| Mother= \r"
+22 - " Mother= |\r"
+22 + "| Mother= \r"
^0 - " "
^3 - " "
^11 - "|"
^0 + "| "
-22 - " Died= [[943 BC]] |\r"
-22 + "| Died= [[943 BC]] \r"
+23 - " Died= [[943 BC]] |\r"
+23 + "| Died= [[943 BC]] \r"
^0 - " "
^3 - " "
^20 - "|"
^0 + "| "
-23 - " Burial= Unknown |\r"
-23 + "| Burial= Unknown \r"
+24 - " Burial= Unknown |\r"
+24 + "| Burial= Unknown \r"
^0 - " "
^3 - " "
^19 - "|"
^0 + "| "
-24 - " Monuments= |\r"
-24 + "| Monuments=\r"
+25 - " Monuments= |\r"
+25 + "| Monuments=\r"
^0 - " "
^3 - " "
^13 - " |"
^0 + "| "
-29 - "Items which can be added to this list include a Year 5 Mummy linen that was written with the High Priest Psusennes III's name. It is generally assumed that a '''Year 13 III Peret 10+X''' date in fragment 3B, line 6 of the Karnak Priestly Annals belongs to his reign.<ref>K.A. Kitchen, The Third Intermediate Period in Egypt (1100–650 BC) 3rd ed., Warminster: Aris & Phillips Ltd, p.423</ref> Unfortunately, however, the king's name is not stated and the only thing which is certain is that the fragment must be dated after Siamun's reign whose Year 17 is mentioned in lines 3-5.<ref>Kitchen, p.423</ref> Hence, it belongs to either Psusennes II or possibly Shoshenq I's reign. More impressive are the number of objects which associate Psusennes II together with his successor, Shoshenq I, such as an old statue of [[Thutmose III]] which contains two parallel columns of texts &ndash; one referring to Psusennes II and the other to [[Shoshenq I]] &ndash; a recently unearthed block from [[Basta]] which preserves the nomen of Shoshenq I together with the prenomen of Psusennes II, and a now lost graffito from [[TT18|Theban Tomb 18]].<ref>Aidan Dodson, \"Psusennes II and Shoshenq I,\" JEA 79(1993), pp.267-268</ref> \r"
-29 + "Items which can be added to this list include a Year 5 Mummy linen that was written with the High Priest Psusennes III's name. It is generally assumed that a '''Year 13 III Peret 10+X''' date in fragment 3B, line 6 of the Karnak Priestly Annals belongs to his reign.<ref>K.A. Kitchen, The Third Intermediate Period in Egypt (1100–650 BC) 3rd ed., Warminster: Aris & Phillips Ltd, p.423</ref> Unfortunately, however, the king's name is not stated and the only thing which is certain is that the fragment must be dated after Siamun's reign whose Year 17 is mentioned in lines 3-5.<ref name=\"Kitchen, p.423\">Kitchen, p.423</ref> Hence, it belongs to either Psusennes II or possibly Shoshenq I's reign. More impressive are the number of objects which associate Psusennes II together with his successor, Shoshenq I, such as an old statue of [[Thutmose III]] which contains two parallel columns of texts &ndash; one referring to Psusennes II and the other to [[Shoshenq I]] &ndash; a recently unearthed block from [[Basta]] which preserves the nomen of Shoshenq I together with the prenomen of Psusennes II, and a now lost graffito from [[TT18|Theban Tomb 18]].<ref>Aidan Dodson, \"Psusennes II and Shoshenq I,\" JEA 79(1993), pp.267-268</ref> \r"
+30 - "Items which can be added to this list include a Year 5 Mummy linen that was written with the High Priest Psusennes III's name. It is generally assumed that a '''Year 13 III Peret 10+X''' date in fragment 3B, line 6 of the Karnak Priestly Annals belongs to his reign.<ref>K.A. Kitchen, The Third Intermediate Period in Egypt (1100–650 BC) 3rd ed., Warminster: Aris & Phillips Ltd, p.423</ref> Unfortunately, however, the king's name is not stated and the only thing which is certain is that the fragment must be dated after Siamun's reign whose Year 17 is mentioned in lines 3-5.<ref>Kitchen, p.423</ref> Hence, it belongs to either Psusennes II or possibly Shoshenq I's reign. More impressive are the number of objects which associate Psusennes II together with his successor, Shoshenq I, such as an old statue of [[Thutmose III]] which contains two parallel columns of texts &ndash; one referring to Psusennes II and the other to [[Shoshenq I]] &ndash; a recently unearthed block from [[Basta]] which preserves the nomen of Shoshenq I together with the prenomen of Psusennes II, and a now lost graffito from [[TT18|Theban Tomb 18]].<ref>Aidan Dodson, \"Psusennes II and Shoshenq I,\" JEA 79(1993), pp.267-268</ref> \r"
+30 + "Items which can be added to this list include a Year 5 Mummy linen that was written with the High Priest Psusennes III's name. It is generally assumed that a '''Year 13 III Peret 10+X''' date in fragment 3B, line 6 of the Karnak Priestly Annals belongs to his reign.<ref>K.A. Kitchen, The Third Intermediate Period in Egypt (1100–650 BC) 3rd ed., Warminster: Aris & Phillips Ltd, p.423</ref> Unfortunately, however, the king's name is not stated and the only thing which is certain is that the fragment must be dated after Siamun's reign whose Year 17 is mentioned in lines 3-5.<ref name=\"Kitchen, p.423\">Kitchen, p.423</ref> Hence, it belongs to either Psusennes II or possibly Shoshenq I's reign. More impressive are the number of objects which associate Psusennes II together with his successor, Shoshenq I, such as an old statue of [[Thutmose III]] which contains two parallel columns of texts &ndash; one referring to Psusennes II and the other to [[Shoshenq I]] &ndash; a recently unearthed block from [[Basta]] which preserves the nomen of Shoshenq I together with the prenomen of Psusennes II, and a now lost graffito from [[TT18|Theban Tomb 18]].<ref>Aidan Dodson, \"Psusennes II and Shoshenq I,\" JEA 79(1993), pp.267-268</ref> \r"
^584 + " name=\"Kitchen, p.423\""
-31 - "Recently, the first conclusive date for king Psusennes II was revealed in a newly published priestly annal stone block. This document, which has been designated as 'Block Karnak 94, CL 2149,' records the induction of a priest named Nesankhefenmaat into the chapel of Amun-Re within the Karnak precint in Year 11 the first month of Shemu day 13 of a king named Psusennes.<ref>Frederic Payraudeau, ''De nouvelles annales sacerdotales de Siamon, Psousennès II et Osorkon Ier.'', BIFAO 108 (2008), p.294</ref> The preceding line of this document recorded the induction of Nesankhefenmaat's father, a certain Nesamun, into the priesthood of Amun-Re in king Siamun's reign.<ref>Payraudeau, BIFAO 108, p.294</ref> Siamun was the predecessor of Psusennes II at Tanis. The identification of the aforementioned Psusennes with Psusennes II is certain since the same fragmentary annal document next records--in the following line--the induction of Hor, the son of Nesankhefenmaat, into the priesthood of the chapel of Amun-Re at Karnak in Year 3 the second month of Akhet day 14 of king Osorkon I's reign just one generation later.<ref>Payraudeau, BIFAO 108, p.294</ref> Therefore, the Year 11 date can only be assigned to Psusennes II and constitutes the first securely attested date for this pharaoh's reign. \r"
-31 + "Recently, the first conclusive date for king Psusennes II was revealed in a newly published priestly annal stone block. This document, which has been designated as 'Block Karnak 94, CL 2149,' records the induction of a priest named Nesankhefenmaat into the chapel of Amun-Re within the Karnak precint in Year 11 the first month of Shemu day 13 of a king named Psusennes.<ref>Frederic Payraudeau, ''De nouvelles annales sacerdotales de Siamon, Psousennès II et Osorkon Ier.'', BIFAO 108 (2008), p.294</ref> The preceding line of this document recorded the induction of Nesankhefenmaat's father, a certain Nesamun, into the priesthood of Amun-Re in king Siamun's reign.<ref name=\"Payraudeau, BIFAO 108, p.294\">Payraudeau, BIFAO 108, p.294</ref> Siamun was the predecessor of Psusennes II at Tanis. The identification of the aforementioned Psusennes with Psusennes II is certain since the same fragmentary annal document next records—in the following line—the induction of Hor, the son of Nesankhefenmaat, into the priesthood of the chapel of Amun-Re at Karnak in Year 3 the second month of Akhet day 14 of king Osorkon I's reign just one generation later.<ref name=\"Payraudeau, BIFAO 108, p.294\"/> Therefore, the Year 11 date can only be assigned to Psusennes II and constitutes the first securely attested date for this pharaoh's reign. \r"
+32 - "Recently, the first conclusive date for king Psusennes II was revealed in a newly published priestly annal stone block. This document, which has been designated as 'Block Karnak 94, CL 2149,' records the induction of a priest named Nesankhefenmaat into the chapel of Amun-Re within the Karnak precint in Year 11 the first month of Shemu day 13 of a king named Psusennes.<ref>Frederic Payraudeau, ''De nouvelles annales sacerdotales de Siamon, Psousennès II et Osorkon Ier.'', BIFAO 108 (2008), p.294</ref> The preceding line of this document recorded the induction of Nesankhefenmaat's father, a certain Nesamun, into the priesthood of Amun-Re in king Siamun's reign.<ref>Payraudeau, BIFAO 108, p.294</ref> Siamun was the predecessor of Psusennes II at Tanis. The identification of the aforementioned Psusennes with Psusennes II is certain since the same fragmentary annal document next records--in the following line--the induction of Hor, the son of Nesankhefenmaat, into the priesthood of the chapel of Amun-Re at Karnak in Year 3 the second month of Akhet day 14 of king Osorkon I's reign just one generation later.<ref>Payraudeau, BIFAO 108, p.294</ref> Therefore, the Year 11 date can only be assigned to Psusennes II and constitutes the first securely attested date for this pharaoh's reign. \r"
+32 + "Recently, the first conclusive date for king Psusennes II was revealed in a newly published priestly annal stone block. This document, which has been designated as 'Block Karnak 94, CL 2149,' records the induction of a priest named Nesankhefenmaat into the chapel of Amun-Re within the Karnak precint in Year 11 the first month of Shemu day 13 of a king named Psusennes.<ref>Frederic Payraudeau, ''De nouvelles annales sacerdotales de Siamon, Psousennès II et Osorkon Ier.'', BIFAO 108 (2008), p.294</ref> The preceding line of this document recorded the induction of Nesankhefenmaat's father, a certain Nesamun, into the priesthood of Amun-Re in king Siamun's reign.<ref name=\"Payraudeau, BIFAO 108, p.294\">Payraudeau, BIFAO 108, p.294</ref> Siamun was the predecessor of Psusennes II at Tanis. The identification of the aforementioned Psusennes with Psusennes II is certain since the same fragmentary annal document next records—in the following line—the induction of Hor, the son of Nesankhefenmaat, into the priesthood of the chapel of Amun-Re at Karnak in Year 3 the second month of Akhet day 14 of king Osorkon I's reign just one generation later.<ref name=\"Payraudeau, BIFAO 108, p.294\"/> Therefore, the Year 11 date can only be assigned to Psusennes II and constitutes the first securely attested date for this pharaoh's reign. \r"
^895 - "--"
^918 - "--"
^1124 - ">"
@@ -161,8 +161,8 @@
^919 + "—"
^1126 + " name=\""
^1161 + "\"/"
-36 - "In Year 5 of Shoshenq I, this king and the founder of the 22nd Dynasty dispatched a certain [[Meshwesh|Ma]] (ie. Libyan) subordinate named Wayheset to the desert oasis town of Dakhla in order to restore the king's authority over the western oasis region of Upper Egypt. Wayheset's titles include Prince and Governor of the Oasis. His activities are recorded in the Large Dakhla stela.<ref>Kitchen, p.290</ref> This stela states that Wayheset adjudicated in a certain water dispute by consulting a land-register which is explicitly dated to Year 19 of a \"Pharaoh Psusennes\" in order to determine the water rights of a man named Nysu-Bastet.<ref>[[Alan H. Gardiner]], The Large Dakhla stela, JEA 19 (1930), pp.19-30</ref> Kitchen notes that this individual made an appeal to the Year 19 cadastral land-register of king Psusennes which belonged to his mother which historians assumed was made some \"80 years\" ago during the reign of Psusennes I.<ref>Kitchen, p.290</ref> The land register recorded that certain water rights were formerly owned by Nysu-Bastet's mother Tewhunet in Year 19 of a king Psusennes. This ruler was generally assumed by Egyptologists to be Psusennes I rather than Psusennes II since the latter's reign was believed to have lasted only 14-15 years. Based on the land register evidence, Wayheset ordered that these watering rights should now be granted to Nysu-Bastet himself. However, if the oracle dated to Year 19 of Psusennes I as many scholars traditionally assumed, Nysu-Bastet would have been separated from his mother by a total of 80 years from this date into Year 5 of Shoshenq I--a figure which is highly unlikely since Nysu-Bastet would not have waited until extreme old age to uphold his mother's watering rights. This implies that the aforementioned king Psusennes here must be identified with Psusennes II instead--Shoshenq I's immediate predecessor and, more significantly, that Psusennes II enjoyed a minimum reign of 19 years. \r"
-36 + "In Year 5 of Shoshenq I, this king and the founder of the 22nd Dynasty dispatched a certain [[Meshwesh|Ma]] (ie. Libyan) subordinate named Wayheset to the desert oasis town of Dakhla in order to restore the king's authority over the western oasis region of Upper Egypt. Wayheset's titles include Prince and Governor of the Oasis. His activities are recorded in the Large Dakhla stela.<ref name=\"Kitchen, p.290\">Kitchen, p.290</ref> This stela states that Wayheset adjudicated in a certain water dispute by consulting a land-register which is explicitly dated to Year 19 of a \"Pharaoh Psusennes\" in order to determine the water rights of a man named Nysu-Bastet.<ref>[[Alan H. Gardiner]], The Large Dakhla stela, JEA 19 (1930), pp.19-30</ref> Kitchen notes that this individual made an appeal to the Year 19 cadastral land-register of king Psusennes which belonged to his mother which historians assumed was made some \"80 years\" ago during the reign of Psusennes I.<ref name=\"Kitchen, p.290\"/> The land register recorded that certain water rights were formerly owned by Nysu-Bastet's mother Tewhunet in Year 19 of a king Psusennes. This ruler was generally assumed by Egyptologists to be Psusennes I rather than Psusennes II since the latter's reign was believed to have lasted only 14–15 years. Based on the land register evidence, Wayheset ordered that these watering rights should now be granted to Nysu-Bastet himself. However, if the oracle dated to Year 19 of Psusennes I as many scholars traditionally assumed, Nysu-Bastet would have been separated from his mother by a total of 80 years from this date into Year 5 of Shoshenq I—a figure which is highly unlikely since Nysu-Bastet would not have waited until extreme old age to uphold his mother's watering rights. This implies that the aforementioned king Psusennes here must be identified with Psusennes II instead—Shoshenq I's immediate predecessor and, more significantly, that Psusennes II enjoyed a minimum reign of 19 years. \r"
+37 - "In Year 5 of Shoshenq I, this king and the founder of the 22nd Dynasty dispatched a certain [[Meshwesh|Ma]] (ie. Libyan) subordinate named Wayheset to the desert oasis town of Dakhla in order to restore the king's authority over the western oasis region of Upper Egypt. Wayheset's titles include Prince and Governor of the Oasis. His activities are recorded in the Large Dakhla stela.<ref>Kitchen, p.290</ref> This stela states that Wayheset adjudicated in a certain water dispute by consulting a land-register which is explicitly dated to Year 19 of a \"Pharaoh Psusennes\" in order to determine the water rights of a man named Nysu-Bastet.<ref>[[Alan H. Gardiner]], The Large Dakhla stela, JEA 19 (1930), pp.19-30</ref> Kitchen notes that this individual made an appeal to the Year 19 cadastral land-register of king Psusennes which belonged to his mother which historians assumed was made some \"80 years\" ago during the reign of Psusennes I.<ref>Kitchen, p.290</ref> The land register recorded that certain water rights were formerly owned by Nysu-Bastet's mother Tewhunet in Year 19 of a king Psusennes. This ruler was generally assumed by Egyptologists to be Psusennes I rather than Psusennes II since the latter's reign was believed to have lasted only 14-15 years. Based on the land register evidence, Wayheset ordered that these watering rights should now be granted to Nysu-Bastet himself. However, if the oracle dated to Year 19 of Psusennes I as many scholars traditionally assumed, Nysu-Bastet would have been separated from his mother by a total of 80 years from this date into Year 5 of Shoshenq I--a figure which is highly unlikely since Nysu-Bastet would not have waited until extreme old age to uphold his mother's watering rights. This implies that the aforementioned king Psusennes here must be identified with Psusennes II instead--Shoshenq I's immediate predecessor and, more significantly, that Psusennes II enjoyed a minimum reign of 19 years. \r"
+37 + "In Year 5 of Shoshenq I, this king and the founder of the 22nd Dynasty dispatched a certain [[Meshwesh|Ma]] (ie. Libyan) subordinate named Wayheset to the desert oasis town of Dakhla in order to restore the king's authority over the western oasis region of Upper Egypt. Wayheset's titles include Prince and Governor of the Oasis. His activities are recorded in the Large Dakhla stela.<ref name=\"Kitchen, p.290\">Kitchen, p.290</ref> This stela states that Wayheset adjudicated in a certain water dispute by consulting a land-register which is explicitly dated to Year 19 of a \"Pharaoh Psusennes\" in order to determine the water rights of a man named Nysu-Bastet.<ref>[[Alan H. Gardiner]], The Large Dakhla stela, JEA 19 (1930), pp.19-30</ref> Kitchen notes that this individual made an appeal to the Year 19 cadastral land-register of king Psusennes which belonged to his mother which historians assumed was made some \"80 years\" ago during the reign of Psusennes I.<ref name=\"Kitchen, p.290\"/> The land register recorded that certain water rights were formerly owned by Nysu-Bastet's mother Tewhunet in Year 19 of a king Psusennes. This ruler was generally assumed by Egyptologists to be Psusennes I rather than Psusennes II since the latter's reign was believed to have lasted only 14–15 years. Based on the land register evidence, Wayheset ordered that these watering rights should now be granted to Nysu-Bastet himself. However, if the oracle dated to Year 19 of Psusennes I as many scholars traditionally assumed, Nysu-Bastet would have been separated from his mother by a total of 80 years from this date into Year 5 of Shoshenq I—a figure which is highly unlikely since Nysu-Bastet would not have waited until extreme old age to uphold his mother's watering rights. This implies that the aforementioned king Psusennes here must be identified with Psusennes II instead—Shoshenq I's immediate predecessor and, more significantly, that Psusennes II enjoyed a minimum reign of 19 years. \r"
^947 - ">"
^962 - "</ref"
^1260 - "-"
@@ -174,12 +174,12 @@
^1263 + "–"
^1615 + "—"
^1855 + "—"
-38 - "The term \"mother\" in ancient Egypt could also be an allusion to an ancestress, the matriarch of a lineage whereby Nysu-Bastet may have been petitioning for his hereditary water rights that belonged to his grandmother, whose family name was Tewhunet. However, this argument does not account for the use of Pharaoh as a title in the Dakhla stela--a literary device which first occurs late during the reign of Siamun, an Egyptian king who ruled between 45 to 64 years after Year 19 of Psusennes I. \r"
-38 + "The term \"mother\" in ancient Egypt could also be an allusion to an ancestress, the matriarch of a lineage whereby Nysu-Bastet may have been petitioning for his hereditary water rights that belonged to his grandmother, whose family name was Tewhunet. However, this argument does not account for the use of Pharaoh as a title in the Dakhla stela—a literary device which first occurs late during the reign of Siamun, an Egyptian king who ruled between 45 to 64 years after Year 19 of Psusennes I. \r"
+39 - "The term \"mother\" in ancient Egypt could also be an allusion to an ancestress, the matriarch of a lineage whereby Nysu-Bastet may have been petitioning for his hereditary water rights that belonged to his grandmother, whose family name was Tewhunet. However, this argument does not account for the use of Pharaoh as a title in the Dakhla stela--a literary device which first occurs late during the reign of Siamun, an Egyptian king who ruled between 45 to 64 years after Year 19 of Psusennes I. \r"
+39 + "The term \"mother\" in ancient Egypt could also be an allusion to an ancestress, the matriarch of a lineage whereby Nysu-Bastet may have been petitioning for his hereditary water rights that belonged to his grandmother, whose family name was Tewhunet. However, this argument does not account for the use of Pharaoh as a title in the Dakhla stela—a literary device which first occurs late during the reign of Siamun, an Egyptian king who ruled between 45 to 64 years after Year 19 of Psusennes I. \r"
^343 - "--"
^343 + "—"
-40 - "The most significant component of the Great Dakhla stela is its palaeography: the use of the title Pharaoh Psusennes. A scholar named Helen Jacquet-Gordon believed in the 1970s that the large Dakhla stela belonged to [[Shoshenq III]]'s reign due to its use of the title 'Pharaoh' directly with the ruling king's birth name--ie: \"'''Pharaoh Shoshenq'''\"--which was an important palaeographical development in Egyptian history. Throughout the Old, Middle and New Kingdoms of Ancient Egypt, the word pharaoh was never employed as a title such as Mr. and Mrs. or attached to a king's [[Ancient Egyptian royal titulary#Personal name (nomen)|nomen]] such as ''Pharaoh Ramesses'' or ''Pharaoh Amenhotep''; instead, the word '''pr-`3''' or pharaoh was used as a noun to refer to the ''activities'' of the king (i.e., it was \"Pharaoh\" who ordered the creation of a temple or statue, or the digging of a well, etc.). Rolf Krauss aptly observes that the earliest attested use of the word pharaoh as a title is documented in Year 17 of the 21st Dynasty king [[Siamun]] from Karnak Priestly Annals fragment 3B<ref>J-M Kruchten, Les annales des prētres de Karnak (OLA) 1989. pp.47-48</ref> while a second use of the title ''''[Pharaoh] [birth name]'''' occurs during Psusennes II's reign where a hieratic graffito in the Ptah chapel of the Abydos temple of Seti I explicitly refers to Psusennes II as the \"High Priest of Amen-Re, King of the Gods, the Leader, '''Pharaoh Psusennes'''.\"<ref>M.A. Murray, The Osireion at Abydos (London, 1989), 36; pl. XXI</ref><ref>Krauss, DE 62, pp.43-44</ref> Consequently, the practice of attaching the title ''pr-`3'' or pharaoh with a king's royal birth name had already started prior to the beginning of Shoshenq I's reign, let alone Shoshenq III. Hence, the Shoshenq mentioned in the large Year 5 Dakhla stela must have been Shoshenq I while the Psusennes mentioned in the same document likewise can only be Psusennes II which means that only 5 years (or 10 years if Psusennes II ruled Egypt for 24 years) would separate Nysu-Bastet from his mother.<ref>Krauss, DE 62, pp.43-48</ref> The additional fact that the Large Dakhla stela contains a Year 5 IV Peret day 25 lunar date has helped date the aforementioned king Shoshenq's accession to 943 BC and demonstrates that the ruler here must be Shoshenq I, not Shoshenq III who ruled a century later.<ref>Krauss, DE 62, pp.43-48</ref> Helen Jacquet-Gordon did not know of the two prior examples pertaining to Siamun and Psusennes II.\r"
-40 + "The most significant component of the Great Dakhla stela is its palaeography: the use of the title Pharaoh Psusennes. A scholar named Helen Jacquet-Gordon believed in the 1970s that the large Dakhla stela belonged to [[Shoshenq III]]'s reign due to its use of the title 'Pharaoh' directly with the ruling king's birth name—ie: \"'''Pharaoh Shoshenq'''\"--which was an important palaeographical development in Egyptian history. Throughout the Old, Middle and New Kingdoms of Ancient Egypt, the word pharaoh was never employed as a title such as Mr. and Mrs. or attached to a king's [[Ancient Egyptian royal titulary#Personal name (nomen)|nomen]] such as ''Pharaoh Ramesses'' or ''Pharaoh Amenhotep''; instead, the word '''pr-`3''' or pharaoh was used as a noun to refer to the ''activities'' of the king (i.e., it was \"Pharaoh\" who ordered the creation of a temple or statue, or the digging of a well, etc.). Rolf Krauss aptly observes that the earliest attested use of the word pharaoh as a title is documented in Year 17 of the 21st Dynasty king [[Siamun]] from Karnak Priestly Annals fragment 3B<ref>J-M Kruchten, Les annales des prētres de Karnak (OLA) 1989. pp.47-48</ref> while a second use of the title ''''[Pharaoh] [birth name]'''' occurs during Psusennes II's reign where a hieratic graffito in the Ptah chapel of the Abydos temple of Seti I explicitly refers to Psusennes II as the \"High Priest of Amen-Re, King of the Gods, the Leader, '''Pharaoh Psusennes'''.\"<ref>M.A. Murray, The Osireion at Abydos (London, 1989), 36; pl. XXI</ref><ref>Krauss, DE 62, pp.43-44</ref> Consequently, the practice of attaching the title ''pr-`3'' or pharaoh with a king's royal birth name had already started prior to the beginning of Shoshenq I's reign, let alone Shoshenq III. Hence, the Shoshenq mentioned in the large Year 5 Dakhla stela must have been Shoshenq I while the Psusennes mentioned in the same document likewise can only be Psusennes II which means that only 5 years (or 10 years if Psusennes II ruled Egypt for 24 years) would separate Nysu-Bastet from his mother.<ref name=\"Krauss, DE 62, pp.43-48\">Krauss, DE 62, pp.43-48</ref> The additional fact that the Large Dakhla stela contains a Year 5 IV Peret day 25 lunar date has helped date the aforementioned king Shoshenq's accession to 943 BC and demonstrates that the ruler here must be Shoshenq I, not Shoshenq III who ruled a century later.<ref name=\"Krauss, DE 62, pp.43-48\"/> Helen Jacquet-Gordon did not know of the two prior examples pertaining to Siamun and Psusennes II.\r"
+41 - "The most significant component of the Great Dakhla stela is its palaeography: the use of the title Pharaoh Psusennes. A scholar named Helen Jacquet-Gordon believed in the 1970s that the large Dakhla stela belonged to [[Shoshenq III]]'s reign due to its use of the title 'Pharaoh' directly with the ruling king's birth name--ie: \"'''Pharaoh Shoshenq'''\"--which was an important palaeographical development in Egyptian history. Throughout the Old, Middle and New Kingdoms of Ancient Egypt, the word pharaoh was never employed as a title such as Mr. and Mrs. or attached to a king's [[Ancient Egyptian royal titulary#Personal name (nomen)|nomen]] such as ''Pharaoh Ramesses'' or ''Pharaoh Amenhotep''; instead, the word '''pr-`3''' or pharaoh was used as a noun to refer to the ''activities'' of the king (i.e., it was \"Pharaoh\" who ordered the creation of a temple or statue, or the digging of a well, etc.). Rolf Krauss aptly observes that the earliest attested use of the word pharaoh as a title is documented in Year 17 of the 21st Dynasty king [[Siamun]] from Karnak Priestly Annals fragment 3B<ref>J-M Kruchten, Les annales des prētres de Karnak (OLA) 1989. pp.47-48</ref> while a second use of the title ''''[Pharaoh] [birth name]'''' occurs during Psusennes II's reign where a hieratic graffito in the Ptah chapel of the Abydos temple of Seti I explicitly refers to Psusennes II as the \"High Priest of Amen-Re, King of the Gods, the Leader, '''Pharaoh Psusennes'''.\"<ref>M.A. Murray, The Osireion at Abydos (London, 1989), 36; pl. XXI</ref><ref>Krauss, DE 62, pp.43-44</ref> Consequently, the practice of attaching the title ''pr-`3'' or pharaoh with a king's royal birth name had already started prior to the beginning of Shoshenq I's reign, let alone Shoshenq III. Hence, the Shoshenq mentioned in the large Year 5 Dakhla stela must have been Shoshenq I while the Psusennes mentioned in the same document likewise can only be Psusennes II which means that only 5 years (or 10 years if Psusennes II ruled Egypt for 24 years) would separate Nysu-Bastet from his mother.<ref>Krauss, DE 62, pp.43-48</ref> The additional fact that the Large Dakhla stela contains a Year 5 IV Peret day 25 lunar date has helped date the aforementioned king Shoshenq's accession to 943 BC and demonstrates that the ruler here must be Shoshenq I, not Shoshenq III who ruled a century later.<ref>Krauss, DE 62, pp.43-48</ref> Helen Jacquet-Gordon did not know of the two prior examples pertaining to Siamun and Psusennes II.\r"
+41 + "The most significant component of the Great Dakhla stela is its palaeography: the use of the title Pharaoh Psusennes. A scholar named Helen Jacquet-Gordon believed in the 1970s that the large Dakhla stela belonged to [[Shoshenq III]]'s reign due to its use of the title 'Pharaoh' directly with the ruling king's birth name—ie: \"'''Pharaoh Shoshenq'''\"--which was an important palaeographical development in Egyptian history. Throughout the Old, Middle and New Kingdoms of Ancient Egypt, the word pharaoh was never employed as a title such as Mr. and Mrs. or attached to a king's [[Ancient Egyptian royal titulary#Personal name (nomen)|nomen]] such as ''Pharaoh Ramesses'' or ''Pharaoh Amenhotep''; instead, the word '''pr-`3''' or pharaoh was used as a noun to refer to the ''activities'' of the king (i.e., it was \"Pharaoh\" who ordered the creation of a temple or statue, or the digging of a well, etc.). Rolf Krauss aptly observes that the earliest attested use of the word pharaoh as a title is documented in Year 17 of the 21st Dynasty king [[Siamun]] from Karnak Priestly Annals fragment 3B<ref>J-M Kruchten, Les annales des prētres de Karnak (OLA) 1989. pp.47-48</ref> while a second use of the title ''''[Pharaoh] [birth name]'''' occurs during Psusennes II's reign where a hieratic graffito in the Ptah chapel of the Abydos temple of Seti I explicitly refers to Psusennes II as the \"High Priest of Amen-Re, King of the Gods, the Leader, '''Pharaoh Psusennes'''.\"<ref>M.A. Murray, The Osireion at Abydos (London, 1989), 36; pl. XXI</ref><ref>Krauss, DE 62, pp.43-44</ref> Consequently, the practice of attaching the title ''pr-`3'' or pharaoh with a king's royal birth name had already started prior to the beginning of Shoshenq I's reign, let alone Shoshenq III. Hence, the Shoshenq mentioned in the large Year 5 Dakhla stela must have been Shoshenq I while the Psusennes mentioned in the same document likewise can only be Psusennes II which means that only 5 years (or 10 years if Psusennes II ruled Egypt for 24 years) would separate Nysu-Bastet from his mother.<ref name=\"Krauss, DE 62, pp.43-48\">Krauss, DE 62, pp.43-48</ref> The additional fact that the Large Dakhla stela contains a Year 5 IV Peret day 25 lunar date has helped date the aforementioned king Shoshenq's accession to 943 BC and demonstrates that the ruler here must be Shoshenq I, not Shoshenq III who ruled a century later.<ref name=\"Krauss, DE 62, pp.43-48\"/> Helen Jacquet-Gordon did not know of the two prior examples pertaining to Siamun and Psusennes II.\r"
^322 - "--"
^2379 - ">"
^2403 - "</ref"
@@ -187,8 +187,8 @@
^2081 + " name=\"Krauss, DE 62, pp.43-48\""
^2380 + " name=\""
^2410 + "\"/"
-43 - "The editors of the recent 2006 book on titled 'Handbook on Ancient Egyptian Chronology'--Erik Hornung, Rolf Krauss and David Warburton--accept this logical reasoning and have amended Manetho's original figure of 14 years for Psusennes II to 24 years instead to Psusennes II.<ref>Erik Hornung, Rolf Krauss & David Warburton (editors), Handbook of Ancient Egyptian Chronology (Handbook of Oriental Studies), Brill: 2006, p.474 & p.488</ref> This is not unprecedented since previous Egyptologists had previously amended the reign of Siamun by a decade from 9 years--as preserved in surviving copies of Manetho's Epitome--to 19 years based on certain Year 16 and Year 17 dates attested for the latter.<ref>Kitchen, p.423</ref> Psusennes II ruled Egypt for a minimum of 19 years based on the internal chronology of the Large Dakhla stela. However, a calculation of a lunar ''Tepi Shemu'' feast which records the induction of Hori son of Nespaneferhor into the Amun priesthood in regnal year 17 of [[Siamun]], Psusennes II's predecessor--demonstrates that this date was equivalent to 970 BC.<ref>Hornung, Krauss & Warburton, pp.474-475</ref> Since Siamun enjoyed a reign of 19 years, he would have died 2 years later in 968/967 BC and been succeeded by Psusennes II by 967 BC at the latest. Consequently, a reign of 24 years or 967-943 BC is now likely for Psusennes II; hence, his reign has been raised from 14 to 24 years.\r"
-43 + "The editors of the recent 2006 book on titled 'Handbook on Ancient Egyptian Chronology'--Erik Hornung, Rolf Krauss and David Warburton—accept this logical reasoning and have amended Manetho's original figure of 14 years for Psusennes II to 24 years instead to Psusennes II.<ref>Erik Hornung, Rolf Krauss & David Warburton (editors), Handbook of Ancient Egyptian Chronology (Handbook of Oriental Studies), Brill: 2006, p.474 & p.488</ref> This is not unprecedented since previous Egyptologists had previously amended the reign of Siamun by a decade from 9 years—as preserved in surviving copies of Manetho's Epitome—to 19 years based on certain Year 16 and Year 17 dates attested for the latter.<ref name=\"Kitchen, p.423\"/> Psusennes II ruled Egypt for a minimum of 19 years based on the internal chronology of the Large Dakhla stela. However, a calculation of a lunar ''Tepi Shemu'' feast which records the induction of Hori son of Nespaneferhor into the Amun priesthood in regnal year 17 of [[Siamun]], Psusennes II's predecessor—demonstrates that this date was equivalent to 970 BC.<ref>Hornung, Krauss & Warburton, pp.474-475</ref> Since Siamun enjoyed a reign of 19 years, he would have died 2 years later in 968/967 BC and been succeeded by Psusennes II by 967 BC at the latest. Consequently, a reign of 24 years or 967-943 BC is now likely for Psusennes II; hence, his reign has been raised from 14 to 24 years.\r"
+44 - "The editors of the recent 2006 book on titled 'Handbook on Ancient Egyptian Chronology'--Erik Hornung, Rolf Krauss and David Warburton--accept this logical reasoning and have amended Manetho's original figure of 14 years for Psusennes II to 24 years instead to Psusennes II.<ref>Erik Hornung, Rolf Krauss & David Warburton (editors), Handbook of Ancient Egyptian Chronology (Handbook of Oriental Studies), Brill: 2006, p.474 & p.488</ref> This is not unprecedented since previous Egyptologists had previously amended the reign of Siamun by a decade from 9 years--as preserved in surviving copies of Manetho's Epitome--to 19 years based on certain Year 16 and Year 17 dates attested for the latter.<ref>Kitchen, p.423</ref> Psusennes II ruled Egypt for a minimum of 19 years based on the internal chronology of the Large Dakhla stela. However, a calculation of a lunar ''Tepi Shemu'' feast which records the induction of Hori son of Nespaneferhor into the Amun priesthood in regnal year 17 of [[Siamun]], Psusennes II's predecessor--demonstrates that this date was equivalent to 970 BC.<ref>Hornung, Krauss & Warburton, pp.474-475</ref> Since Siamun enjoyed a reign of 19 years, he would have died 2 years later in 968/967 BC and been succeeded by Psusennes II by 967 BC at the latest. Consequently, a reign of 24 years or 967-943 BC is now likely for Psusennes II; hence, his reign has been raised from 14 to 24 years.\r"
+44 + "The editors of the recent 2006 book on titled 'Handbook on Ancient Egyptian Chronology'--Erik Hornung, Rolf Krauss and David Warburton—accept this logical reasoning and have amended Manetho's original figure of 14 years for Psusennes II to 24 years instead to Psusennes II.<ref>Erik Hornung, Rolf Krauss & David Warburton (editors), Handbook of Ancient Egyptian Chronology (Handbook of Oriental Studies), Brill: 2006, p.474 & p.488</ref> This is not unprecedented since previous Egyptologists had previously amended the reign of Siamun by a decade from 9 years—as preserved in surviving copies of Manetho's Epitome—to 19 years based on certain Year 16 and Year 17 dates attested for the latter.<ref name=\"Kitchen, p.423\"/> Psusennes II ruled Egypt for a minimum of 19 years based on the internal chronology of the Large Dakhla stela. However, a calculation of a lunar ''Tepi Shemu'' feast which records the induction of Hori son of Nespaneferhor into the Amun priesthood in regnal year 17 of [[Siamun]], Psusennes II's predecessor—demonstrates that this date was equivalent to 970 BC.<ref>Hornung, Krauss & Warburton, pp.474-475</ref> Since Siamun enjoyed a reign of 19 years, he would have died 2 years later in 968/967 BC and been succeeded by Psusennes II by 967 BC at the latest. Consequently, a reign of 24 years or 967-943 BC is now likely for Psusennes II; hence, his reign has been raised from 14 to 24 years.\r"
^134 - "--"
^561 - "--"
^616 - "--"
@@ -201,6 +201,6 @@
^704 + " name=\""
^725 + "\"/"
^1036 + "—"
-50 - "* Aidan Dodson, RdE 38(1987), pp.50-51.\r"
-50 + "* Aidan Dodson, RdE 38(1987), pp.&nbsp;50-51.\r"
+51 - "* Aidan Dodson, RdE 38(1987), pp.50-51.\r"
+51 + "* Aidan Dodson, RdE 38(1987), pp.&nbsp;50-51.\r"
^33 + "&nbsp;"
diff --git a/lib/text/diff/testdata/Psusennes_II_diff_LevelWords_reverse b/lib/text/diff/testdata/Psusennes_II_diff_LevelWords_reverse
index 88499218..4b7c023d 100644
--- a/lib/text/diff/testdata/Psusennes_II_diff_LevelWords_reverse
+++ b/lib/text/diff/testdata/Psusennes_II_diff_LevelWords_reverse
@@ -1,157 +1,157 @@
----
-53 - "{{DEFAULTSORT:Psusennes Ii}}\r"
+54 - "{{DEFAULTSORT:Psusennes Ii}}\r"
--++
-0 - "{{Infobox pharaoh\r"
-0 + "{{Pharaoh Infobox | \r"
+1 - "{{Infobox pharaoh\r"
+1 + "{{Pharaoh Infobox | \r"
^10 - "pharaoh"
^2 + "Pharaoh "
^10 + "| "
-1 - "| Name= Psusennes II \r"
-1 + " Name= Psusennes II | \r"
+2 - "| Name= Psusennes II \r"
+2 + " Name= Psusennes II | \r"
^0 - "| "
^0 + " "
^3 + " "
^20 + " |"
-2 - "| Alt= Pasebakhaenniut II<ref>[http://www.digitalegypt.ucl.ac.uk/chronology/psusennesii.html Pasebakhenniut II]</ref> \r"
-2 + " Alt= Pasebakhaenniut II<ref>[http://www.digitalegypt.ucl.ac.uk/chronology/psusennesii.html Pasebakhenniut II]</ref> |\r"
+3 - "| Alt= Pasebakhaenniut II<ref>[http://www.digitalegypt.ucl.ac.uk/chronology/psusennesii.html Pasebakhenniut II]</ref> \r"
+3 + " Alt= Pasebakhaenniut II<ref>[http://www.digitalegypt.ucl.ac.uk/chronology/psusennesii.html Pasebakhenniut II]</ref> |\r"
^0 - "| "
^0 + " "
^3 + " "
^118 + "|"
-3 - "| Image= \r"
-3 + " Image= |\r"
+4 - "| Image= \r"
+4 + " Image= |\r"
^0 - "| "
^0 + " "
^3 + " "
^9 + "|"
-4 - "| NomenHiero= <hiero>M17-Y5:N35:U7-G40-N14*N28-N35:O49</hiero>\r"
-4 + " NomenHiero= <hiero>M17-Y5:N35:U7-G40-N14*N28-N35:O49</hiero>|\r"
+5 - "| NomenHiero= <hiero>M17-Y5:N35:U7-G40-N14*N28-N35:O49</hiero>\r"
+5 + " NomenHiero= <hiero>M17-Y5:N35:U7-G40-N14*N28-N35:O49</hiero>|\r"
^0 - "| "
^0 + " "
^3 + " "
^62 + "|"
-5 - "| Nomen=''Hor-Pasebakhaenniut''\r"
-5 + " Nomen=''Hor-Pasebakhaenniut''|\r"
+6 - "| Nomen=''Hor-Pasebakhaenniut''\r"
+6 + " Nomen=''Hor-Pasebakhaenniut''|\r"
^0 - "| "
^0 + " "
^3 + " "
^31 + "|"
-6 - "| PrenomenHiero= <hiero>ra:D17-xpr-Z3-stp:n-ra</hiero>\r"
-6 + " PrenomenHiero= <hiero>ra:D17-xpr-Z3-stp:n-ra</hiero>|\r"
+7 - "| PrenomenHiero= <hiero>ra:D17-xpr-Z3-stp:n-ra</hiero>\r"
+7 + " PrenomenHiero= <hiero>ra:D17-xpr-Z3-stp:n-ra</hiero>|\r"
^0 - "| "
^0 + " "
^3 + " "
^54 + "|"
-7 - "|Prenomen=''Titkheperure/Tyetkheperre''\r"
-7 + "Prenomen=''Titkheperure/Tyetkheperre''|\r"
+8 - "|Prenomen=''Titkheperure/Tyetkheperre''\r"
+8 + "Prenomen=''Titkheperure/Tyetkheperre''|\r"
^0 - "|"
^38 + "|"
-8 - "| Golden= \r"
-8 + " Golden= |\r"
+9 - "| Golden= \r"
+9 + " Golden= |\r"
^0 - "| "
^0 + " "
^3 + " "
^10 + "|"
-9 - "| Nebty= \r"
-9 + " Nebty= |\r"
+10 - "| Nebty= \r"
+10 + " Nebty= |\r"
^0 - "| "
^0 + " "
^3 + " "
^9 + "|"
-10 - "| Horus= \r"
-10 + " Horus= |\r"
+11 - "| Horus= \r"
+11 + " Horus= |\r"
^0 - "| "
^0 + " "
^3 + " "
^9 + "|"
-11 - "| GoldenHiero= \r"
-11 + " GoldenHiero= | \r"
+12 - "| GoldenHiero= \r"
+12 + " GoldenHiero= | \r"
^0 - "| "
^0 + " "
^3 + " "
^14 + " |"
-12 - "| NebtyHiero= \r"
-12 + " NebtyHiero= |\r"
+13 - "| NebtyHiero= \r"
+13 + " NebtyHiero= |\r"
^0 - "| "
^0 + " "
^3 + " "
^15 + "|"
-13 - "| HorusHiero= \r"
-13 + " HorusHiero= |\r"
+14 - "| HorusHiero= \r"
+14 + " HorusHiero= |\r"
^0 - "| "
^0 + " "
^3 + " "
^14 + "|"
-14 - "| Reign=967 &ndash; 943 BC \r"
-14 + " Reign=967 &ndash; 943 BC | \r"
+15 - "| Reign=967 &ndash; 943 BC \r"
+15 + " Reign=967 &ndash; 943 BC | \r"
^0 - "| "
^0 + " "
^3 + " "
^26 + " |"
-15 - "| Predecessor= [[Siamun]] \r"
-15 + " Predecessor= [[Siamun]] |\r"
+16 - "| Predecessor= [[Siamun]] \r"
+16 + " Predecessor= [[Siamun]] |\r"
^0 - "| "
^0 + " "
^3 + " "
^26 + "|"
-16 - "| Successor= [[Shoshenq I]] \r"
-16 + " Successor= [[Shoshenq I]] |\r"
+17 - "| Successor= [[Shoshenq I]] \r"
+17 + " Successor= [[Shoshenq I]] |\r"
^0 - "| "
^0 + " "
^3 + " "
^28 + "|"
-17 - "| Spouse= \r"
-17 + " Spouse= |\r"
+18 - "| Spouse= \r"
+18 + " Spouse= |\r"
^0 - "| "
^0 + " "
^3 + " "
^10 + "|"
-18 - "| Children= [[Maatkare (daughter of Psusennes II)|Maatkare]] \r"
-18 + " Children= [[Maatkare (daughter of Psusennes II)|Maatkare]] |\r"
+19 - "| Children= [[Maatkare (daughter of Psusennes II)|Maatkare]] \r"
+19 + " Children= [[Maatkare (daughter of Psusennes II)|Maatkare]] |\r"
^0 - "| "
^0 + " "
^3 + " "
^61 + "|"
-19 - "| Dynasty= [[Twenty-first dynasty of Egypt|21st Dynasty]] \r"
-19 + " Dynasty= [[Twenty-first dynasty of Egypt|21st Dynasty]] |\r"
+20 - "| Dynasty= [[Twenty-first dynasty of Egypt|21st Dynasty]] \r"
+20 + " Dynasty= [[Twenty-first dynasty of Egypt|21st Dynasty]] |\r"
^0 - "|"
^0 + " "
^58 + "|"
-20 - "| Father= \r"
-20 + " Father= |\r"
+21 - "| Father= \r"
+21 + " Father= |\r"
^0 - "| "
^0 + " "
^3 + " "
^10 + "|"
-21 - "| Mother= \r"
-21 + " Mother= |\r"
+22 - "| Mother= \r"
+22 + " Mother= |\r"
^0 - "| "
^0 + " "
^3 + " "
^10 + "|"
-22 - "| Died= [[943 BC]] \r"
-22 + " Died= [[943 BC]] |\r"
+23 - "| Died= [[943 BC]] \r"
+23 + " Died= [[943 BC]] |\r"
^0 - "| "
^0 + " "
^3 + " "
^19 + "|"
-23 - "| Burial= Unknown \r"
-23 + " Burial= Unknown |\r"
+24 - "| Burial= Unknown \r"
+24 + " Burial= Unknown |\r"
^0 - "| "
^0 + " "
^3 + " "
^18 + "|"
-24 - "| Monuments=\r"
-24 + " Monuments= |\r"
+25 - "| Monuments=\r"
+25 + " Monuments= |\r"
^0 - "| "
^0 + " "
^3 + " "
^12 + " |"
-29 - "Items which can be added to this list include a Year 5 Mummy linen that was written with the High Priest Psusennes III's name. It is generally assumed that a '''Year 13 III Peret 10+X''' date in fragment 3B, line 6 of the Karnak Priestly Annals belongs to his reign.<ref>K.A. Kitchen, The Third Intermediate Period in Egypt (1100–650 BC) 3rd ed., Warminster: Aris & Phillips Ltd, p.423</ref> Unfortunately, however, the king's name is not stated and the only thing which is certain is that the fragment must be dated after Siamun's reign whose Year 17 is mentioned in lines 3-5.<ref name=\"Kitchen, p.423\">Kitchen, p.423</ref> Hence, it belongs to either Psusennes II or possibly Shoshenq I's reign. More impressive are the number of objects which associate Psusennes II together with his successor, Shoshenq I, such as an old statue of [[Thutmose III]] which contains two parallel columns of texts &ndash; one referring to Psusennes II and the other to [[Shoshenq I]] &ndash; a recently unearthed block from [[Basta]] which preserves the nomen of Shoshenq I together with the prenomen of Psusennes II, and a now lost graffito from [[TT18|Theban Tomb 18]].<ref>Aidan Dodson, \"Psusennes II and Shoshenq I,\" JEA 79(1993), pp.267-268</ref> \r"
-29 + "Items which can be added to this list include a Year 5 Mummy linen that was written with the High Priest Psusennes III's name. It is generally assumed that a '''Year 13 III Peret 10+X''' date in fragment 3B, line 6 of the Karnak Priestly Annals belongs to his reign.<ref>K.A. Kitchen, The Third Intermediate Period in Egypt (1100–650 BC) 3rd ed., Warminster: Aris & Phillips Ltd, p.423</ref> Unfortunately, however, the king's name is not stated and the only thing which is certain is that the fragment must be dated after Siamun's reign whose Year 17 is mentioned in lines 3-5.<ref>Kitchen, p.423</ref> Hence, it belongs to either Psusennes II or possibly Shoshenq I's reign. More impressive are the number of objects which associate Psusennes II together with his successor, Shoshenq I, such as an old statue of [[Thutmose III]] which contains two parallel columns of texts &ndash; one referring to Psusennes II and the other to [[Shoshenq I]] &ndash; a recently unearthed block from [[Basta]] which preserves the nomen of Shoshenq I together with the prenomen of Psusennes II, and a now lost graffito from [[TT18|Theban Tomb 18]].<ref>Aidan Dodson, \"Psusennes II and Shoshenq I,\" JEA 79(1993), pp.267-268</ref> \r"
+30 - "Items which can be added to this list include a Year 5 Mummy linen that was written with the High Priest Psusennes III's name. It is generally assumed that a '''Year 13 III Peret 10+X''' date in fragment 3B, line 6 of the Karnak Priestly Annals belongs to his reign.<ref>K.A. Kitchen, The Third Intermediate Period in Egypt (1100–650 BC) 3rd ed., Warminster: Aris & Phillips Ltd, p.423</ref> Unfortunately, however, the king's name is not stated and the only thing which is certain is that the fragment must be dated after Siamun's reign whose Year 17 is mentioned in lines 3-5.<ref name=\"Kitchen, p.423\">Kitchen, p.423</ref> Hence, it belongs to either Psusennes II or possibly Shoshenq I's reign. More impressive are the number of objects which associate Psusennes II together with his successor, Shoshenq I, such as an old statue of [[Thutmose III]] which contains two parallel columns of texts &ndash; one referring to Psusennes II and the other to [[Shoshenq I]] &ndash; a recently unearthed block from [[Basta]] which preserves the nomen of Shoshenq I together with the prenomen of Psusennes II, and a now lost graffito from [[TT18|Theban Tomb 18]].<ref>Aidan Dodson, \"Psusennes II and Shoshenq I,\" JEA 79(1993), pp.267-268</ref> \r"
+30 + "Items which can be added to this list include a Year 5 Mummy linen that was written with the High Priest Psusennes III's name. It is generally assumed that a '''Year 13 III Peret 10+X''' date in fragment 3B, line 6 of the Karnak Priestly Annals belongs to his reign.<ref>K.A. Kitchen, The Third Intermediate Period in Egypt (1100–650 BC) 3rd ed., Warminster: Aris & Phillips Ltd, p.423</ref> Unfortunately, however, the king's name is not stated and the only thing which is certain is that the fragment must be dated after Siamun's reign whose Year 17 is mentioned in lines 3-5.<ref>Kitchen, p.423</ref> Hence, it belongs to either Psusennes II or possibly Shoshenq I's reign. More impressive are the number of objects which associate Psusennes II together with his successor, Shoshenq I, such as an old statue of [[Thutmose III]] which contains two parallel columns of texts &ndash; one referring to Psusennes II and the other to [[Shoshenq I]] &ndash; a recently unearthed block from [[Basta]] which preserves the nomen of Shoshenq I together with the prenomen of Psusennes II, and a now lost graffito from [[TT18|Theban Tomb 18]].<ref>Aidan Dodson, \"Psusennes II and Shoshenq I,\" JEA 79(1993), pp.267-268</ref> \r"
^584 - " name=\"Kitchen, p.423\""
-31 - "Recently, the first conclusive date for king Psusennes II was revealed in a newly published priestly annal stone block. This document, which has been designated as 'Block Karnak 94, CL 2149,' records the induction of a priest named Nesankhefenmaat into the chapel of Amun-Re within the Karnak precint in Year 11 the first month of Shemu day 13 of a king named Psusennes.<ref>Frederic Payraudeau, ''De nouvelles annales sacerdotales de Siamon, Psousennès II et Osorkon Ier.'', BIFAO 108 (2008), p.294</ref> The preceding line of this document recorded the induction of Nesankhefenmaat's father, a certain Nesamun, into the priesthood of Amun-Re in king Siamun's reign.<ref name=\"Payraudeau, BIFAO 108, p.294\">Payraudeau, BIFAO 108, p.294</ref> Siamun was the predecessor of Psusennes II at Tanis. The identification of the aforementioned Psusennes with Psusennes II is certain since the same fragmentary annal document next records—in the following line—the induction of Hor, the son of Nesankhefenmaat, into the priesthood of the chapel of Amun-Re at Karnak in Year 3 the second month of Akhet day 14 of king Osorkon I's reign just one generation later.<ref name=\"Payraudeau, BIFAO 108, p.294\"/> Therefore, the Year 11 date can only be assigned to Psusennes II and constitutes the first securely attested date for this pharaoh's reign. \r"
-31 + "Recently, the first conclusive date for king Psusennes II was revealed in a newly published priestly annal stone block. This document, which has been designated as 'Block Karnak 94, CL 2149,' records the induction of a priest named Nesankhefenmaat into the chapel of Amun-Re within the Karnak precint in Year 11 the first month of Shemu day 13 of a king named Psusennes.<ref>Frederic Payraudeau, ''De nouvelles annales sacerdotales de Siamon, Psousennès II et Osorkon Ier.'', BIFAO 108 (2008), p.294</ref> The preceding line of this document recorded the induction of Nesankhefenmaat's father, a certain Nesamun, into the priesthood of Amun-Re in king Siamun's reign.<ref>Payraudeau, BIFAO 108, p.294</ref> Siamun was the predecessor of Psusennes II at Tanis. The identification of the aforementioned Psusennes with Psusennes II is certain since the same fragmentary annal document next records--in the following line--the induction of Hor, the son of Nesankhefenmaat, into the priesthood of the chapel of Amun-Re at Karnak in Year 3 the second month of Akhet day 14 of king Osorkon I's reign just one generation later.<ref>Payraudeau, BIFAO 108, p.294</ref> Therefore, the Year 11 date can only be assigned to Psusennes II and constitutes the first securely attested date for this pharaoh's reign. \r"
+32 - "Recently, the first conclusive date for king Psusennes II was revealed in a newly published priestly annal stone block. This document, which has been designated as 'Block Karnak 94, CL 2149,' records the induction of a priest named Nesankhefenmaat into the chapel of Amun-Re within the Karnak precint in Year 11 the first month of Shemu day 13 of a king named Psusennes.<ref>Frederic Payraudeau, ''De nouvelles annales sacerdotales de Siamon, Psousennès II et Osorkon Ier.'', BIFAO 108 (2008), p.294</ref> The preceding line of this document recorded the induction of Nesankhefenmaat's father, a certain Nesamun, into the priesthood of Amun-Re in king Siamun's reign.<ref name=\"Payraudeau, BIFAO 108, p.294\">Payraudeau, BIFAO 108, p.294</ref> Siamun was the predecessor of Psusennes II at Tanis. The identification of the aforementioned Psusennes with Psusennes II is certain since the same fragmentary annal document next records—in the following line—the induction of Hor, the son of Nesankhefenmaat, into the priesthood of the chapel of Amun-Re at Karnak in Year 3 the second month of Akhet day 14 of king Osorkon I's reign just one generation later.<ref name=\"Payraudeau, BIFAO 108, p.294\"/> Therefore, the Year 11 date can only be assigned to Psusennes II and constitutes the first securely attested date for this pharaoh's reign. \r"
+32 + "Recently, the first conclusive date for king Psusennes II was revealed in a newly published priestly annal stone block. This document, which has been designated as 'Block Karnak 94, CL 2149,' records the induction of a priest named Nesankhefenmaat into the chapel of Amun-Re within the Karnak precint in Year 11 the first month of Shemu day 13 of a king named Psusennes.<ref>Frederic Payraudeau, ''De nouvelles annales sacerdotales de Siamon, Psousennès II et Osorkon Ier.'', BIFAO 108 (2008), p.294</ref> The preceding line of this document recorded the induction of Nesankhefenmaat's father, a certain Nesamun, into the priesthood of Amun-Re in king Siamun's reign.<ref>Payraudeau, BIFAO 108, p.294</ref> Siamun was the predecessor of Psusennes II at Tanis. The identification of the aforementioned Psusennes with Psusennes II is certain since the same fragmentary annal document next records--in the following line--the induction of Hor, the son of Nesankhefenmaat, into the priesthood of the chapel of Amun-Re at Karnak in Year 3 the second month of Akhet day 14 of king Osorkon I's reign just one generation later.<ref>Payraudeau, BIFAO 108, p.294</ref> Therefore, the Year 11 date can only be assigned to Psusennes II and constitutes the first securely attested date for this pharaoh's reign. \r"
^672 - " name=\"Payraudeau, BIFAO 108, p.294\""
^895 - "—"
^919 - "—"
@@ -161,8 +161,8 @@
^918 + "--"
^1124 + ">"
^1153 + "</ref"
-36 - "In Year 5 of Shoshenq I, this king and the founder of the 22nd Dynasty dispatched a certain [[Meshwesh|Ma]] (ie. Libyan) subordinate named Wayheset to the desert oasis town of Dakhla in order to restore the king's authority over the western oasis region of Upper Egypt. Wayheset's titles include Prince and Governor of the Oasis. His activities are recorded in the Large Dakhla stela.<ref name=\"Kitchen, p.290\">Kitchen, p.290</ref> This stela states that Wayheset adjudicated in a certain water dispute by consulting a land-register which is explicitly dated to Year 19 of a \"Pharaoh Psusennes\" in order to determine the water rights of a man named Nysu-Bastet.<ref>[[Alan H. Gardiner]], The Large Dakhla stela, JEA 19 (1930), pp.19-30</ref> Kitchen notes that this individual made an appeal to the Year 19 cadastral land-register of king Psusennes which belonged to his mother which historians assumed was made some \"80 years\" ago during the reign of Psusennes I.<ref name=\"Kitchen, p.290\"/> The land register recorded that certain water rights were formerly owned by Nysu-Bastet's mother Tewhunet in Year 19 of a king Psusennes. This ruler was generally assumed by Egyptologists to be Psusennes I rather than Psusennes II since the latter's reign was believed to have lasted only 14–15 years. Based on the land register evidence, Wayheset ordered that these watering rights should now be granted to Nysu-Bastet himself. However, if the oracle dated to Year 19 of Psusennes I as many scholars traditionally assumed, Nysu-Bastet would have been separated from his mother by a total of 80 years from this date into Year 5 of Shoshenq I—a figure which is highly unlikely since Nysu-Bastet would not have waited until extreme old age to uphold his mother's watering rights. This implies that the aforementioned king Psusennes here must be identified with Psusennes II instead—Shoshenq I's immediate predecessor and, more significantly, that Psusennes II enjoyed a minimum reign of 19 years. \r"
-36 + "In Year 5 of Shoshenq I, this king and the founder of the 22nd Dynasty dispatched a certain [[Meshwesh|Ma]] (ie. Libyan) subordinate named Wayheset to the desert oasis town of Dakhla in order to restore the king's authority over the western oasis region of Upper Egypt. Wayheset's titles include Prince and Governor of the Oasis. His activities are recorded in the Large Dakhla stela.<ref>Kitchen, p.290</ref> This stela states that Wayheset adjudicated in a certain water dispute by consulting a land-register which is explicitly dated to Year 19 of a \"Pharaoh Psusennes\" in order to determine the water rights of a man named Nysu-Bastet.<ref>[[Alan H. Gardiner]], The Large Dakhla stela, JEA 19 (1930), pp.19-30</ref> Kitchen notes that this individual made an appeal to the Year 19 cadastral land-register of king Psusennes which belonged to his mother which historians assumed was made some \"80 years\" ago during the reign of Psusennes I.<ref>Kitchen, p.290</ref> The land register recorded that certain water rights were formerly owned by Nysu-Bastet's mother Tewhunet in Year 19 of a king Psusennes. This ruler was generally assumed by Egyptologists to be Psusennes I rather than Psusennes II since the latter's reign was believed to have lasted only 14-15 years. Based on the land register evidence, Wayheset ordered that these watering rights should now be granted to Nysu-Bastet himself. However, if the oracle dated to Year 19 of Psusennes I as many scholars traditionally assumed, Nysu-Bastet would have been separated from his mother by a total of 80 years from this date into Year 5 of Shoshenq I--a figure which is highly unlikely since Nysu-Bastet would not have waited until extreme old age to uphold his mother's watering rights. This implies that the aforementioned king Psusennes here must be identified with Psusennes II instead--Shoshenq I's immediate predecessor and, more significantly, that Psusennes II enjoyed a minimum reign of 19 years. \r"
+37 - "In Year 5 of Shoshenq I, this king and the founder of the 22nd Dynasty dispatched a certain [[Meshwesh|Ma]] (ie. Libyan) subordinate named Wayheset to the desert oasis town of Dakhla in order to restore the king's authority over the western oasis region of Upper Egypt. Wayheset's titles include Prince and Governor of the Oasis. His activities are recorded in the Large Dakhla stela.<ref name=\"Kitchen, p.290\">Kitchen, p.290</ref> This stela states that Wayheset adjudicated in a certain water dispute by consulting a land-register which is explicitly dated to Year 19 of a \"Pharaoh Psusennes\" in order to determine the water rights of a man named Nysu-Bastet.<ref>[[Alan H. Gardiner]], The Large Dakhla stela, JEA 19 (1930), pp.19-30</ref> Kitchen notes that this individual made an appeal to the Year 19 cadastral land-register of king Psusennes which belonged to his mother which historians assumed was made some \"80 years\" ago during the reign of Psusennes I.<ref name=\"Kitchen, p.290\"/> The land register recorded that certain water rights were formerly owned by Nysu-Bastet's mother Tewhunet in Year 19 of a king Psusennes. This ruler was generally assumed by Egyptologists to be Psusennes I rather than Psusennes II since the latter's reign was believed to have lasted only 14–15 years. Based on the land register evidence, Wayheset ordered that these watering rights should now be granted to Nysu-Bastet himself. However, if the oracle dated to Year 19 of Psusennes I as many scholars traditionally assumed, Nysu-Bastet would have been separated from his mother by a total of 80 years from this date into Year 5 of Shoshenq I—a figure which is highly unlikely since Nysu-Bastet would not have waited until extreme old age to uphold his mother's watering rights. This implies that the aforementioned king Psusennes here must be identified with Psusennes II instead—Shoshenq I's immediate predecessor and, more significantly, that Psusennes II enjoyed a minimum reign of 19 years. \r"
+37 + "In Year 5 of Shoshenq I, this king and the founder of the 22nd Dynasty dispatched a certain [[Meshwesh|Ma]] (ie. Libyan) subordinate named Wayheset to the desert oasis town of Dakhla in order to restore the king's authority over the western oasis region of Upper Egypt. Wayheset's titles include Prince and Governor of the Oasis. His activities are recorded in the Large Dakhla stela.<ref>Kitchen, p.290</ref> This stela states that Wayheset adjudicated in a certain water dispute by consulting a land-register which is explicitly dated to Year 19 of a \"Pharaoh Psusennes\" in order to determine the water rights of a man named Nysu-Bastet.<ref>[[Alan H. Gardiner]], The Large Dakhla stela, JEA 19 (1930), pp.19-30</ref> Kitchen notes that this individual made an appeal to the Year 19 cadastral land-register of king Psusennes which belonged to his mother which historians assumed was made some \"80 years\" ago during the reign of Psusennes I.<ref>Kitchen, p.290</ref> The land register recorded that certain water rights were formerly owned by Nysu-Bastet's mother Tewhunet in Year 19 of a king Psusennes. This ruler was generally assumed by Egyptologists to be Psusennes I rather than Psusennes II since the latter's reign was believed to have lasted only 14-15 years. Based on the land register evidence, Wayheset ordered that these watering rights should now be granted to Nysu-Bastet himself. However, if the oracle dated to Year 19 of Psusennes I as many scholars traditionally assumed, Nysu-Bastet would have been separated from his mother by a total of 80 years from this date into Year 5 of Shoshenq I--a figure which is highly unlikely since Nysu-Bastet would not have waited until extreme old age to uphold his mother's watering rights. This implies that the aforementioned king Psusennes here must be identified with Psusennes II instead--Shoshenq I's immediate predecessor and, more significantly, that Psusennes II enjoyed a minimum reign of 19 years. \r"
^393 - "=\"Kitchen, p.290\">Kitchen, p.290</ref> This stela states that Wayheset adjudicated in a certain water dispute by consulting a land-register which is explicitly dated to Year 19 of a \"Pharaoh Psusennes\" in order to determine the water rights of a man name"
^714 - " name=\""
^735 - "\"/"
@@ -175,12 +175,12 @@
^1027 + "-"
^1377 + "--"
^1616 + "--"
-38 - "The term \"mother\" in ancient Egypt could also be an allusion to an ancestress, the matriarch of a lineage whereby Nysu-Bastet may have been petitioning for his hereditary water rights that belonged to his grandmother, whose family name was Tewhunet. However, this argument does not account for the use of Pharaoh as a title in the Dakhla stela—a literary device which first occurs late during the reign of Siamun, an Egyptian king who ruled between 45 to 64 years after Year 19 of Psusennes I. \r"
-38 + "The term \"mother\" in ancient Egypt could also be an allusion to an ancestress, the matriarch of a lineage whereby Nysu-Bastet may have been petitioning for his hereditary water rights that belonged to his grandmother, whose family name was Tewhunet. However, this argument does not account for the use of Pharaoh as a title in the Dakhla stela--a literary device which first occurs late during the reign of Siamun, an Egyptian king who ruled between 45 to 64 years after Year 19 of Psusennes I. \r"
+39 - "The term \"mother\" in ancient Egypt could also be an allusion to an ancestress, the matriarch of a lineage whereby Nysu-Bastet may have been petitioning for his hereditary water rights that belonged to his grandmother, whose family name was Tewhunet. However, this argument does not account for the use of Pharaoh as a title in the Dakhla stela—a literary device which first occurs late during the reign of Siamun, an Egyptian king who ruled between 45 to 64 years after Year 19 of Psusennes I. \r"
+39 + "The term \"mother\" in ancient Egypt could also be an allusion to an ancestress, the matriarch of a lineage whereby Nysu-Bastet may have been petitioning for his hereditary water rights that belonged to his grandmother, whose family name was Tewhunet. However, this argument does not account for the use of Pharaoh as a title in the Dakhla stela--a literary device which first occurs late during the reign of Siamun, an Egyptian king who ruled between 45 to 64 years after Year 19 of Psusennes I. \r"
^343 - "—"
^343 + "--"
-40 - "The most significant component of the Great Dakhla stela is its palaeography: the use of the title Pharaoh Psusennes. A scholar named Helen Jacquet-Gordon believed in the 1970s that the large Dakhla stela belonged to [[Shoshenq III]]'s reign due to its use of the title 'Pharaoh' directly with the ruling king's birth name—ie: \"'''Pharaoh Shoshenq'''\"--which was an important palaeographical development in Egyptian history. Throughout the Old, Middle and New Kingdoms of Ancient Egypt, the word pharaoh was never employed as a title such as Mr. and Mrs. or attached to a king's [[Ancient Egyptian royal titulary#Personal name (nomen)|nomen]] such as ''Pharaoh Ramesses'' or ''Pharaoh Amenhotep''; instead, the word '''pr-`3''' or pharaoh was used as a noun to refer to the ''activities'' of the king (i.e., it was \"Pharaoh\" who ordered the creation of a temple or statue, or the digging of a well, etc.). Rolf Krauss aptly observes that the earliest attested use of the word pharaoh as a title is documented in Year 17 of the 21st Dynasty king [[Siamun]] from Karnak Priestly Annals fragment 3B<ref>J-M Kruchten, Les annales des prētres de Karnak (OLA) 1989. pp.47-48</ref> while a second use of the title ''''[Pharaoh] [birth name]'''' occurs during Psusennes II's reign where a hieratic graffito in the Ptah chapel of the Abydos temple of Seti I explicitly refers to Psusennes II as the \"High Priest of Amen-Re, King of the Gods, the Leader, '''Pharaoh Psusennes'''.\"<ref>M.A. Murray, The Osireion at Abydos (London, 1989), 36; pl. XXI</ref><ref>Krauss, DE 62, pp.43-44</ref> Consequently, the practice of attaching the title ''pr-`3'' or pharaoh with a king's royal birth name had already started prior to the beginning of Shoshenq I's reign, let alone Shoshenq III. Hence, the Shoshenq mentioned in the large Year 5 Dakhla stela must have been Shoshenq I while the Psusennes mentioned in the same document likewise can only be Psusennes II which means that only 5 years (or 10 years if Psusennes II ruled Egypt for 24 years) would separate Nysu-Bastet from his mother.<ref name=\"Krauss, DE 62, pp.43-48\">Krauss, DE 62, pp.43-48</ref> The additional fact that the Large Dakhla stela contains a Year 5 IV Peret day 25 lunar date has helped date the aforementioned king Shoshenq's accession to 943 BC and demonstrates that the ruler here must be Shoshenq I, not Shoshenq III who ruled a century later.<ref name=\"Krauss, DE 62, pp.43-48\"/> Helen Jacquet-Gordon did not know of the two prior examples pertaining to Siamun and Psusennes II.\r"
-40 + "The most significant component of the Great Dakhla stela is its palaeography: the use of the title Pharaoh Psusennes. A scholar named Helen Jacquet-Gordon believed in the 1970s that the large Dakhla stela belonged to [[Shoshenq III]]'s reign due to its use of the title 'Pharaoh' directly with the ruling king's birth name--ie: \"'''Pharaoh Shoshenq'''\"--which was an important palaeographical development in Egyptian history. Throughout the Old, Middle and New Kingdoms of Ancient Egypt, the word pharaoh was never employed as a title such as Mr. and Mrs. or attached to a king's [[Ancient Egyptian royal titulary#Personal name (nomen)|nomen]] such as ''Pharaoh Ramesses'' or ''Pharaoh Amenhotep''; instead, the word '''pr-`3''' or pharaoh was used as a noun to refer to the ''activities'' of the king (i.e., it was \"Pharaoh\" who ordered the creation of a temple or statue, or the digging of a well, etc.). Rolf Krauss aptly observes that the earliest attested use of the word pharaoh as a title is documented in Year 17 of the 21st Dynasty king [[Siamun]] from Karnak Priestly Annals fragment 3B<ref>J-M Kruchten, Les annales des prētres de Karnak (OLA) 1989. pp.47-48</ref> while a second use of the title ''''[Pharaoh] [birth name]'''' occurs during Psusennes II's reign where a hieratic graffito in the Ptah chapel of the Abydos temple of Seti I explicitly refers to Psusennes II as the \"High Priest of Amen-Re, King of the Gods, the Leader, '''Pharaoh Psusennes'''.\"<ref>M.A. Murray, The Osireion at Abydos (London, 1989), 36; pl. XXI</ref><ref>Krauss, DE 62, pp.43-44</ref> Consequently, the practice of attaching the title ''pr-`3'' or pharaoh with a king's royal birth name had already started prior to the beginning of Shoshenq I's reign, let alone Shoshenq III. Hence, the Shoshenq mentioned in the large Year 5 Dakhla stela must have been Shoshenq I while the Psusennes mentioned in the same document likewise can only be Psusennes II which means that only 5 years (or 10 years if Psusennes II ruled Egypt for 24 years) would separate Nysu-Bastet from his mother.<ref>Krauss, DE 62, pp.43-48</ref> The additional fact that the Large Dakhla stela contains a Year 5 IV Peret day 25 lunar date has helped date the aforementioned king Shoshenq's accession to 943 BC and demonstrates that the ruler here must be Shoshenq I, not Shoshenq III who ruled a century later.<ref>Krauss, DE 62, pp.43-48</ref> Helen Jacquet-Gordon did not know of the two prior examples pertaining to Siamun and Psusennes II.\r"
+41 - "The most significant component of the Great Dakhla stela is its palaeography: the use of the title Pharaoh Psusennes. A scholar named Helen Jacquet-Gordon believed in the 1970s that the large Dakhla stela belonged to [[Shoshenq III]]'s reign due to its use of the title 'Pharaoh' directly with the ruling king's birth name—ie: \"'''Pharaoh Shoshenq'''\"--which was an important palaeographical development in Egyptian history. Throughout the Old, Middle and New Kingdoms of Ancient Egypt, the word pharaoh was never employed as a title such as Mr. and Mrs. or attached to a king's [[Ancient Egyptian royal titulary#Personal name (nomen)|nomen]] such as ''Pharaoh Ramesses'' or ''Pharaoh Amenhotep''; instead, the word '''pr-`3''' or pharaoh was used as a noun to refer to the ''activities'' of the king (i.e., it was \"Pharaoh\" who ordered the creation of a temple or statue, or the digging of a well, etc.). Rolf Krauss aptly observes that the earliest attested use of the word pharaoh as a title is documented in Year 17 of the 21st Dynasty king [[Siamun]] from Karnak Priestly Annals fragment 3B<ref>J-M Kruchten, Les annales des prētres de Karnak (OLA) 1989. pp.47-48</ref> while a second use of the title ''''[Pharaoh] [birth name]'''' occurs during Psusennes II's reign where a hieratic graffito in the Ptah chapel of the Abydos temple of Seti I explicitly refers to Psusennes II as the \"High Priest of Amen-Re, King of the Gods, the Leader, '''Pharaoh Psusennes'''.\"<ref>M.A. Murray, The Osireion at Abydos (London, 1989), 36; pl. XXI</ref><ref>Krauss, DE 62, pp.43-44</ref> Consequently, the practice of attaching the title ''pr-`3'' or pharaoh with a king's royal birth name had already started prior to the beginning of Shoshenq I's reign, let alone Shoshenq III. Hence, the Shoshenq mentioned in the large Year 5 Dakhla stela must have been Shoshenq I while the Psusennes mentioned in the same document likewise can only be Psusennes II which means that only 5 years (or 10 years if Psusennes II ruled Egypt for 24 years) would separate Nysu-Bastet from his mother.<ref name=\"Krauss, DE 62, pp.43-48\">Krauss, DE 62, pp.43-48</ref> The additional fact that the Large Dakhla stela contains a Year 5 IV Peret day 25 lunar date has helped date the aforementioned king Shoshenq's accession to 943 BC and demonstrates that the ruler here must be Shoshenq I, not Shoshenq III who ruled a century later.<ref name=\"Krauss, DE 62, pp.43-48\"/> Helen Jacquet-Gordon did not know of the two prior examples pertaining to Siamun and Psusennes II.\r"
+41 + "The most significant component of the Great Dakhla stela is its palaeography: the use of the title Pharaoh Psusennes. A scholar named Helen Jacquet-Gordon believed in the 1970s that the large Dakhla stela belonged to [[Shoshenq III]]'s reign due to its use of the title 'Pharaoh' directly with the ruling king's birth name--ie: \"'''Pharaoh Shoshenq'''\"--which was an important palaeographical development in Egyptian history. Throughout the Old, Middle and New Kingdoms of Ancient Egypt, the word pharaoh was never employed as a title such as Mr. and Mrs. or attached to a king's [[Ancient Egyptian royal titulary#Personal name (nomen)|nomen]] such as ''Pharaoh Ramesses'' or ''Pharaoh Amenhotep''; instead, the word '''pr-`3''' or pharaoh was used as a noun to refer to the ''activities'' of the king (i.e., it was \"Pharaoh\" who ordered the creation of a temple or statue, or the digging of a well, etc.). Rolf Krauss aptly observes that the earliest attested use of the word pharaoh as a title is documented in Year 17 of the 21st Dynasty king [[Siamun]] from Karnak Priestly Annals fragment 3B<ref>J-M Kruchten, Les annales des prētres de Karnak (OLA) 1989. pp.47-48</ref> while a second use of the title ''''[Pharaoh] [birth name]'''' occurs during Psusennes II's reign where a hieratic graffito in the Ptah chapel of the Abydos temple of Seti I explicitly refers to Psusennes II as the \"High Priest of Amen-Re, King of the Gods, the Leader, '''Pharaoh Psusennes'''.\"<ref>M.A. Murray, The Osireion at Abydos (London, 1989), 36; pl. XXI</ref><ref>Krauss, DE 62, pp.43-44</ref> Consequently, the practice of attaching the title ''pr-`3'' or pharaoh with a king's royal birth name had already started prior to the beginning of Shoshenq I's reign, let alone Shoshenq III. Hence, the Shoshenq mentioned in the large Year 5 Dakhla stela must have been Shoshenq I while the Psusennes mentioned in the same document likewise can only be Psusennes II which means that only 5 years (or 10 years if Psusennes II ruled Egypt for 24 years) would separate Nysu-Bastet from his mother.<ref>Krauss, DE 62, pp.43-48</ref> The additional fact that the Large Dakhla stela contains a Year 5 IV Peret day 25 lunar date has helped date the aforementioned king Shoshenq's accession to 943 BC and demonstrates that the ruler here must be Shoshenq I, not Shoshenq III who ruled a century later.<ref>Krauss, DE 62, pp.43-48</ref> Helen Jacquet-Gordon did not know of the two prior examples pertaining to Siamun and Psusennes II.\r"
^322 - "—"
^2081 - " name=\"Krauss, DE 62, pp.43-48\""
^2380 - " name=\""
@@ -188,8 +188,8 @@
^322 + "--"
^2379 + ">"
^2403 + "</ref"
-43 - "The editors of the recent 2006 book on titled 'Handbook on Ancient Egyptian Chronology'--Erik Hornung, Rolf Krauss and David Warburton—accept this logical reasoning and have amended Manetho's original figure of 14 years for Psusennes II to 24 years instead to Psusennes II.<ref>Erik Hornung, Rolf Krauss & David Warburton (editors), Handbook of Ancient Egyptian Chronology (Handbook of Oriental Studies), Brill: 2006, p.474 & p.488</ref> This is not unprecedented since previous Egyptologists had previously amended the reign of Siamun by a decade from 9 years—as preserved in surviving copies of Manetho's Epitome—to 19 years based on certain Year 16 and Year 17 dates attested for the latter.<ref name=\"Kitchen, p.423\"/> Psusennes II ruled Egypt for a minimum of 19 years based on the internal chronology of the Large Dakhla stela. However, a calculation of a lunar ''Tepi Shemu'' feast which records the induction of Hori son of Nespaneferhor into the Amun priesthood in regnal year 17 of [[Siamun]], Psusennes II's predecessor—demonstrates that this date was equivalent to 970 BC.<ref>Hornung, Krauss & Warburton, pp.474-475</ref> Since Siamun enjoyed a reign of 19 years, he would have died 2 years later in 968/967 BC and been succeeded by Psusennes II by 967 BC at the latest. Consequently, a reign of 24 years or 967-943 BC is now likely for Psusennes II; hence, his reign has been raised from 14 to 24 years.\r"
-43 + "The editors of the recent 2006 book on titled 'Handbook on Ancient Egyptian Chronology'--Erik Hornung, Rolf Krauss and David Warburton--accept this logical reasoning and have amended Manetho's original figure of 14 years for Psusennes II to 24 years instead to Psusennes II.<ref>Erik Hornung, Rolf Krauss & David Warburton (editors), Handbook of Ancient Egyptian Chronology (Handbook of Oriental Studies), Brill: 2006, p.474 & p.488</ref> This is not unprecedented since previous Egyptologists had previously amended the reign of Siamun by a decade from 9 years--as preserved in surviving copies of Manetho's Epitome--to 19 years based on certain Year 16 and Year 17 dates attested for the latter.<ref>Kitchen, p.423</ref> Psusennes II ruled Egypt for a minimum of 19 years based on the internal chronology of the Large Dakhla stela. However, a calculation of a lunar ''Tepi Shemu'' feast which records the induction of Hori son of Nespaneferhor into the Amun priesthood in regnal year 17 of [[Siamun]], Psusennes II's predecessor--demonstrates that this date was equivalent to 970 BC.<ref>Hornung, Krauss & Warburton, pp.474-475</ref> Since Siamun enjoyed a reign of 19 years, he would have died 2 years later in 968/967 BC and been succeeded by Psusennes II by 967 BC at the latest. Consequently, a reign of 24 years or 967-943 BC is now likely for Psusennes II; hence, his reign has been raised from 14 to 24 years.\r"
+44 - "The editors of the recent 2006 book on titled 'Handbook on Ancient Egyptian Chronology'--Erik Hornung, Rolf Krauss and David Warburton—accept this logical reasoning and have amended Manetho's original figure of 14 years for Psusennes II to 24 years instead to Psusennes II.<ref>Erik Hornung, Rolf Krauss & David Warburton (editors), Handbook of Ancient Egyptian Chronology (Handbook of Oriental Studies), Brill: 2006, p.474 & p.488</ref> This is not unprecedented since previous Egyptologists had previously amended the reign of Siamun by a decade from 9 years—as preserved in surviving copies of Manetho's Epitome—to 19 years based on certain Year 16 and Year 17 dates attested for the latter.<ref name=\"Kitchen, p.423\"/> Psusennes II ruled Egypt for a minimum of 19 years based on the internal chronology of the Large Dakhla stela. However, a calculation of a lunar ''Tepi Shemu'' feast which records the induction of Hori son of Nespaneferhor into the Amun priesthood in regnal year 17 of [[Siamun]], Psusennes II's predecessor—demonstrates that this date was equivalent to 970 BC.<ref>Hornung, Krauss & Warburton, pp.474-475</ref> Since Siamun enjoyed a reign of 19 years, he would have died 2 years later in 968/967 BC and been succeeded by Psusennes II by 967 BC at the latest. Consequently, a reign of 24 years or 967-943 BC is now likely for Psusennes II; hence, his reign has been raised from 14 to 24 years.\r"
+44 + "The editors of the recent 2006 book on titled 'Handbook on Ancient Egyptian Chronology'--Erik Hornung, Rolf Krauss and David Warburton--accept this logical reasoning and have amended Manetho's original figure of 14 years for Psusennes II to 24 years instead to Psusennes II.<ref>Erik Hornung, Rolf Krauss & David Warburton (editors), Handbook of Ancient Egyptian Chronology (Handbook of Oriental Studies), Brill: 2006, p.474 & p.488</ref> This is not unprecedented since previous Egyptologists had previously amended the reign of Siamun by a decade from 9 years--as preserved in surviving copies of Manetho's Epitome--to 19 years based on certain Year 16 and Year 17 dates attested for the latter.<ref>Kitchen, p.423</ref> Psusennes II ruled Egypt for a minimum of 19 years based on the internal chronology of the Large Dakhla stela. However, a calculation of a lunar ''Tepi Shemu'' feast which records the induction of Hori son of Nespaneferhor into the Amun priesthood in regnal year 17 of [[Siamun]], Psusennes II's predecessor--demonstrates that this date was equivalent to 970 BC.<ref>Hornung, Krauss & Warburton, pp.474-475</ref> Since Siamun enjoyed a reign of 19 years, he would have died 2 years later in 968/967 BC and been succeeded by Psusennes II by 967 BC at the latest. Consequently, a reign of 24 years or 967-943 BC is now likely for Psusennes II; hence, his reign has been raised from 14 to 24 years.\r"
^134 - "—"
^562 - "—"
^618 - "—"
@@ -202,6 +202,6 @@
^701 + ">"
^716 + "</ref"
^1030 + "--"
-50 - "* Aidan Dodson, RdE 38(1987), pp.&nbsp;50-51.\r"
-50 + "* Aidan Dodson, RdE 38(1987), pp.50-51.\r"
+51 - "* Aidan Dodson, RdE 38(1987), pp.&nbsp;50-51.\r"
+51 + "* Aidan Dodson, RdE 38(1987), pp.50-51.\r"
^33 - "&nbsp;"
diff --git a/lib/text/diff/testdata/Top_Gear_Series_14_diff_LevelLines b/lib/text/diff/testdata/Top_Gear_Series_14_diff_LevelLines
index 5e1e9e6d..fdb463fb 100644
--- a/lib/text/diff/testdata/Top_Gear_Series_14_diff_LevelLines
+++ b/lib/text/diff/testdata/Top_Gear_Series_14_diff_LevelLines
@@ -1,3 +1,3 @@
--++
-47 - "'''Review''': Clarkson reviews the new V10-engined [[Audi R8#V10 engine|Audi R8]] which produces 518bhp and a top speed of 199mph. He praises the car immensely, calling it \"phenomenal\" and that the handling is \"epic\", saying that it is \"spectacularly good\" whilst alse being fairly practical also. However he thinks that the cup holder is wrongly placed, being in a position that one would knock the contents over whilst changing gear, that the trip computer on the car he tested was broken (although it was later revealed that he had not reset it properly) and that the list price of around £100,000 was too expensive as were the optional extras e.g. ceramic brakes are an extra £7,000 and colour coordinated seat belts £750 plus Audi charge an additional £500 if one were to pick it up from the dealership instead of having it delivered. Overall, he said he would not buy the R8 due to it being \"too perfect\" and \"joyless\" stating that it was built purely for speed instead of fun.\r"
-47 + "'''Review''': Clarkson reviews the new V10-engined [[Audi R8#V10 engine|Audi R8]] which produces 518bhp and a top speed of 199mph. He praises the car immensely, calling it \"phenomenal\" and that the handling is \"epic\", saying that it is \"spectacularly good\" whilst being fairly practical also. However, he thinks that the cup holder is wrongly placed, being in a position that one would knock the contents over whilst changing gear, that the trip computer on the car he tested was broken (although it was later revealed that he had not reset it properly) and that the list price of around £100,000 was too expensive as were the optional extras e.g. ceramic brakes are an extra £7,000 and colour coordinated seat belts £750 plus Audi charge an additional £500 if one were to pick it up from the dealership instead of having it delivered. Overall, he said he would not buy the R8 due to it being \"too perfect\" and \"joyless\" stating that it was built purely for speed instead of fun.\r"
+48 - "'''Review''': Clarkson reviews the new V10-engined [[Audi R8#V10 engine|Audi R8]] which produces 518bhp and a top speed of 199mph. He praises the car immensely, calling it \"phenomenal\" and that the handling is \"epic\", saying that it is \"spectacularly good\" whilst alse being fairly practical also. However he thinks that the cup holder is wrongly placed, being in a position that one would knock the contents over whilst changing gear, that the trip computer on the car he tested was broken (although it was later revealed that he had not reset it properly) and that the list price of around £100,000 was too expensive as were the optional extras e.g. ceramic brakes are an extra £7,000 and colour coordinated seat belts £750 plus Audi charge an additional £500 if one were to pick it up from the dealership instead of having it delivered. Overall, he said he would not buy the R8 due to it being \"too perfect\" and \"joyless\" stating that it was built purely for speed instead of fun.\r"
+48 + "'''Review''': Clarkson reviews the new V10-engined [[Audi R8#V10 engine|Audi R8]] which produces 518bhp and a top speed of 199mph. He praises the car immensely, calling it \"phenomenal\" and that the handling is \"epic\", saying that it is \"spectacularly good\" whilst being fairly practical also. However, he thinks that the cup holder is wrongly placed, being in a position that one would knock the contents over whilst changing gear, that the trip computer on the car he tested was broken (although it was later revealed that he had not reset it properly) and that the list price of around £100,000 was too expensive as were the optional extras e.g. ceramic brakes are an extra £7,000 and colour coordinated seat belts £750 plus Audi charge an additional £500 if one were to pick it up from the dealership instead of having it delivered. Overall, he said he would not buy the R8 due to it being \"too perfect\" and \"joyless\" stating that it was built purely for speed instead of fun.\r"
diff --git a/lib/text/diff/testdata/Top_Gear_Series_14_diff_LevelLines_reverse b/lib/text/diff/testdata/Top_Gear_Series_14_diff_LevelLines_reverse
index 68c34ff1..d0836b47 100644
--- a/lib/text/diff/testdata/Top_Gear_Series_14_diff_LevelLines_reverse
+++ b/lib/text/diff/testdata/Top_Gear_Series_14_diff_LevelLines_reverse
@@ -1,3 +1,3 @@
--++
-47 - "'''Review''': Clarkson reviews the new V10-engined [[Audi R8#V10 engine|Audi R8]] which produces 518bhp and a top speed of 199mph. He praises the car immensely, calling it \"phenomenal\" and that the handling is \"epic\", saying that it is \"spectacularly good\" whilst being fairly practical also. However, he thinks that the cup holder is wrongly placed, being in a position that one would knock the contents over whilst changing gear, that the trip computer on the car he tested was broken (although it was later revealed that he had not reset it properly) and that the list price of around £100,000 was too expensive as were the optional extras e.g. ceramic brakes are an extra £7,000 and colour coordinated seat belts £750 plus Audi charge an additional £500 if one were to pick it up from the dealership instead of having it delivered. Overall, he said he would not buy the R8 due to it being \"too perfect\" and \"joyless\" stating that it was built purely for speed instead of fun.\r"
-47 + "'''Review''': Clarkson reviews the new V10-engined [[Audi R8#V10 engine|Audi R8]] which produces 518bhp and a top speed of 199mph. He praises the car immensely, calling it \"phenomenal\" and that the handling is \"epic\", saying that it is \"spectacularly good\" whilst alse being fairly practical also. However he thinks that the cup holder is wrongly placed, being in a position that one would knock the contents over whilst changing gear, that the trip computer on the car he tested was broken (although it was later revealed that he had not reset it properly) and that the list price of around £100,000 was too expensive as were the optional extras e.g. ceramic brakes are an extra £7,000 and colour coordinated seat belts £750 plus Audi charge an additional £500 if one were to pick it up from the dealership instead of having it delivered. Overall, he said he would not buy the R8 due to it being \"too perfect\" and \"joyless\" stating that it was built purely for speed instead of fun.\r"
+48 - "'''Review''': Clarkson reviews the new V10-engined [[Audi R8#V10 engine|Audi R8]] which produces 518bhp and a top speed of 199mph. He praises the car immensely, calling it \"phenomenal\" and that the handling is \"epic\", saying that it is \"spectacularly good\" whilst being fairly practical also. However, he thinks that the cup holder is wrongly placed, being in a position that one would knock the contents over whilst changing gear, that the trip computer on the car he tested was broken (although it was later revealed that he had not reset it properly) and that the list price of around £100,000 was too expensive as were the optional extras e.g. ceramic brakes are an extra £7,000 and colour coordinated seat belts £750 plus Audi charge an additional £500 if one were to pick it up from the dealership instead of having it delivered. Overall, he said he would not buy the R8 due to it being \"too perfect\" and \"joyless\" stating that it was built purely for speed instead of fun.\r"
+48 + "'''Review''': Clarkson reviews the new V10-engined [[Audi R8#V10 engine|Audi R8]] which produces 518bhp and a top speed of 199mph. He praises the car immensely, calling it \"phenomenal\" and that the handling is \"epic\", saying that it is \"spectacularly good\" whilst alse being fairly practical also. However he thinks that the cup holder is wrongly placed, being in a position that one would knock the contents over whilst changing gear, that the trip computer on the car he tested was broken (although it was later revealed that he had not reset it properly) and that the list price of around £100,000 was too expensive as were the optional extras e.g. ceramic brakes are an extra £7,000 and colour coordinated seat belts £750 plus Audi charge an additional £500 if one were to pick it up from the dealership instead of having it delivered. Overall, he said he would not buy the R8 due to it being \"too perfect\" and \"joyless\" stating that it was built purely for speed instead of fun.\r"
diff --git a/lib/text/diff/testdata/Top_Gear_Series_14_diff_LevelWords b/lib/text/diff/testdata/Top_Gear_Series_14_diff_LevelWords
index 9e64cc58..cc0d0794 100644
--- a/lib/text/diff/testdata/Top_Gear_Series_14_diff_LevelWords
+++ b/lib/text/diff/testdata/Top_Gear_Series_14_diff_LevelWords
@@ -1,5 +1,5 @@
--++
-47 - "'''Review''': Clarkson reviews the new V10-engined [[Audi R8#V10 engine|Audi R8]] which produces 518bhp and a top speed of 199mph. He praises the car immensely, calling it \"phenomenal\" and that the handling is \"epic\", saying that it is \"spectacularly good\" whilst alse being fairly practical also. However he thinks that the cup holder is wrongly placed, being in a position that one would knock the contents over whilst changing gear, that the trip computer on the car he tested was broken (although it was later revealed that he had not reset it properly) and that the list price of around £100,000 was too expensive as were the optional extras e.g. ceramic brakes are an extra £7,000 and colour coordinated seat belts £750 plus Audi charge an additional £500 if one were to pick it up from the dealership instead of having it delivered. Overall, he said he would not buy the R8 due to it being \"too perfect\" and \"joyless\" stating that it was built purely for speed instead of fun.\r"
-47 + "'''Review''': Clarkson reviews the new V10-engined [[Audi R8#V10 engine|Audi R8]] which produces 518bhp and a top speed of 199mph. He praises the car immensely, calling it \"phenomenal\" and that the handling is \"epic\", saying that it is \"spectacularly good\" whilst being fairly practical also. However, he thinks that the cup holder is wrongly placed, being in a position that one would knock the contents over whilst changing gear, that the trip computer on the car he tested was broken (although it was later revealed that he had not reset it properly) and that the list price of around £100,000 was too expensive as were the optional extras e.g. ceramic brakes are an extra £7,000 and colour coordinated seat belts £750 plus Audi charge an additional £500 if one were to pick it up from the dealership instead of having it delivered. Overall, he said he would not buy the R8 due to it being \"too perfect\" and \"joyless\" stating that it was built purely for speed instead of fun.\r"
+48 - "'''Review''': Clarkson reviews the new V10-engined [[Audi R8#V10 engine|Audi R8]] which produces 518bhp and a top speed of 199mph. He praises the car immensely, calling it \"phenomenal\" and that the handling is \"epic\", saying that it is \"spectacularly good\" whilst alse being fairly practical also. However he thinks that the cup holder is wrongly placed, being in a position that one would knock the contents over whilst changing gear, that the trip computer on the car he tested was broken (although it was later revealed that he had not reset it properly) and that the list price of around £100,000 was too expensive as were the optional extras e.g. ceramic brakes are an extra £7,000 and colour coordinated seat belts £750 plus Audi charge an additional £500 if one were to pick it up from the dealership instead of having it delivered. Overall, he said he would not buy the R8 due to it being \"too perfect\" and \"joyless\" stating that it was built purely for speed instead of fun.\r"
+48 + "'''Review''': Clarkson reviews the new V10-engined [[Audi R8#V10 engine|Audi R8]] which produces 518bhp and a top speed of 199mph. He praises the car immensely, calling it \"phenomenal\" and that the handling is \"epic\", saying that it is \"spectacularly good\" whilst being fairly practical also. However, he thinks that the cup holder is wrongly placed, being in a position that one would knock the contents over whilst changing gear, that the trip computer on the car he tested was broken (although it was later revealed that he had not reset it properly) and that the list price of around £100,000 was too expensive as were the optional extras e.g. ceramic brakes are an extra £7,000 and colour coordinated seat belts £750 plus Audi charge an additional £500 if one were to pick it up from the dealership instead of having it delivered. Overall, he said he would not buy the R8 due to it being \"too perfect\" and \"joyless\" stating that it was built purely for speed instead of fun.\r"
^264 - "alse "
^300 + ","
diff --git a/lib/text/diff/testdata/Top_Gear_Series_14_diff_LevelWords_reverse b/lib/text/diff/testdata/Top_Gear_Series_14_diff_LevelWords_reverse
index 18cdbe6c..212e7b2e 100644
--- a/lib/text/diff/testdata/Top_Gear_Series_14_diff_LevelWords_reverse
+++ b/lib/text/diff/testdata/Top_Gear_Series_14_diff_LevelWords_reverse
@@ -1,5 +1,5 @@
--++
-47 - "'''Review''': Clarkson reviews the new V10-engined [[Audi R8#V10 engine|Audi R8]] which produces 518bhp and a top speed of 199mph. He praises the car immensely, calling it \"phenomenal\" and that the handling is \"epic\", saying that it is \"spectacularly good\" whilst being fairly practical also. However, he thinks that the cup holder is wrongly placed, being in a position that one would knock the contents over whilst changing gear, that the trip computer on the car he tested was broken (although it was later revealed that he had not reset it properly) and that the list price of around £100,000 was too expensive as were the optional extras e.g. ceramic brakes are an extra £7,000 and colour coordinated seat belts £750 plus Audi charge an additional £500 if one were to pick it up from the dealership instead of having it delivered. Overall, he said he would not buy the R8 due to it being \"too perfect\" and \"joyless\" stating that it was built purely for speed instead of fun.\r"
-47 + "'''Review''': Clarkson reviews the new V10-engined [[Audi R8#V10 engine|Audi R8]] which produces 518bhp and a top speed of 199mph. He praises the car immensely, calling it \"phenomenal\" and that the handling is \"epic\", saying that it is \"spectacularly good\" whilst alse being fairly practical also. However he thinks that the cup holder is wrongly placed, being in a position that one would knock the contents over whilst changing gear, that the trip computer on the car he tested was broken (although it was later revealed that he had not reset it properly) and that the list price of around £100,000 was too expensive as were the optional extras e.g. ceramic brakes are an extra £7,000 and colour coordinated seat belts £750 plus Audi charge an additional £500 if one were to pick it up from the dealership instead of having it delivered. Overall, he said he would not buy the R8 due to it being \"too perfect\" and \"joyless\" stating that it was built purely for speed instead of fun.\r"
+48 - "'''Review''': Clarkson reviews the new V10-engined [[Audi R8#V10 engine|Audi R8]] which produces 518bhp and a top speed of 199mph. He praises the car immensely, calling it \"phenomenal\" and that the handling is \"epic\", saying that it is \"spectacularly good\" whilst being fairly practical also. However, he thinks that the cup holder is wrongly placed, being in a position that one would knock the contents over whilst changing gear, that the trip computer on the car he tested was broken (although it was later revealed that he had not reset it properly) and that the list price of around £100,000 was too expensive as were the optional extras e.g. ceramic brakes are an extra £7,000 and colour coordinated seat belts £750 plus Audi charge an additional £500 if one were to pick it up from the dealership instead of having it delivered. Overall, he said he would not buy the R8 due to it being \"too perfect\" and \"joyless\" stating that it was built purely for speed instead of fun.\r"
+48 + "'''Review''': Clarkson reviews the new V10-engined [[Audi R8#V10 engine|Audi R8]] which produces 518bhp and a top speed of 199mph. He praises the car immensely, calling it \"phenomenal\" and that the handling is \"epic\", saying that it is \"spectacularly good\" whilst alse being fairly practical also. However he thinks that the cup holder is wrongly placed, being in a position that one would knock the contents over whilst changing gear, that the trip computer on the car he tested was broken (although it was later revealed that he had not reset it properly) and that the list price of around £100,000 was too expensive as were the optional extras e.g. ceramic brakes are an extra £7,000 and colour coordinated seat belts £750 plus Audi charge an additional £500 if one were to pick it up from the dealership instead of having it delivered. Overall, he said he would not buy the R8 due to it being \"too perfect\" and \"joyless\" stating that it was built purely for speed instead of fun.\r"
^300 - ","
^264 + "alse "
diff --git a/lib/text/diff/testdata/empty_lines_diff_LevelLines b/lib/text/diff/testdata/empty_lines_diff_LevelLines
index 5cb28b8e..d881fc13 100644
--- a/lib/text/diff/testdata/empty_lines_diff_LevelLines
+++ b/lib/text/diff/testdata/empty_lines_diff_LevelLines
@@ -1,3 +1,3 @@
++++
-4 + ""
5 + ""
+6 + ""
diff --git a/lib/text/diff/testdata/empty_lines_diff_LevelLines_reverse b/lib/text/diff/testdata/empty_lines_diff_LevelLines_reverse
index d17b1a05..d587491f 100644
--- a/lib/text/diff/testdata/empty_lines_diff_LevelLines_reverse
+++ b/lib/text/diff/testdata/empty_lines_diff_LevelLines_reverse
@@ -1,3 +1,3 @@
----
-4 - ""
5 - ""
+6 - ""
diff --git a/lib/text/diff/testdata/empty_lines_diff_LevelWords b/lib/text/diff/testdata/empty_lines_diff_LevelWords
index 5cb28b8e..d881fc13 100644
--- a/lib/text/diff/testdata/empty_lines_diff_LevelWords
+++ b/lib/text/diff/testdata/empty_lines_diff_LevelWords
@@ -1,3 +1,3 @@
++++
-4 + ""
5 + ""
+6 + ""
diff --git a/lib/text/diff/testdata/empty_lines_diff_LevelWords_reverse b/lib/text/diff/testdata/empty_lines_diff_LevelWords_reverse
index d17b1a05..d587491f 100644
--- a/lib/text/diff/testdata/empty_lines_diff_LevelWords_reverse
+++ b/lib/text/diff/testdata/empty_lines_diff_LevelWords_reverse
@@ -1,3 +1,3 @@
----
-4 - ""
5 - ""
+6 - ""
diff --git a/lib/text/diff/testdata/peeps_diff_LevelLines b/lib/text/diff/testdata/peeps_diff_LevelLines
index 6b180d73..218ee3bb 100644
--- a/lib/text/diff/testdata/peeps_diff_LevelLines
+++ b/lib/text/diff/testdata/peeps_diff_LevelLines
@@ -1,6 +1,6 @@
++++
-22 + "\r"
23 + "\r"
-24 + "== Definitionz!!!?? ==\r"
-25 + "A peep is a person involved in a gang or posse, who which blows.\r"
-26 + "\r"
+24 + "\r"
+25 + "== Definitionz!!!?? ==\r"
+26 + "A peep is a person involved in a gang or posse, who which blows.\r"
+27 + "\r"
diff --git a/lib/text/diff/testdata/peeps_diff_LevelLines_reverse b/lib/text/diff/testdata/peeps_diff_LevelLines_reverse
index a4781bd5..8129fcc5 100644
--- a/lib/text/diff/testdata/peeps_diff_LevelLines_reverse
+++ b/lib/text/diff/testdata/peeps_diff_LevelLines_reverse
@@ -1,6 +1,6 @@
----
-22 - "\r"
23 - "\r"
-24 - "== Definitionz!!!?? ==\r"
-25 - "A peep is a person involved in a gang or posse, who which blows.\r"
-26 - "\r"
+24 - "\r"
+25 - "== Definitionz!!!?? ==\r"
+26 - "A peep is a person involved in a gang or posse, who which blows.\r"
+27 - "\r"
diff --git a/lib/text/diff/testdata/peeps_diff_LevelWords b/lib/text/diff/testdata/peeps_diff_LevelWords
index 6b180d73..218ee3bb 100644
--- a/lib/text/diff/testdata/peeps_diff_LevelWords
+++ b/lib/text/diff/testdata/peeps_diff_LevelWords
@@ -1,6 +1,6 @@
++++
-22 + "\r"
23 + "\r"
-24 + "== Definitionz!!!?? ==\r"
-25 + "A peep is a person involved in a gang or posse, who which blows.\r"
-26 + "\r"
+24 + "\r"
+25 + "== Definitionz!!!?? ==\r"
+26 + "A peep is a person involved in a gang or posse, who which blows.\r"
+27 + "\r"
diff --git a/lib/text/diff/testdata/peeps_diff_LevelWords_reverse b/lib/text/diff/testdata/peeps_diff_LevelWords_reverse
index a4781bd5..8129fcc5 100644
--- a/lib/text/diff/testdata/peeps_diff_LevelWords_reverse
+++ b/lib/text/diff/testdata/peeps_diff_LevelWords_reverse
@@ -1,6 +1,6 @@
----
-22 - "\r"
23 - "\r"
-24 - "== Definitionz!!!?? ==\r"
-25 - "A peep is a person involved in a gang or posse, who which blows.\r"
-26 - "\r"
+24 - "\r"
+25 - "== Definitionz!!!?? ==\r"
+26 - "A peep is a person involved in a gang or posse, who which blows.\r"
+27 - "\r"
diff --git a/lib/text/diff/testdata/text01_diff_LevelLines b/lib/text/diff/testdata/text01_diff_LevelLines
index 91855401..d8a9329b 100644
--- a/lib/text/diff/testdata/text01_diff_LevelLines
+++ b/lib/text/diff/testdata/text01_diff_LevelLines
@@ -1,3 +1,3 @@
--++
-0 - "Recently, the first conclusive date for king Psusennes II was revealed in a newly published priestly annal stone block. This document, which has been designated as 'Block Karnak 94, CL 2149,' records the induction of a priest named Nesankhefenmaat into the chapel of Amun-Re within the Karnak precint in Year 11 the first month of Shemu day 13 of a king named Psusennes.<ref>Frederic Payraudeau, ''De nouvelles annales sacerdotales de Siamon, Psousennès II et Osorkon Ier.'', BIFAO 108 (2008), p.294</ref> The preceding line of this document recorded the induction of Nesankhefenmaat's father, a certain Nesamun, into the priesthood of Amun-Re in king Siamun's reign.<ref>Payraudeau, BIFAO 108, p.294</ref> Siamun was the predecessor of Psusennes II at Tanis. The identification of the aforementioned Psusennes with Psusennes II is certain since the same fragmentary annal document next records--in the following line--the induction of Hor, the son of Nesankhefenmaat, into the priesthood of the chapel of Amun-Re at Karnak in Year 3 the second month of Akhet day 14 of king Osorkon I's reign just one generation later.<ref>Payraudeau, BIFAO 108, p.294</ref> Therefore, the Year 11 date can only be assigned to Psusennes II and constitutes the first securely attested date for this pharaoh's reign."
-0 + "Recently, the first conclusive date for king Psusennes II was revealed in a newly published priestly annal stone block. This document, which has been designated as 'Block Karnak 94, CL 2149,' records the induction of a priest named Nesankhefenmaat into the chapel of Amun-Re within the Karnak precint in Year 11 the first month of Shemu day 13 of a king named Psusennes.<ref>Frederic Payraudeau, ''De nouvelles annales sacerdotales de Siamon, Psousennès II et Osorkon Ier.'', BIFAO 108 (2008), p.294</ref> The preceding line of this document recorded the induction of Nesankhefenmaat's father, a certain Nesamun, into the priesthood of Amun-Re in king Siamun's reign.<ref name=\"Payraudeau, BIFAO 108, p.294\">Payraudeau, BIFAO 108, p.294</ref> Siamun was the predecessor of Psusennes II at Tanis. The identification of the aforementioned Psusennes with Psusennes II is certain since the same fragmentary annal document next records—in the following line—the induction of Hor, the son of Nesankhefenmaat, into the priesthood of the chapel of Amun-Re at Karnak in Year 3 the second month of Akhet day 14 of king Osorkon I's reign just one generation later.<ref name=\"Payraudeau, BIFAO 108, p.294\"/> Therefore, the Year 11 date can only be assigned to Psusennes II and constitutes the first securely attested date for this pharaoh's reign."
+1 - "Recently, the first conclusive date for king Psusennes II was revealed in a newly published priestly annal stone block. This document, which has been designated as 'Block Karnak 94, CL 2149,' records the induction of a priest named Nesankhefenmaat into the chapel of Amun-Re within the Karnak precint in Year 11 the first month of Shemu day 13 of a king named Psusennes.<ref>Frederic Payraudeau, ''De nouvelles annales sacerdotales de Siamon, Psousennès II et Osorkon Ier.'', BIFAO 108 (2008), p.294</ref> The preceding line of this document recorded the induction of Nesankhefenmaat's father, a certain Nesamun, into the priesthood of Amun-Re in king Siamun's reign.<ref>Payraudeau, BIFAO 108, p.294</ref> Siamun was the predecessor of Psusennes II at Tanis. The identification of the aforementioned Psusennes with Psusennes II is certain since the same fragmentary annal document next records--in the following line--the induction of Hor, the son of Nesankhefenmaat, into the priesthood of the chapel of Amun-Re at Karnak in Year 3 the second month of Akhet day 14 of king Osorkon I's reign just one generation later.<ref>Payraudeau, BIFAO 108, p.294</ref> Therefore, the Year 11 date can only be assigned to Psusennes II and constitutes the first securely attested date for this pharaoh's reign."
+1 + "Recently, the first conclusive date for king Psusennes II was revealed in a newly published priestly annal stone block. This document, which has been designated as 'Block Karnak 94, CL 2149,' records the induction of a priest named Nesankhefenmaat into the chapel of Amun-Re within the Karnak precint in Year 11 the first month of Shemu day 13 of a king named Psusennes.<ref>Frederic Payraudeau, ''De nouvelles annales sacerdotales de Siamon, Psousennès II et Osorkon Ier.'', BIFAO 108 (2008), p.294</ref> The preceding line of this document recorded the induction of Nesankhefenmaat's father, a certain Nesamun, into the priesthood of Amun-Re in king Siamun's reign.<ref name=\"Payraudeau, BIFAO 108, p.294\">Payraudeau, BIFAO 108, p.294</ref> Siamun was the predecessor of Psusennes II at Tanis. The identification of the aforementioned Psusennes with Psusennes II is certain since the same fragmentary annal document next records—in the following line—the induction of Hor, the son of Nesankhefenmaat, into the priesthood of the chapel of Amun-Re at Karnak in Year 3 the second month of Akhet day 14 of king Osorkon I's reign just one generation later.<ref name=\"Payraudeau, BIFAO 108, p.294\"/> Therefore, the Year 11 date can only be assigned to Psusennes II and constitutes the first securely attested date for this pharaoh's reign."
diff --git a/lib/text/diff/testdata/text01_diff_LevelLines_reverse b/lib/text/diff/testdata/text01_diff_LevelLines_reverse
index 3409524e..9f6dc893 100644
--- a/lib/text/diff/testdata/text01_diff_LevelLines_reverse
+++ b/lib/text/diff/testdata/text01_diff_LevelLines_reverse
@@ -1,3 +1,3 @@
--++
-0 - "Recently, the first conclusive date for king Psusennes II was revealed in a newly published priestly annal stone block. This document, which has been designated as 'Block Karnak 94, CL 2149,' records the induction of a priest named Nesankhefenmaat into the chapel of Amun-Re within the Karnak precint in Year 11 the first month of Shemu day 13 of a king named Psusennes.<ref>Frederic Payraudeau, ''De nouvelles annales sacerdotales de Siamon, Psousennès II et Osorkon Ier.'', BIFAO 108 (2008), p.294</ref> The preceding line of this document recorded the induction of Nesankhefenmaat's father, a certain Nesamun, into the priesthood of Amun-Re in king Siamun's reign.<ref name=\"Payraudeau, BIFAO 108, p.294\">Payraudeau, BIFAO 108, p.294</ref> Siamun was the predecessor of Psusennes II at Tanis. The identification of the aforementioned Psusennes with Psusennes II is certain since the same fragmentary annal document next records—in the following line—the induction of Hor, the son of Nesankhefenmaat, into the priesthood of the chapel of Amun-Re at Karnak in Year 3 the second month of Akhet day 14 of king Osorkon I's reign just one generation later.<ref name=\"Payraudeau, BIFAO 108, p.294\"/> Therefore, the Year 11 date can only be assigned to Psusennes II and constitutes the first securely attested date for this pharaoh's reign."
-0 + "Recently, the first conclusive date for king Psusennes II was revealed in a newly published priestly annal stone block. This document, which has been designated as 'Block Karnak 94, CL 2149,' records the induction of a priest named Nesankhefenmaat into the chapel of Amun-Re within the Karnak precint in Year 11 the first month of Shemu day 13 of a king named Psusennes.<ref>Frederic Payraudeau, ''De nouvelles annales sacerdotales de Siamon, Psousennès II et Osorkon Ier.'', BIFAO 108 (2008), p.294</ref> The preceding line of this document recorded the induction of Nesankhefenmaat's father, a certain Nesamun, into the priesthood of Amun-Re in king Siamun's reign.<ref>Payraudeau, BIFAO 108, p.294</ref> Siamun was the predecessor of Psusennes II at Tanis. The identification of the aforementioned Psusennes with Psusennes II is certain since the same fragmentary annal document next records--in the following line--the induction of Hor, the son of Nesankhefenmaat, into the priesthood of the chapel of Amun-Re at Karnak in Year 3 the second month of Akhet day 14 of king Osorkon I's reign just one generation later.<ref>Payraudeau, BIFAO 108, p.294</ref> Therefore, the Year 11 date can only be assigned to Psusennes II and constitutes the first securely attested date for this pharaoh's reign."
+1 - "Recently, the first conclusive date for king Psusennes II was revealed in a newly published priestly annal stone block. This document, which has been designated as 'Block Karnak 94, CL 2149,' records the induction of a priest named Nesankhefenmaat into the chapel of Amun-Re within the Karnak precint in Year 11 the first month of Shemu day 13 of a king named Psusennes.<ref>Frederic Payraudeau, ''De nouvelles annales sacerdotales de Siamon, Psousennès II et Osorkon Ier.'', BIFAO 108 (2008), p.294</ref> The preceding line of this document recorded the induction of Nesankhefenmaat's father, a certain Nesamun, into the priesthood of Amun-Re in king Siamun's reign.<ref name=\"Payraudeau, BIFAO 108, p.294\">Payraudeau, BIFAO 108, p.294</ref> Siamun was the predecessor of Psusennes II at Tanis. The identification of the aforementioned Psusennes with Psusennes II is certain since the same fragmentary annal document next records—in the following line—the induction of Hor, the son of Nesankhefenmaat, into the priesthood of the chapel of Amun-Re at Karnak in Year 3 the second month of Akhet day 14 of king Osorkon I's reign just one generation later.<ref name=\"Payraudeau, BIFAO 108, p.294\"/> Therefore, the Year 11 date can only be assigned to Psusennes II and constitutes the first securely attested date for this pharaoh's reign."
+1 + "Recently, the first conclusive date for king Psusennes II was revealed in a newly published priestly annal stone block. This document, which has been designated as 'Block Karnak 94, CL 2149,' records the induction of a priest named Nesankhefenmaat into the chapel of Amun-Re within the Karnak precint in Year 11 the first month of Shemu day 13 of a king named Psusennes.<ref>Frederic Payraudeau, ''De nouvelles annales sacerdotales de Siamon, Psousennès II et Osorkon Ier.'', BIFAO 108 (2008), p.294</ref> The preceding line of this document recorded the induction of Nesankhefenmaat's father, a certain Nesamun, into the priesthood of Amun-Re in king Siamun's reign.<ref>Payraudeau, BIFAO 108, p.294</ref> Siamun was the predecessor of Psusennes II at Tanis. The identification of the aforementioned Psusennes with Psusennes II is certain since the same fragmentary annal document next records--in the following line--the induction of Hor, the son of Nesankhefenmaat, into the priesthood of the chapel of Amun-Re at Karnak in Year 3 the second month of Akhet day 14 of king Osorkon I's reign just one generation later.<ref>Payraudeau, BIFAO 108, p.294</ref> Therefore, the Year 11 date can only be assigned to Psusennes II and constitutes the first securely attested date for this pharaoh's reign."
diff --git a/lib/text/diff/testdata/text01_diff_LevelWords b/lib/text/diff/testdata/text01_diff_LevelWords
index 5719d6cb..8bea701c 100644
--- a/lib/text/diff/testdata/text01_diff_LevelWords
+++ b/lib/text/diff/testdata/text01_diff_LevelWords
@@ -1,6 +1,6 @@
--++
-0 - "Recently, the first conclusive date for king Psusennes II was revealed in a newly published priestly annal stone block. This document, which has been designated as 'Block Karnak 94, CL 2149,' records the induction of a priest named Nesankhefenmaat into the chapel of Amun-Re within the Karnak precint in Year 11 the first month of Shemu day 13 of a king named Psusennes.<ref>Frederic Payraudeau, ''De nouvelles annales sacerdotales de Siamon, Psousennès II et Osorkon Ier.'', BIFAO 108 (2008), p.294</ref> The preceding line of this document recorded the induction of Nesankhefenmaat's father, a certain Nesamun, into the priesthood of Amun-Re in king Siamun's reign.<ref>Payraudeau, BIFAO 108, p.294</ref> Siamun was the predecessor of Psusennes II at Tanis. The identification of the aforementioned Psusennes with Psusennes II is certain since the same fragmentary annal document next records--in the following line--the induction of Hor, the son of Nesankhefenmaat, into the priesthood of the chapel of Amun-Re at Karnak in Year 3 the second month of Akhet day 14 of king Osorkon I's reign just one generation later.<ref>Payraudeau, BIFAO 108, p.294</ref> Therefore, the Year 11 date can only be assigned to Psusennes II and constitutes the first securely attested date for this pharaoh's reign."
-0 + "Recently, the first conclusive date for king Psusennes II was revealed in a newly published priestly annal stone block. This document, which has been designated as 'Block Karnak 94, CL 2149,' records the induction of a priest named Nesankhefenmaat into the chapel of Amun-Re within the Karnak precint in Year 11 the first month of Shemu day 13 of a king named Psusennes.<ref>Frederic Payraudeau, ''De nouvelles annales sacerdotales de Siamon, Psousennès II et Osorkon Ier.'', BIFAO 108 (2008), p.294</ref> The preceding line of this document recorded the induction of Nesankhefenmaat's father, a certain Nesamun, into the priesthood of Amun-Re in king Siamun's reign.<ref name=\"Payraudeau, BIFAO 108, p.294\">Payraudeau, BIFAO 108, p.294</ref> Siamun was the predecessor of Psusennes II at Tanis. The identification of the aforementioned Psusennes with Psusennes II is certain since the same fragmentary annal document next records—in the following line—the induction of Hor, the son of Nesankhefenmaat, into the priesthood of the chapel of Amun-Re at Karnak in Year 3 the second month of Akhet day 14 of king Osorkon I's reign just one generation later.<ref name=\"Payraudeau, BIFAO 108, p.294\"/> Therefore, the Year 11 date can only be assigned to Psusennes II and constitutes the first securely attested date for this pharaoh's reign."
+1 - "Recently, the first conclusive date for king Psusennes II was revealed in a newly published priestly annal stone block. This document, which has been designated as 'Block Karnak 94, CL 2149,' records the induction of a priest named Nesankhefenmaat into the chapel of Amun-Re within the Karnak precint in Year 11 the first month of Shemu day 13 of a king named Psusennes.<ref>Frederic Payraudeau, ''De nouvelles annales sacerdotales de Siamon, Psousennès II et Osorkon Ier.'', BIFAO 108 (2008), p.294</ref> The preceding line of this document recorded the induction of Nesankhefenmaat's father, a certain Nesamun, into the priesthood of Amun-Re in king Siamun's reign.<ref>Payraudeau, BIFAO 108, p.294</ref> Siamun was the predecessor of Psusennes II at Tanis. The identification of the aforementioned Psusennes with Psusennes II is certain since the same fragmentary annal document next records--in the following line--the induction of Hor, the son of Nesankhefenmaat, into the priesthood of the chapel of Amun-Re at Karnak in Year 3 the second month of Akhet day 14 of king Osorkon I's reign just one generation later.<ref>Payraudeau, BIFAO 108, p.294</ref> Therefore, the Year 11 date can only be assigned to Psusennes II and constitutes the first securely attested date for this pharaoh's reign."
+1 + "Recently, the first conclusive date for king Psusennes II was revealed in a newly published priestly annal stone block. This document, which has been designated as 'Block Karnak 94, CL 2149,' records the induction of a priest named Nesankhefenmaat into the chapel of Amun-Re within the Karnak precint in Year 11 the first month of Shemu day 13 of a king named Psusennes.<ref>Frederic Payraudeau, ''De nouvelles annales sacerdotales de Siamon, Psousennès II et Osorkon Ier.'', BIFAO 108 (2008), p.294</ref> The preceding line of this document recorded the induction of Nesankhefenmaat's father, a certain Nesamun, into the priesthood of Amun-Re in king Siamun's reign.<ref name=\"Payraudeau, BIFAO 108, p.294\">Payraudeau, BIFAO 108, p.294</ref> Siamun was the predecessor of Psusennes II at Tanis. The identification of the aforementioned Psusennes with Psusennes II is certain since the same fragmentary annal document next records—in the following line—the induction of Hor, the son of Nesankhefenmaat, into the priesthood of the chapel of Amun-Re at Karnak in Year 3 the second month of Akhet day 14 of king Osorkon I's reign just one generation later.<ref name=\"Payraudeau, BIFAO 108, p.294\"/> Therefore, the Year 11 date can only be assigned to Psusennes II and constitutes the first securely attested date for this pharaoh's reign."
^895 - "--"
^918 - "--"
^1124 - ">"
diff --git a/lib/text/diff/testdata/text01_diff_LevelWords_reverse b/lib/text/diff/testdata/text01_diff_LevelWords_reverse
index d171ecce..4d9f64a3 100644
--- a/lib/text/diff/testdata/text01_diff_LevelWords_reverse
+++ b/lib/text/diff/testdata/text01_diff_LevelWords_reverse
@@ -1,6 +1,6 @@
--++
-0 - "Recently, the first conclusive date for king Psusennes II was revealed in a newly published priestly annal stone block. This document, which has been designated as 'Block Karnak 94, CL 2149,' records the induction of a priest named Nesankhefenmaat into the chapel of Amun-Re within the Karnak precint in Year 11 the first month of Shemu day 13 of a king named Psusennes.<ref>Frederic Payraudeau, ''De nouvelles annales sacerdotales de Siamon, Psousennès II et Osorkon Ier.'', BIFAO 108 (2008), p.294</ref> The preceding line of this document recorded the induction of Nesankhefenmaat's father, a certain Nesamun, into the priesthood of Amun-Re in king Siamun's reign.<ref name=\"Payraudeau, BIFAO 108, p.294\">Payraudeau, BIFAO 108, p.294</ref> Siamun was the predecessor of Psusennes II at Tanis. The identification of the aforementioned Psusennes with Psusennes II is certain since the same fragmentary annal document next records—in the following line—the induction of Hor, the son of Nesankhefenmaat, into the priesthood of the chapel of Amun-Re at Karnak in Year 3 the second month of Akhet day 14 of king Osorkon I's reign just one generation later.<ref name=\"Payraudeau, BIFAO 108, p.294\"/> Therefore, the Year 11 date can only be assigned to Psusennes II and constitutes the first securely attested date for this pharaoh's reign."
-0 + "Recently, the first conclusive date for king Psusennes II was revealed in a newly published priestly annal stone block. This document, which has been designated as 'Block Karnak 94, CL 2149,' records the induction of a priest named Nesankhefenmaat into the chapel of Amun-Re within the Karnak precint in Year 11 the first month of Shemu day 13 of a king named Psusennes.<ref>Frederic Payraudeau, ''De nouvelles annales sacerdotales de Siamon, Psousennès II et Osorkon Ier.'', BIFAO 108 (2008), p.294</ref> The preceding line of this document recorded the induction of Nesankhefenmaat's father, a certain Nesamun, into the priesthood of Amun-Re in king Siamun's reign.<ref>Payraudeau, BIFAO 108, p.294</ref> Siamun was the predecessor of Psusennes II at Tanis. The identification of the aforementioned Psusennes with Psusennes II is certain since the same fragmentary annal document next records--in the following line--the induction of Hor, the son of Nesankhefenmaat, into the priesthood of the chapel of Amun-Re at Karnak in Year 3 the second month of Akhet day 14 of king Osorkon I's reign just one generation later.<ref>Payraudeau, BIFAO 108, p.294</ref> Therefore, the Year 11 date can only be assigned to Psusennes II and constitutes the first securely attested date for this pharaoh's reign."
+1 - "Recently, the first conclusive date for king Psusennes II was revealed in a newly published priestly annal stone block. This document, which has been designated as 'Block Karnak 94, CL 2149,' records the induction of a priest named Nesankhefenmaat into the chapel of Amun-Re within the Karnak precint in Year 11 the first month of Shemu day 13 of a king named Psusennes.<ref>Frederic Payraudeau, ''De nouvelles annales sacerdotales de Siamon, Psousennès II et Osorkon Ier.'', BIFAO 108 (2008), p.294</ref> The preceding line of this document recorded the induction of Nesankhefenmaat's father, a certain Nesamun, into the priesthood of Amun-Re in king Siamun's reign.<ref name=\"Payraudeau, BIFAO 108, p.294\">Payraudeau, BIFAO 108, p.294</ref> Siamun was the predecessor of Psusennes II at Tanis. The identification of the aforementioned Psusennes with Psusennes II is certain since the same fragmentary annal document next records—in the following line—the induction of Hor, the son of Nesankhefenmaat, into the priesthood of the chapel of Amun-Re at Karnak in Year 3 the second month of Akhet day 14 of king Osorkon I's reign just one generation later.<ref name=\"Payraudeau, BIFAO 108, p.294\"/> Therefore, the Year 11 date can only be assigned to Psusennes II and constitutes the first securely attested date for this pharaoh's reign."
+1 + "Recently, the first conclusive date for king Psusennes II was revealed in a newly published priestly annal stone block. This document, which has been designated as 'Block Karnak 94, CL 2149,' records the induction of a priest named Nesankhefenmaat into the chapel of Amun-Re within the Karnak precint in Year 11 the first month of Shemu day 13 of a king named Psusennes.<ref>Frederic Payraudeau, ''De nouvelles annales sacerdotales de Siamon, Psousennès II et Osorkon Ier.'', BIFAO 108 (2008), p.294</ref> The preceding line of this document recorded the induction of Nesankhefenmaat's father, a certain Nesamun, into the priesthood of Amun-Re in king Siamun's reign.<ref>Payraudeau, BIFAO 108, p.294</ref> Siamun was the predecessor of Psusennes II at Tanis. The identification of the aforementioned Psusennes with Psusennes II is certain since the same fragmentary annal document next records--in the following line--the induction of Hor, the son of Nesankhefenmaat, into the priesthood of the chapel of Amun-Re at Karnak in Year 3 the second month of Akhet day 14 of king Osorkon I's reign just one generation later.<ref>Payraudeau, BIFAO 108, p.294</ref> Therefore, the Year 11 date can only be assigned to Psusennes II and constitutes the first securely attested date for this pharaoh's reign."
^672 - " name=\"Payraudeau, BIFAO 108, p.294\""
^895 - "—"
^919 - "—"
diff --git a/lib/text/diff/testdata/text02_diff_LevelLines b/lib/text/diff/testdata/text02_diff_LevelLines
index d3ddb69f..dc98a3e1 100644
--- a/lib/text/diff/testdata/text02_diff_LevelLines
+++ b/lib/text/diff/testdata/text02_diff_LevelLines
@@ -1,3 +1,3 @@
--++
-0 - "In Year 5 of Shoshenq I, this king and the founder of the 22nd Dynasty dispatched a certain [[Meshwesh|Ma]] (ie. Libyan) subordinate named Wayheset to the desert oasis town of Dakhla in order to restore the king's authority over the western oasis region of Upper Egypt. Wayheset's titles include Prince and Governor of the Oasis. His activities are recorded in the Large Dakhla stela.<ref>Kitchen, p.290</ref> This stela states that Wayheset adjudicated in a certain water dispute by consulting a land-register which is explicitly dated to Year 19 of a \"Pharaoh Psusennes\" in order to determine the water rights of a man named Nysu-Bastet.<ref>[[Alan H. Gardiner]], The Large Dakhla stela, JEA 19 (1930), pp.19-30</ref> Kitchen notes that this individual made an appeal to the Year 19 cadastral land-register of king Psusennes which belonged to his mother which historians assumed was made some \"80 years\" ago during the reign of Psusennes I.<ref>Kitchen, p.290</ref> The land register recorded that certain water rights were formerly owned by Nysu-Bastet's mother Tewhunet in Year 19 of a king Psusennes. This ruler was generally assumed by Egyptologists to be Psusennes I rather than Psusennes II since the latter's reign was believed to have lasted only 14-15 years. Based on the land register evidence, Wayheset ordered that these watering rights should now be granted to Nysu-Bastet himself. However, if the oracle dated to Year 19 of Psusennes I as many scholars traditionally assumed, Nysu-Bastet would have been separated from his mother by a total of 80 years from this date into Year 5 of Shoshenq I--a figure which is highly unlikely since Nysu-Bastet would not have waited until extreme old age to uphold his mother's watering rights. This implies that the aforementioned king Psusennes here must be identified with Psusennes II instead--Shoshenq I's immediate predecessor and, more significantly, that Psusennes II enjoyed a minimum reign of 19 years. "
-0 + "In Year 5 of Shoshenq I, this king and the founder of the 22nd Dynasty dispatched a certain [[Meshwesh|Ma]] (ie. Libyan) subordinate named Wayheset to the desert oasis town of Dakhla in order to restore the king's authority over the western oasis region of Upper Egypt. Wayheset's titles include Prince and Governor of the Oasis. His activities are recorded in the Large Dakhla stela.<ref name=\"Kitchen, p.290\">Kitchen, p.290</ref> This stela states that Wayheset adjudicated in a certain water dispute by consulting a land-register which is explicitly dated to Year 19 of a \"Pharaoh Psusennes\" in order to determine the water rights of a man named Nysu-Bastet.<ref>[[Alan H. Gardiner]], The Large Dakhla stela, JEA 19 (1930), pp.19-30</ref> Kitchen notes that this individual made an appeal to the Year 19 cadastral land-register of king Psusennes which belonged to his mother which historians assumed was made some \"80 years\" ago during the reign of Psusennes I.<ref name=\"Kitchen, p.290\"/> The land register recorded that certain water rights were formerly owned by Nysu-Bastet's mother Tewhunet in Year 19 of a king Psusennes. This ruler was generally assumed by Egyptologists to be Psusennes I rather than Psusennes II since the latter's reign was believed to have lasted only 14–15 years. Based on the land register evidence, Wayheset ordered that these watering rights should now be granted to Nysu-Bastet himself. However, if the oracle dated to Year 19 of Psusennes I as many scholars traditionally assumed, Nysu-Bastet would have been separated from his mother by a total of 80 years from this date into Year 5 of Shoshenq I—a figure which is highly unlikely since Nysu-Bastet would not have waited until extreme old age to uphold his mother's watering rights. This implies that the aforementioned king Psusennes here must be identified with Psusennes II instead—Shoshenq I's immediate predecessor and, more significantly, that Psusennes II enjoyed a minimum reign of 19 years. "
+1 - "In Year 5 of Shoshenq I, this king and the founder of the 22nd Dynasty dispatched a certain [[Meshwesh|Ma]] (ie. Libyan) subordinate named Wayheset to the desert oasis town of Dakhla in order to restore the king's authority over the western oasis region of Upper Egypt. Wayheset's titles include Prince and Governor of the Oasis. His activities are recorded in the Large Dakhla stela.<ref>Kitchen, p.290</ref> This stela states that Wayheset adjudicated in a certain water dispute by consulting a land-register which is explicitly dated to Year 19 of a \"Pharaoh Psusennes\" in order to determine the water rights of a man named Nysu-Bastet.<ref>[[Alan H. Gardiner]], The Large Dakhla stela, JEA 19 (1930), pp.19-30</ref> Kitchen notes that this individual made an appeal to the Year 19 cadastral land-register of king Psusennes which belonged to his mother which historians assumed was made some \"80 years\" ago during the reign of Psusennes I.<ref>Kitchen, p.290</ref> The land register recorded that certain water rights were formerly owned by Nysu-Bastet's mother Tewhunet in Year 19 of a king Psusennes. This ruler was generally assumed by Egyptologists to be Psusennes I rather than Psusennes II since the latter's reign was believed to have lasted only 14-15 years. Based on the land register evidence, Wayheset ordered that these watering rights should now be granted to Nysu-Bastet himself. However, if the oracle dated to Year 19 of Psusennes I as many scholars traditionally assumed, Nysu-Bastet would have been separated from his mother by a total of 80 years from this date into Year 5 of Shoshenq I--a figure which is highly unlikely since Nysu-Bastet would not have waited until extreme old age to uphold his mother's watering rights. This implies that the aforementioned king Psusennes here must be identified with Psusennes II instead--Shoshenq I's immediate predecessor and, more significantly, that Psusennes II enjoyed a minimum reign of 19 years. "
+1 + "In Year 5 of Shoshenq I, this king and the founder of the 22nd Dynasty dispatched a certain [[Meshwesh|Ma]] (ie. Libyan) subordinate named Wayheset to the desert oasis town of Dakhla in order to restore the king's authority over the western oasis region of Upper Egypt. Wayheset's titles include Prince and Governor of the Oasis. His activities are recorded in the Large Dakhla stela.<ref name=\"Kitchen, p.290\">Kitchen, p.290</ref> This stela states that Wayheset adjudicated in a certain water dispute by consulting a land-register which is explicitly dated to Year 19 of a \"Pharaoh Psusennes\" in order to determine the water rights of a man named Nysu-Bastet.<ref>[[Alan H. Gardiner]], The Large Dakhla stela, JEA 19 (1930), pp.19-30</ref> Kitchen notes that this individual made an appeal to the Year 19 cadastral land-register of king Psusennes which belonged to his mother which historians assumed was made some \"80 years\" ago during the reign of Psusennes I.<ref name=\"Kitchen, p.290\"/> The land register recorded that certain water rights were formerly owned by Nysu-Bastet's mother Tewhunet in Year 19 of a king Psusennes. This ruler was generally assumed by Egyptologists to be Psusennes I rather than Psusennes II since the latter's reign was believed to have lasted only 14–15 years. Based on the land register evidence, Wayheset ordered that these watering rights should now be granted to Nysu-Bastet himself. However, if the oracle dated to Year 19 of Psusennes I as many scholars traditionally assumed, Nysu-Bastet would have been separated from his mother by a total of 80 years from this date into Year 5 of Shoshenq I—a figure which is highly unlikely since Nysu-Bastet would not have waited until extreme old age to uphold his mother's watering rights. This implies that the aforementioned king Psusennes here must be identified with Psusennes II instead—Shoshenq I's immediate predecessor and, more significantly, that Psusennes II enjoyed a minimum reign of 19 years. "
diff --git a/lib/text/diff/testdata/text02_diff_LevelLines_reverse b/lib/text/diff/testdata/text02_diff_LevelLines_reverse
index c4ab8f81..311b6c4c 100644
--- a/lib/text/diff/testdata/text02_diff_LevelLines_reverse
+++ b/lib/text/diff/testdata/text02_diff_LevelLines_reverse
@@ -1,3 +1,3 @@
--++
-0 - "In Year 5 of Shoshenq I, this king and the founder of the 22nd Dynasty dispatched a certain [[Meshwesh|Ma]] (ie. Libyan) subordinate named Wayheset to the desert oasis town of Dakhla in order to restore the king's authority over the western oasis region of Upper Egypt. Wayheset's titles include Prince and Governor of the Oasis. His activities are recorded in the Large Dakhla stela.<ref name=\"Kitchen, p.290\">Kitchen, p.290</ref> This stela states that Wayheset adjudicated in a certain water dispute by consulting a land-register which is explicitly dated to Year 19 of a \"Pharaoh Psusennes\" in order to determine the water rights of a man named Nysu-Bastet.<ref>[[Alan H. Gardiner]], The Large Dakhla stela, JEA 19 (1930), pp.19-30</ref> Kitchen notes that this individual made an appeal to the Year 19 cadastral land-register of king Psusennes which belonged to his mother which historians assumed was made some \"80 years\" ago during the reign of Psusennes I.<ref name=\"Kitchen, p.290\"/> The land register recorded that certain water rights were formerly owned by Nysu-Bastet's mother Tewhunet in Year 19 of a king Psusennes. This ruler was generally assumed by Egyptologists to be Psusennes I rather than Psusennes II since the latter's reign was believed to have lasted only 14–15 years. Based on the land register evidence, Wayheset ordered that these watering rights should now be granted to Nysu-Bastet himself. However, if the oracle dated to Year 19 of Psusennes I as many scholars traditionally assumed, Nysu-Bastet would have been separated from his mother by a total of 80 years from this date into Year 5 of Shoshenq I—a figure which is highly unlikely since Nysu-Bastet would not have waited until extreme old age to uphold his mother's watering rights. This implies that the aforementioned king Psusennes here must be identified with Psusennes II instead—Shoshenq I's immediate predecessor and, more significantly, that Psusennes II enjoyed a minimum reign of 19 years. "
-0 + "In Year 5 of Shoshenq I, this king and the founder of the 22nd Dynasty dispatched a certain [[Meshwesh|Ma]] (ie. Libyan) subordinate named Wayheset to the desert oasis town of Dakhla in order to restore the king's authority over the western oasis region of Upper Egypt. Wayheset's titles include Prince and Governor of the Oasis. His activities are recorded in the Large Dakhla stela.<ref>Kitchen, p.290</ref> This stela states that Wayheset adjudicated in a certain water dispute by consulting a land-register which is explicitly dated to Year 19 of a \"Pharaoh Psusennes\" in order to determine the water rights of a man named Nysu-Bastet.<ref>[[Alan H. Gardiner]], The Large Dakhla stela, JEA 19 (1930), pp.19-30</ref> Kitchen notes that this individual made an appeal to the Year 19 cadastral land-register of king Psusennes which belonged to his mother which historians assumed was made some \"80 years\" ago during the reign of Psusennes I.<ref>Kitchen, p.290</ref> The land register recorded that certain water rights were formerly owned by Nysu-Bastet's mother Tewhunet in Year 19 of a king Psusennes. This ruler was generally assumed by Egyptologists to be Psusennes I rather than Psusennes II since the latter's reign was believed to have lasted only 14-15 years. Based on the land register evidence, Wayheset ordered that these watering rights should now be granted to Nysu-Bastet himself. However, if the oracle dated to Year 19 of Psusennes I as many scholars traditionally assumed, Nysu-Bastet would have been separated from his mother by a total of 80 years from this date into Year 5 of Shoshenq I--a figure which is highly unlikely since Nysu-Bastet would not have waited until extreme old age to uphold his mother's watering rights. This implies that the aforementioned king Psusennes here must be identified with Psusennes II instead--Shoshenq I's immediate predecessor and, more significantly, that Psusennes II enjoyed a minimum reign of 19 years. "
+1 - "In Year 5 of Shoshenq I, this king and the founder of the 22nd Dynasty dispatched a certain [[Meshwesh|Ma]] (ie. Libyan) subordinate named Wayheset to the desert oasis town of Dakhla in order to restore the king's authority over the western oasis region of Upper Egypt. Wayheset's titles include Prince and Governor of the Oasis. His activities are recorded in the Large Dakhla stela.<ref name=\"Kitchen, p.290\">Kitchen, p.290</ref> This stela states that Wayheset adjudicated in a certain water dispute by consulting a land-register which is explicitly dated to Year 19 of a \"Pharaoh Psusennes\" in order to determine the water rights of a man named Nysu-Bastet.<ref>[[Alan H. Gardiner]], The Large Dakhla stela, JEA 19 (1930), pp.19-30</ref> Kitchen notes that this individual made an appeal to the Year 19 cadastral land-register of king Psusennes which belonged to his mother which historians assumed was made some \"80 years\" ago during the reign of Psusennes I.<ref name=\"Kitchen, p.290\"/> The land register recorded that certain water rights were formerly owned by Nysu-Bastet's mother Tewhunet in Year 19 of a king Psusennes. This ruler was generally assumed by Egyptologists to be Psusennes I rather than Psusennes II since the latter's reign was believed to have lasted only 14–15 years. Based on the land register evidence, Wayheset ordered that these watering rights should now be granted to Nysu-Bastet himself. However, if the oracle dated to Year 19 of Psusennes I as many scholars traditionally assumed, Nysu-Bastet would have been separated from his mother by a total of 80 years from this date into Year 5 of Shoshenq I—a figure which is highly unlikely since Nysu-Bastet would not have waited until extreme old age to uphold his mother's watering rights. This implies that the aforementioned king Psusennes here must be identified with Psusennes II instead—Shoshenq I's immediate predecessor and, more significantly, that Psusennes II enjoyed a minimum reign of 19 years. "
+1 + "In Year 5 of Shoshenq I, this king and the founder of the 22nd Dynasty dispatched a certain [[Meshwesh|Ma]] (ie. Libyan) subordinate named Wayheset to the desert oasis town of Dakhla in order to restore the king's authority over the western oasis region of Upper Egypt. Wayheset's titles include Prince and Governor of the Oasis. His activities are recorded in the Large Dakhla stela.<ref>Kitchen, p.290</ref> This stela states that Wayheset adjudicated in a certain water dispute by consulting a land-register which is explicitly dated to Year 19 of a \"Pharaoh Psusennes\" in order to determine the water rights of a man named Nysu-Bastet.<ref>[[Alan H. Gardiner]], The Large Dakhla stela, JEA 19 (1930), pp.19-30</ref> Kitchen notes that this individual made an appeal to the Year 19 cadastral land-register of king Psusennes which belonged to his mother which historians assumed was made some \"80 years\" ago during the reign of Psusennes I.<ref>Kitchen, p.290</ref> The land register recorded that certain water rights were formerly owned by Nysu-Bastet's mother Tewhunet in Year 19 of a king Psusennes. This ruler was generally assumed by Egyptologists to be Psusennes I rather than Psusennes II since the latter's reign was believed to have lasted only 14-15 years. Based on the land register evidence, Wayheset ordered that these watering rights should now be granted to Nysu-Bastet himself. However, if the oracle dated to Year 19 of Psusennes I as many scholars traditionally assumed, Nysu-Bastet would have been separated from his mother by a total of 80 years from this date into Year 5 of Shoshenq I--a figure which is highly unlikely since Nysu-Bastet would not have waited until extreme old age to uphold his mother's watering rights. This implies that the aforementioned king Psusennes here must be identified with Psusennes II instead--Shoshenq I's immediate predecessor and, more significantly, that Psusennes II enjoyed a minimum reign of 19 years. "
diff --git a/lib/text/diff/testdata/text02_diff_LevelWords b/lib/text/diff/testdata/text02_diff_LevelWords
index dabbc3fd..5e5ebb34 100644
--- a/lib/text/diff/testdata/text02_diff_LevelWords
+++ b/lib/text/diff/testdata/text02_diff_LevelWords
@@ -1,6 +1,6 @@
--++
-0 - "In Year 5 of Shoshenq I, this king and the founder of the 22nd Dynasty dispatched a certain [[Meshwesh|Ma]] (ie. Libyan) subordinate named Wayheset to the desert oasis town of Dakhla in order to restore the king's authority over the western oasis region of Upper Egypt. Wayheset's titles include Prince and Governor of the Oasis. His activities are recorded in the Large Dakhla stela.<ref>Kitchen, p.290</ref> This stela states that Wayheset adjudicated in a certain water dispute by consulting a land-register which is explicitly dated to Year 19 of a \"Pharaoh Psusennes\" in order to determine the water rights of a man named Nysu-Bastet.<ref>[[Alan H. Gardiner]], The Large Dakhla stela, JEA 19 (1930), pp.19-30</ref> Kitchen notes that this individual made an appeal to the Year 19 cadastral land-register of king Psusennes which belonged to his mother which historians assumed was made some \"80 years\" ago during the reign of Psusennes I.<ref>Kitchen, p.290</ref> The land register recorded that certain water rights were formerly owned by Nysu-Bastet's mother Tewhunet in Year 19 of a king Psusennes. This ruler was generally assumed by Egyptologists to be Psusennes I rather than Psusennes II since the latter's reign was believed to have lasted only 14-15 years. Based on the land register evidence, Wayheset ordered that these watering rights should now be granted to Nysu-Bastet himself. However, if the oracle dated to Year 19 of Psusennes I as many scholars traditionally assumed, Nysu-Bastet would have been separated from his mother by a total of 80 years from this date into Year 5 of Shoshenq I--a figure which is highly unlikely since Nysu-Bastet would not have waited until extreme old age to uphold his mother's watering rights. This implies that the aforementioned king Psusennes here must be identified with Psusennes II instead--Shoshenq I's immediate predecessor and, more significantly, that Psusennes II enjoyed a minimum reign of 19 years. "
-0 + "In Year 5 of Shoshenq I, this king and the founder of the 22nd Dynasty dispatched a certain [[Meshwesh|Ma]] (ie. Libyan) subordinate named Wayheset to the desert oasis town of Dakhla in order to restore the king's authority over the western oasis region of Upper Egypt. Wayheset's titles include Prince and Governor of the Oasis. His activities are recorded in the Large Dakhla stela.<ref name=\"Kitchen, p.290\">Kitchen, p.290</ref> This stela states that Wayheset adjudicated in a certain water dispute by consulting a land-register which is explicitly dated to Year 19 of a \"Pharaoh Psusennes\" in order to determine the water rights of a man named Nysu-Bastet.<ref>[[Alan H. Gardiner]], The Large Dakhla stela, JEA 19 (1930), pp.19-30</ref> Kitchen notes that this individual made an appeal to the Year 19 cadastral land-register of king Psusennes which belonged to his mother which historians assumed was made some \"80 years\" ago during the reign of Psusennes I.<ref name=\"Kitchen, p.290\"/> The land register recorded that certain water rights were formerly owned by Nysu-Bastet's mother Tewhunet in Year 19 of a king Psusennes. This ruler was generally assumed by Egyptologists to be Psusennes I rather than Psusennes II since the latter's reign was believed to have lasted only 14–15 years. Based on the land register evidence, Wayheset ordered that these watering rights should now be granted to Nysu-Bastet himself. However, if the oracle dated to Year 19 of Psusennes I as many scholars traditionally assumed, Nysu-Bastet would have been separated from his mother by a total of 80 years from this date into Year 5 of Shoshenq I—a figure which is highly unlikely since Nysu-Bastet would not have waited until extreme old age to uphold his mother's watering rights. This implies that the aforementioned king Psusennes here must be identified with Psusennes II instead—Shoshenq I's immediate predecessor and, more significantly, that Psusennes II enjoyed a minimum reign of 19 years. "
+1 - "In Year 5 of Shoshenq I, this king and the founder of the 22nd Dynasty dispatched a certain [[Meshwesh|Ma]] (ie. Libyan) subordinate named Wayheset to the desert oasis town of Dakhla in order to restore the king's authority over the western oasis region of Upper Egypt. Wayheset's titles include Prince and Governor of the Oasis. His activities are recorded in the Large Dakhla stela.<ref>Kitchen, p.290</ref> This stela states that Wayheset adjudicated in a certain water dispute by consulting a land-register which is explicitly dated to Year 19 of a \"Pharaoh Psusennes\" in order to determine the water rights of a man named Nysu-Bastet.<ref>[[Alan H. Gardiner]], The Large Dakhla stela, JEA 19 (1930), pp.19-30</ref> Kitchen notes that this individual made an appeal to the Year 19 cadastral land-register of king Psusennes which belonged to his mother which historians assumed was made some \"80 years\" ago during the reign of Psusennes I.<ref>Kitchen, p.290</ref> The land register recorded that certain water rights were formerly owned by Nysu-Bastet's mother Tewhunet in Year 19 of a king Psusennes. This ruler was generally assumed by Egyptologists to be Psusennes I rather than Psusennes II since the latter's reign was believed to have lasted only 14-15 years. Based on the land register evidence, Wayheset ordered that these watering rights should now be granted to Nysu-Bastet himself. However, if the oracle dated to Year 19 of Psusennes I as many scholars traditionally assumed, Nysu-Bastet would have been separated from his mother by a total of 80 years from this date into Year 5 of Shoshenq I--a figure which is highly unlikely since Nysu-Bastet would not have waited until extreme old age to uphold his mother's watering rights. This implies that the aforementioned king Psusennes here must be identified with Psusennes II instead--Shoshenq I's immediate predecessor and, more significantly, that Psusennes II enjoyed a minimum reign of 19 years. "
+1 + "In Year 5 of Shoshenq I, this king and the founder of the 22nd Dynasty dispatched a certain [[Meshwesh|Ma]] (ie. Libyan) subordinate named Wayheset to the desert oasis town of Dakhla in order to restore the king's authority over the western oasis region of Upper Egypt. Wayheset's titles include Prince and Governor of the Oasis. His activities are recorded in the Large Dakhla stela.<ref name=\"Kitchen, p.290\">Kitchen, p.290</ref> This stela states that Wayheset adjudicated in a certain water dispute by consulting a land-register which is explicitly dated to Year 19 of a \"Pharaoh Psusennes\" in order to determine the water rights of a man named Nysu-Bastet.<ref>[[Alan H. Gardiner]], The Large Dakhla stela, JEA 19 (1930), pp.19-30</ref> Kitchen notes that this individual made an appeal to the Year 19 cadastral land-register of king Psusennes which belonged to his mother which historians assumed was made some \"80 years\" ago during the reign of Psusennes I.<ref name=\"Kitchen, p.290\"/> The land register recorded that certain water rights were formerly owned by Nysu-Bastet's mother Tewhunet in Year 19 of a king Psusennes. This ruler was generally assumed by Egyptologists to be Psusennes I rather than Psusennes II since the latter's reign was believed to have lasted only 14–15 years. Based on the land register evidence, Wayheset ordered that these watering rights should now be granted to Nysu-Bastet himself. However, if the oracle dated to Year 19 of Psusennes I as many scholars traditionally assumed, Nysu-Bastet would have been separated from his mother by a total of 80 years from this date into Year 5 of Shoshenq I—a figure which is highly unlikely since Nysu-Bastet would not have waited until extreme old age to uphold his mother's watering rights. This implies that the aforementioned king Psusennes here must be identified with Psusennes II instead—Shoshenq I's immediate predecessor and, more significantly, that Psusennes II enjoyed a minimum reign of 19 years. "
^947 - ">"
^962 - "</ref"
^1260 - "-"
diff --git a/lib/text/diff/testdata/text02_diff_LevelWords_reverse b/lib/text/diff/testdata/text02_diff_LevelWords_reverse
index b91e3711..27da31ea 100644
--- a/lib/text/diff/testdata/text02_diff_LevelWords_reverse
+++ b/lib/text/diff/testdata/text02_diff_LevelWords_reverse
@@ -1,6 +1,6 @@
--++
-0 - "In Year 5 of Shoshenq I, this king and the founder of the 22nd Dynasty dispatched a certain [[Meshwesh|Ma]] (ie. Libyan) subordinate named Wayheset to the desert oasis town of Dakhla in order to restore the king's authority over the western oasis region of Upper Egypt. Wayheset's titles include Prince and Governor of the Oasis. His activities are recorded in the Large Dakhla stela.<ref name=\"Kitchen, p.290\">Kitchen, p.290</ref> This stela states that Wayheset adjudicated in a certain water dispute by consulting a land-register which is explicitly dated to Year 19 of a \"Pharaoh Psusennes\" in order to determine the water rights of a man named Nysu-Bastet.<ref>[[Alan H. Gardiner]], The Large Dakhla stela, JEA 19 (1930), pp.19-30</ref> Kitchen notes that this individual made an appeal to the Year 19 cadastral land-register of king Psusennes which belonged to his mother which historians assumed was made some \"80 years\" ago during the reign of Psusennes I.<ref name=\"Kitchen, p.290\"/> The land register recorded that certain water rights were formerly owned by Nysu-Bastet's mother Tewhunet in Year 19 of a king Psusennes. This ruler was generally assumed by Egyptologists to be Psusennes I rather than Psusennes II since the latter's reign was believed to have lasted only 14–15 years. Based on the land register evidence, Wayheset ordered that these watering rights should now be granted to Nysu-Bastet himself. However, if the oracle dated to Year 19 of Psusennes I as many scholars traditionally assumed, Nysu-Bastet would have been separated from his mother by a total of 80 years from this date into Year 5 of Shoshenq I—a figure which is highly unlikely since Nysu-Bastet would not have waited until extreme old age to uphold his mother's watering rights. This implies that the aforementioned king Psusennes here must be identified with Psusennes II instead—Shoshenq I's immediate predecessor and, more significantly, that Psusennes II enjoyed a minimum reign of 19 years. "
-0 + "In Year 5 of Shoshenq I, this king and the founder of the 22nd Dynasty dispatched a certain [[Meshwesh|Ma]] (ie. Libyan) subordinate named Wayheset to the desert oasis town of Dakhla in order to restore the king's authority over the western oasis region of Upper Egypt. Wayheset's titles include Prince and Governor of the Oasis. His activities are recorded in the Large Dakhla stela.<ref>Kitchen, p.290</ref> This stela states that Wayheset adjudicated in a certain water dispute by consulting a land-register which is explicitly dated to Year 19 of a \"Pharaoh Psusennes\" in order to determine the water rights of a man named Nysu-Bastet.<ref>[[Alan H. Gardiner]], The Large Dakhla stela, JEA 19 (1930), pp.19-30</ref> Kitchen notes that this individual made an appeal to the Year 19 cadastral land-register of king Psusennes which belonged to his mother which historians assumed was made some \"80 years\" ago during the reign of Psusennes I.<ref>Kitchen, p.290</ref> The land register recorded that certain water rights were formerly owned by Nysu-Bastet's mother Tewhunet in Year 19 of a king Psusennes. This ruler was generally assumed by Egyptologists to be Psusennes I rather than Psusennes II since the latter's reign was believed to have lasted only 14-15 years. Based on the land register evidence, Wayheset ordered that these watering rights should now be granted to Nysu-Bastet himself. However, if the oracle dated to Year 19 of Psusennes I as many scholars traditionally assumed, Nysu-Bastet would have been separated from his mother by a total of 80 years from this date into Year 5 of Shoshenq I--a figure which is highly unlikely since Nysu-Bastet would not have waited until extreme old age to uphold his mother's watering rights. This implies that the aforementioned king Psusennes here must be identified with Psusennes II instead--Shoshenq I's immediate predecessor and, more significantly, that Psusennes II enjoyed a minimum reign of 19 years. "
+1 - "In Year 5 of Shoshenq I, this king and the founder of the 22nd Dynasty dispatched a certain [[Meshwesh|Ma]] (ie. Libyan) subordinate named Wayheset to the desert oasis town of Dakhla in order to restore the king's authority over the western oasis region of Upper Egypt. Wayheset's titles include Prince and Governor of the Oasis. His activities are recorded in the Large Dakhla stela.<ref name=\"Kitchen, p.290\">Kitchen, p.290</ref> This stela states that Wayheset adjudicated in a certain water dispute by consulting a land-register which is explicitly dated to Year 19 of a \"Pharaoh Psusennes\" in order to determine the water rights of a man named Nysu-Bastet.<ref>[[Alan H. Gardiner]], The Large Dakhla stela, JEA 19 (1930), pp.19-30</ref> Kitchen notes that this individual made an appeal to the Year 19 cadastral land-register of king Psusennes which belonged to his mother which historians assumed was made some \"80 years\" ago during the reign of Psusennes I.<ref name=\"Kitchen, p.290\"/> The land register recorded that certain water rights were formerly owned by Nysu-Bastet's mother Tewhunet in Year 19 of a king Psusennes. This ruler was generally assumed by Egyptologists to be Psusennes I rather than Psusennes II since the latter's reign was believed to have lasted only 14–15 years. Based on the land register evidence, Wayheset ordered that these watering rights should now be granted to Nysu-Bastet himself. However, if the oracle dated to Year 19 of Psusennes I as many scholars traditionally assumed, Nysu-Bastet would have been separated from his mother by a total of 80 years from this date into Year 5 of Shoshenq I—a figure which is highly unlikely since Nysu-Bastet would not have waited until extreme old age to uphold his mother's watering rights. This implies that the aforementioned king Psusennes here must be identified with Psusennes II instead—Shoshenq I's immediate predecessor and, more significantly, that Psusennes II enjoyed a minimum reign of 19 years. "
+1 + "In Year 5 of Shoshenq I, this king and the founder of the 22nd Dynasty dispatched a certain [[Meshwesh|Ma]] (ie. Libyan) subordinate named Wayheset to the desert oasis town of Dakhla in order to restore the king's authority over the western oasis region of Upper Egypt. Wayheset's titles include Prince and Governor of the Oasis. His activities are recorded in the Large Dakhla stela.<ref>Kitchen, p.290</ref> This stela states that Wayheset adjudicated in a certain water dispute by consulting a land-register which is explicitly dated to Year 19 of a \"Pharaoh Psusennes\" in order to determine the water rights of a man named Nysu-Bastet.<ref>[[Alan H. Gardiner]], The Large Dakhla stela, JEA 19 (1930), pp.19-30</ref> Kitchen notes that this individual made an appeal to the Year 19 cadastral land-register of king Psusennes which belonged to his mother which historians assumed was made some \"80 years\" ago during the reign of Psusennes I.<ref>Kitchen, p.290</ref> The land register recorded that certain water rights were formerly owned by Nysu-Bastet's mother Tewhunet in Year 19 of a king Psusennes. This ruler was generally assumed by Egyptologists to be Psusennes I rather than Psusennes II since the latter's reign was believed to have lasted only 14-15 years. Based on the land register evidence, Wayheset ordered that these watering rights should now be granted to Nysu-Bastet himself. However, if the oracle dated to Year 19 of Psusennes I as many scholars traditionally assumed, Nysu-Bastet would have been separated from his mother by a total of 80 years from this date into Year 5 of Shoshenq I--a figure which is highly unlikely since Nysu-Bastet would not have waited until extreme old age to uphold his mother's watering rights. This implies that the aforementioned king Psusennes here must be identified with Psusennes II instead--Shoshenq I's immediate predecessor and, more significantly, that Psusennes II enjoyed a minimum reign of 19 years. "
^393 - "=\"Kitchen, p.290\">Kitchen, p.290</ref> This stela states that Wayheset adjudicated in a certain water dispute by consulting a land-register which is explicitly dated to Year 19 of a \"Pharaoh Psusennes\" in order to determine the water rights of a man name"
^714 - " name=\""
^735 - "\"/"
diff --git a/lib/text/diff/testdata/the_singles_collection_diff_LevelLines b/lib/text/diff/testdata/the_singles_collection_diff_LevelLines
index aa3d9e41..117d3759 100644
--- a/lib/text/diff/testdata/the_singles_collection_diff_LevelLines
+++ b/lib/text/diff/testdata/the_singles_collection_diff_LevelLines
@@ -1,93 +1,93 @@
--++
-177 - "# [[...Baby One More Time (song)|...Baby One More Time]]\r"
-177 + "# \"[[...Baby One More Time (song)|...Baby One More Time]]\"\r"
-179 - "# [[Sometimes (Britney Spears song)|Sometimes]] <small>(Radio Edit)</small>\r"
-179 + "# \"[[Sometimes (Britney Spears song)|Sometimes]]\" <small>(Radio Edit)</small>\r"
-181 - "# [[(You Drive Me) Crazy]] <small>(The Stop Remix!)</small>\r"
-181 + "# \"[[(You Drive Me) Crazy]]\" <small>(The Stop Remix!)</small>\r"
-183 - "# [[Born to Make You Happy]] <small>(Radio Edit)</small>\r"
-183 + "# \"[[Born to Make You Happy]]\" <small>(Radio Edit)</small>\r"
-184 - "# \"Born to Make You Happy (Kristian Lundin Bonus Remix)\"\r"
-184 + "# \"Born to Make You Happy\" (Kristian Lundin Bonus Remix)\r"
-185 - "# [[From the Bottom of My Broken Heart]] <small>(Radio Edit)</small>\r"
-185 + "# \"[[From the Bottom of My Broken Heart]]\" <small>(Radio Edit)</small>\r"
-187 - "# [[Oops!... I Did It Again (song)|Oops!...I Did It Again]]\r"
-187 + "# \"[[Oops!... I Did It Again (song)|Oops!...I Did It Again]]\"\r"
-189 - "# [[Lucky (Britney Spears song)|Lucky]]\r"
-189 + "# \"[[Lucky (Britney Spears song)|Lucky]]\"\r"
-191 - "# [[Stronger (Britney Spears song)|Stronger]]\r"
-191 + "# \"[[Stronger (Britney Spears song)|Stronger]]\"\r"
-193 - "# [[Don't Let Me Be the Last to Know]]\r"
-193 + "# \"[[Don't Let Me Be the Last to Know]]\"\r"
-194 - "# \"Don't Let Me Be The Last to Know (Hex Hector Radio Mix)\"\r"
-194 + "# \"Don't Let Me Be The Last to Know\" (Hex Hector Radio Mix)\r"
-195 - "# [[I'm a Slave 4 U]]\r"
-195 + "# \"[[I'm a Slave 4 U]]\"\r"
-197 - "# [[Overprotected]]\r"
-197 + "# \"[[Overprotected]]\"\r"
-199 - "# [[I'm Not a Girl, Not Yet a Woman]]\r"
-199 + "# \"[[I'm Not a Girl, Not Yet a Woman]]\"\r"
-201 - "# [[I Love Rock 'n' Roll#Britney Spears version|I Love Rock 'N' Roll]]\r"
-201 + "# \"[[I Love Rock 'n' Roll#Britney Spears version|I Love Rock 'N' Roll]]\"\r"
-202 - "# \"I'm Not A Girl, Not Yet A Woman (Metro Remix Radio Edit)\"\r"
-202 + "# \"I'm Not A Girl, Not Yet A Woman\" (Metro Remix Radio Edit)\r"
-203 - "# [[Boys (Britney Spears song)|Boys]] <small>(The Co-Ed Remix feat. [[Pharrell Williams]]) </small>\r"
-203 + "# \"[[Boys (Britney Spears song)|Boys]]\" <small>(The Co-Ed Remix feat. [[Pharrell Williams]]) </small>\r"
-204 - "# \"Boys (Album Version)\"\r"
-204 + "# \"Boys\" (Album Version)\r"
-205 - "# [[Me Against the Music]] <small>(feat. [[Madonna (entertainer)|Madonna]]) </small>\r"
-205 + "# \"[[Me Against the Music]]\" <small>(feat. [[Madonna (entertainer)|Madonna]]) </small>\r"
-206 - "# \"Me Against the Music (Passengerz vs. the Club Mix)\"\r"
-206 + "# \"Me Against the Music\" (Passengerz vs. the Club Mix)\r"
-207 - "# [[Toxic (song)|Toxic]]\r"
-207 + "# \"[[Toxic (song)|Toxic]]\"\r"
-208 - "# \"Toxic (Bloodshy & Avant Intoxicated Remix)\"\r"
-208 + "# \"Toxic\" (Bloodshy & Avant Intoxicated Remix)\r"
-209 - "# [[Everytime]]\r"
-209 + "# \"[[Everytime]]\"\r"
-210 - "# \"Everytime (Above & Beyond Club Mix)\"\r"
-210 + "# \"Everytime\" (Above & Beyond Club Mix)\r"
-211 - "# [[Outrageous]]\r"
-211 + "# \"[[Outrageous]]\"\r"
-212 - "# \"Outragous (Junkie XL's Dancehall Mix)\"\r"
-212 + "# \"Outragous\" (Junkie XL's Dancehall Mix)\r"
-213 - "# [[My Prerogative#Britney Spears version|My Prerogative]]\r"
-213 + "# \"[[My Prerogative#Britney Spears version|My Prerogative]]\"\r"
-214 - "# \"My Prerogative (Armand Van Helden Remix)\"\r"
-214 + "# \"My Prerogative\" (Armand Van Helden Remix)\r"
-215 - "# [[Do Somethin']]\r"
-215 + "# \"[[Do Somethin']]\"\r"
-216 - "# \"Do Somethin' (Thick Vocal Mix)\"\r"
-216 + "# \"Do Somethin'\" (Thick Vocal Mix)\r"
-217 - "# [[Someday (I Will Understand)]]\r"
-217 + "# \"[[Someday (I Will Understand)]]\"\r"
-219 - "# [[Gimme More]]\r"
-219 + "# \"[[Gimme More]]\"\r"
-220 - "# \"Gimme More (Paul Oakenfold Remix)\"\r"
-220 + "# \"Gimme More\" (Paul Oakenfold Remix)\r"
-221 - "# [[Piece of Me]]\r"
-221 + "# \"[[Piece of Me]]\"\r"
-222 - "# \"Piece of Me (Boz O Lo Remix)\"\r"
-222 + "# \"Piece of Me\" (Boz O Lo Remix)\r"
-223 - "# [[Break the Ice (Britney Spears song)|Break the Ice]]\r"
-223 + "# \"[[Break the Ice (Britney Spears song)|Break the Ice]]\"\r"
-225 - "# [[Womanizer (song)|Womanizer]]\r"
-225 + "# \"[[Womanizer (song)|Womanizer]]\"\r"
-226 - "# \"Womanizer (Kaskade Remix)\"\r"
-226 + "# \"Womanizer\" (Kaskade Remix)\r"
-227 - "# [[Circus (song)|Circus]]\r"
-227 + "# \"[[Circus (song)|Circus]]\"\r"
-228 - "# \"Circus (Tom Neville's Ringleader Remix)\"\r"
-228 + "# \"Circus\" (Tom Neville's Ringleader Remix)\r"
-229 - "# [[If U Seek Amy]]\r"
-229 + "# \"[[If U Seek Amy]]\"\r"
-230 - "# \"If U Seek Amy (Crookers Remix)\"\r"
-230 + "# \"If U Seek Amy\" (Crookers Remix)\r"
-231 - "# [[Radar (song)|Radar]]\r"
-231 + "# \"[[Radar (song)|Radar]]\"\r"
-232 - "# \"Radar (Bloodshy & Avant Remix)\"\r"
-232 + "# \"Radar\" (Bloodshy & Avant Remix)\r"
-233 - "# [[3 (song)|3]]\r"
-233 + "# \"[[3 (song)|3]]\"\r"
-234 - "# \"3 (Groove Police Club Mix)\"\r"
-234 + "# \"3\" (Groove Police Club Mix)\r"
+178 - "# [[...Baby One More Time (song)|...Baby One More Time]]\r"
+178 + "# \"[[...Baby One More Time (song)|...Baby One More Time]]\"\r"
+180 - "# [[Sometimes (Britney Spears song)|Sometimes]] <small>(Radio Edit)</small>\r"
+180 + "# \"[[Sometimes (Britney Spears song)|Sometimes]]\" <small>(Radio Edit)</small>\r"
+182 - "# [[(You Drive Me) Crazy]] <small>(The Stop Remix!)</small>\r"
+182 + "# \"[[(You Drive Me) Crazy]]\" <small>(The Stop Remix!)</small>\r"
+184 - "# [[Born to Make You Happy]] <small>(Radio Edit)</small>\r"
+184 + "# \"[[Born to Make You Happy]]\" <small>(Radio Edit)</small>\r"
+185 - "# \"Born to Make You Happy (Kristian Lundin Bonus Remix)\"\r"
+185 + "# \"Born to Make You Happy\" (Kristian Lundin Bonus Remix)\r"
+186 - "# [[From the Bottom of My Broken Heart]] <small>(Radio Edit)</small>\r"
+186 + "# \"[[From the Bottom of My Broken Heart]]\" <small>(Radio Edit)</small>\r"
+188 - "# [[Oops!... I Did It Again (song)|Oops!...I Did It Again]]\r"
+188 + "# \"[[Oops!... I Did It Again (song)|Oops!...I Did It Again]]\"\r"
+190 - "# [[Lucky (Britney Spears song)|Lucky]]\r"
+190 + "# \"[[Lucky (Britney Spears song)|Lucky]]\"\r"
+192 - "# [[Stronger (Britney Spears song)|Stronger]]\r"
+192 + "# \"[[Stronger (Britney Spears song)|Stronger]]\"\r"
+194 - "# [[Don't Let Me Be the Last to Know]]\r"
+194 + "# \"[[Don't Let Me Be the Last to Know]]\"\r"
+195 - "# \"Don't Let Me Be The Last to Know (Hex Hector Radio Mix)\"\r"
+195 + "# \"Don't Let Me Be The Last to Know\" (Hex Hector Radio Mix)\r"
+196 - "# [[I'm a Slave 4 U]]\r"
+196 + "# \"[[I'm a Slave 4 U]]\"\r"
+198 - "# [[Overprotected]]\r"
+198 + "# \"[[Overprotected]]\"\r"
+200 - "# [[I'm Not a Girl, Not Yet a Woman]]\r"
+200 + "# \"[[I'm Not a Girl, Not Yet a Woman]]\"\r"
+202 - "# [[I Love Rock 'n' Roll#Britney Spears version|I Love Rock 'N' Roll]]\r"
+202 + "# \"[[I Love Rock 'n' Roll#Britney Spears version|I Love Rock 'N' Roll]]\"\r"
+203 - "# \"I'm Not A Girl, Not Yet A Woman (Metro Remix Radio Edit)\"\r"
+203 + "# \"I'm Not A Girl, Not Yet A Woman\" (Metro Remix Radio Edit)\r"
+204 - "# [[Boys (Britney Spears song)|Boys]] <small>(The Co-Ed Remix feat. [[Pharrell Williams]]) </small>\r"
+204 + "# \"[[Boys (Britney Spears song)|Boys]]\" <small>(The Co-Ed Remix feat. [[Pharrell Williams]]) </small>\r"
+205 - "# \"Boys (Album Version)\"\r"
+205 + "# \"Boys\" (Album Version)\r"
+206 - "# [[Me Against the Music]] <small>(feat. [[Madonna (entertainer)|Madonna]]) </small>\r"
+206 + "# \"[[Me Against the Music]]\" <small>(feat. [[Madonna (entertainer)|Madonna]]) </small>\r"
+207 - "# \"Me Against the Music (Passengerz vs. the Club Mix)\"\r"
+207 + "# \"Me Against the Music\" (Passengerz vs. the Club Mix)\r"
+208 - "# [[Toxic (song)|Toxic]]\r"
+208 + "# \"[[Toxic (song)|Toxic]]\"\r"
+209 - "# \"Toxic (Bloodshy & Avant Intoxicated Remix)\"\r"
+209 + "# \"Toxic\" (Bloodshy & Avant Intoxicated Remix)\r"
+210 - "# [[Everytime]]\r"
+210 + "# \"[[Everytime]]\"\r"
+211 - "# \"Everytime (Above & Beyond Club Mix)\"\r"
+211 + "# \"Everytime\" (Above & Beyond Club Mix)\r"
+212 - "# [[Outrageous]]\r"
+212 + "# \"[[Outrageous]]\"\r"
+213 - "# \"Outragous (Junkie XL's Dancehall Mix)\"\r"
+213 + "# \"Outragous\" (Junkie XL's Dancehall Mix)\r"
+214 - "# [[My Prerogative#Britney Spears version|My Prerogative]]\r"
+214 + "# \"[[My Prerogative#Britney Spears version|My Prerogative]]\"\r"
+215 - "# \"My Prerogative (Armand Van Helden Remix)\"\r"
+215 + "# \"My Prerogative\" (Armand Van Helden Remix)\r"
+216 - "# [[Do Somethin']]\r"
+216 + "# \"[[Do Somethin']]\"\r"
+217 - "# \"Do Somethin' (Thick Vocal Mix)\"\r"
+217 + "# \"Do Somethin'\" (Thick Vocal Mix)\r"
+218 - "# [[Someday (I Will Understand)]]\r"
+218 + "# \"[[Someday (I Will Understand)]]\"\r"
+220 - "# [[Gimme More]]\r"
+220 + "# \"[[Gimme More]]\"\r"
+221 - "# \"Gimme More (Paul Oakenfold Remix)\"\r"
+221 + "# \"Gimme More\" (Paul Oakenfold Remix)\r"
+222 - "# [[Piece of Me]]\r"
+222 + "# \"[[Piece of Me]]\"\r"
+223 - "# \"Piece of Me (Boz O Lo Remix)\"\r"
+223 + "# \"Piece of Me\" (Boz O Lo Remix)\r"
+224 - "# [[Break the Ice (Britney Spears song)|Break the Ice]]\r"
+224 + "# \"[[Break the Ice (Britney Spears song)|Break the Ice]]\"\r"
+226 - "# [[Womanizer (song)|Womanizer]]\r"
+226 + "# \"[[Womanizer (song)|Womanizer]]\"\r"
+227 - "# \"Womanizer (Kaskade Remix)\"\r"
+227 + "# \"Womanizer\" (Kaskade Remix)\r"
+228 - "# [[Circus (song)|Circus]]\r"
+228 + "# \"[[Circus (song)|Circus]]\"\r"
+229 - "# \"Circus (Tom Neville's Ringleader Remix)\"\r"
+229 + "# \"Circus\" (Tom Neville's Ringleader Remix)\r"
+230 - "# [[If U Seek Amy]]\r"
+230 + "# \"[[If U Seek Amy]]\"\r"
+231 - "# \"If U Seek Amy (Crookers Remix)\"\r"
+231 + "# \"If U Seek Amy\" (Crookers Remix)\r"
+232 - "# [[Radar (song)|Radar]]\r"
+232 + "# \"[[Radar (song)|Radar]]\"\r"
+233 - "# \"Radar (Bloodshy & Avant Remix)\"\r"
+233 + "# \"Radar\" (Bloodshy & Avant Remix)\r"
+234 - "# [[3 (song)|3]]\r"
+234 + "# \"[[3 (song)|3]]\"\r"
+235 - "# \"3 (Groove Police Club Mix)\"\r"
+235 + "# \"3\" (Groove Police Club Mix)\r"
diff --git a/lib/text/diff/testdata/the_singles_collection_diff_LevelLines_reverse b/lib/text/diff/testdata/the_singles_collection_diff_LevelLines_reverse
index 8b507bf5..2ac51306 100644
--- a/lib/text/diff/testdata/the_singles_collection_diff_LevelLines_reverse
+++ b/lib/text/diff/testdata/the_singles_collection_diff_LevelLines_reverse
@@ -1,93 +1,93 @@
--++
-177 - "# \"[[...Baby One More Time (song)|...Baby One More Time]]\"\r"
-177 + "# [[...Baby One More Time (song)|...Baby One More Time]]\r"
-179 - "# \"[[Sometimes (Britney Spears song)|Sometimes]]\" <small>(Radio Edit)</small>\r"
-179 + "# [[Sometimes (Britney Spears song)|Sometimes]] <small>(Radio Edit)</small>\r"
-181 - "# \"[[(You Drive Me) Crazy]]\" <small>(The Stop Remix!)</small>\r"
-181 + "# [[(You Drive Me) Crazy]] <small>(The Stop Remix!)</small>\r"
-183 - "# \"[[Born to Make You Happy]]\" <small>(Radio Edit)</small>\r"
-183 + "# [[Born to Make You Happy]] <small>(Radio Edit)</small>\r"
-184 - "# \"Born to Make You Happy\" (Kristian Lundin Bonus Remix)\r"
-184 + "# \"Born to Make You Happy (Kristian Lundin Bonus Remix)\"\r"
-185 - "# \"[[From the Bottom of My Broken Heart]]\" <small>(Radio Edit)</small>\r"
-185 + "# [[From the Bottom of My Broken Heart]] <small>(Radio Edit)</small>\r"
-187 - "# \"[[Oops!... I Did It Again (song)|Oops!...I Did It Again]]\"\r"
-187 + "# [[Oops!... I Did It Again (song)|Oops!...I Did It Again]]\r"
-189 - "# \"[[Lucky (Britney Spears song)|Lucky]]\"\r"
-189 + "# [[Lucky (Britney Spears song)|Lucky]]\r"
-191 - "# \"[[Stronger (Britney Spears song)|Stronger]]\"\r"
-191 + "# [[Stronger (Britney Spears song)|Stronger]]\r"
-193 - "# \"[[Don't Let Me Be the Last to Know]]\"\r"
-193 + "# [[Don't Let Me Be the Last to Know]]\r"
-194 - "# \"Don't Let Me Be The Last to Know\" (Hex Hector Radio Mix)\r"
-194 + "# \"Don't Let Me Be The Last to Know (Hex Hector Radio Mix)\"\r"
-195 - "# \"[[I'm a Slave 4 U]]\"\r"
-195 + "# [[I'm a Slave 4 U]]\r"
-197 - "# \"[[Overprotected]]\"\r"
-197 + "# [[Overprotected]]\r"
-199 - "# \"[[I'm Not a Girl, Not Yet a Woman]]\"\r"
-199 + "# [[I'm Not a Girl, Not Yet a Woman]]\r"
-201 - "# \"[[I Love Rock 'n' Roll#Britney Spears version|I Love Rock 'N' Roll]]\"\r"
-201 + "# [[I Love Rock 'n' Roll#Britney Spears version|I Love Rock 'N' Roll]]\r"
-202 - "# \"I'm Not A Girl, Not Yet A Woman\" (Metro Remix Radio Edit)\r"
-202 + "# \"I'm Not A Girl, Not Yet A Woman (Metro Remix Radio Edit)\"\r"
-203 - "# \"[[Boys (Britney Spears song)|Boys]]\" <small>(The Co-Ed Remix feat. [[Pharrell Williams]]) </small>\r"
-203 + "# [[Boys (Britney Spears song)|Boys]] <small>(The Co-Ed Remix feat. [[Pharrell Williams]]) </small>\r"
-204 - "# \"Boys\" (Album Version)\r"
-204 + "# \"Boys (Album Version)\"\r"
-205 - "# \"[[Me Against the Music]]\" <small>(feat. [[Madonna (entertainer)|Madonna]]) </small>\r"
-205 + "# [[Me Against the Music]] <small>(feat. [[Madonna (entertainer)|Madonna]]) </small>\r"
-206 - "# \"Me Against the Music\" (Passengerz vs. the Club Mix)\r"
-206 + "# \"Me Against the Music (Passengerz vs. the Club Mix)\"\r"
-207 - "# \"[[Toxic (song)|Toxic]]\"\r"
-207 + "# [[Toxic (song)|Toxic]]\r"
-208 - "# \"Toxic\" (Bloodshy & Avant Intoxicated Remix)\r"
-208 + "# \"Toxic (Bloodshy & Avant Intoxicated Remix)\"\r"
-209 - "# \"[[Everytime]]\"\r"
-209 + "# [[Everytime]]\r"
-210 - "# \"Everytime\" (Above & Beyond Club Mix)\r"
-210 + "# \"Everytime (Above & Beyond Club Mix)\"\r"
-211 - "# \"[[Outrageous]]\"\r"
-211 + "# [[Outrageous]]\r"
-212 - "# \"Outragous\" (Junkie XL's Dancehall Mix)\r"
-212 + "# \"Outragous (Junkie XL's Dancehall Mix)\"\r"
-213 - "# \"[[My Prerogative#Britney Spears version|My Prerogative]]\"\r"
-213 + "# [[My Prerogative#Britney Spears version|My Prerogative]]\r"
-214 - "# \"My Prerogative\" (Armand Van Helden Remix)\r"
-214 + "# \"My Prerogative (Armand Van Helden Remix)\"\r"
-215 - "# \"[[Do Somethin']]\"\r"
-215 + "# [[Do Somethin']]\r"
-216 - "# \"Do Somethin'\" (Thick Vocal Mix)\r"
-216 + "# \"Do Somethin' (Thick Vocal Mix)\"\r"
-217 - "# \"[[Someday (I Will Understand)]]\"\r"
-217 + "# [[Someday (I Will Understand)]]\r"
-219 - "# \"[[Gimme More]]\"\r"
-219 + "# [[Gimme More]]\r"
-220 - "# \"Gimme More\" (Paul Oakenfold Remix)\r"
-220 + "# \"Gimme More (Paul Oakenfold Remix)\"\r"
-221 - "# \"[[Piece of Me]]\"\r"
-221 + "# [[Piece of Me]]\r"
-222 - "# \"Piece of Me\" (Boz O Lo Remix)\r"
-222 + "# \"Piece of Me (Boz O Lo Remix)\"\r"
-223 - "# \"[[Break the Ice (Britney Spears song)|Break the Ice]]\"\r"
-223 + "# [[Break the Ice (Britney Spears song)|Break the Ice]]\r"
-225 - "# \"[[Womanizer (song)|Womanizer]]\"\r"
-225 + "# [[Womanizer (song)|Womanizer]]\r"
-226 - "# \"Womanizer\" (Kaskade Remix)\r"
-226 + "# \"Womanizer (Kaskade Remix)\"\r"
-227 - "# \"[[Circus (song)|Circus]]\"\r"
-227 + "# [[Circus (song)|Circus]]\r"
-228 - "# \"Circus\" (Tom Neville's Ringleader Remix)\r"
-228 + "# \"Circus (Tom Neville's Ringleader Remix)\"\r"
-229 - "# \"[[If U Seek Amy]]\"\r"
-229 + "# [[If U Seek Amy]]\r"
-230 - "# \"If U Seek Amy\" (Crookers Remix)\r"
-230 + "# \"If U Seek Amy (Crookers Remix)\"\r"
-231 - "# \"[[Radar (song)|Radar]]\"\r"
-231 + "# [[Radar (song)|Radar]]\r"
-232 - "# \"Radar\" (Bloodshy & Avant Remix)\r"
-232 + "# \"Radar (Bloodshy & Avant Remix)\"\r"
-233 - "# \"[[3 (song)|3]]\"\r"
-233 + "# [[3 (song)|3]]\r"
-234 - "# \"3\" (Groove Police Club Mix)\r"
-234 + "# \"3 (Groove Police Club Mix)\"\r"
+178 - "# \"[[...Baby One More Time (song)|...Baby One More Time]]\"\r"
+178 + "# [[...Baby One More Time (song)|...Baby One More Time]]\r"
+180 - "# \"[[Sometimes (Britney Spears song)|Sometimes]]\" <small>(Radio Edit)</small>\r"
+180 + "# [[Sometimes (Britney Spears song)|Sometimes]] <small>(Radio Edit)</small>\r"
+182 - "# \"[[(You Drive Me) Crazy]]\" <small>(The Stop Remix!)</small>\r"
+182 + "# [[(You Drive Me) Crazy]] <small>(The Stop Remix!)</small>\r"
+184 - "# \"[[Born to Make You Happy]]\" <small>(Radio Edit)</small>\r"
+184 + "# [[Born to Make You Happy]] <small>(Radio Edit)</small>\r"
+185 - "# \"Born to Make You Happy\" (Kristian Lundin Bonus Remix)\r"
+185 + "# \"Born to Make You Happy (Kristian Lundin Bonus Remix)\"\r"
+186 - "# \"[[From the Bottom of My Broken Heart]]\" <small>(Radio Edit)</small>\r"
+186 + "# [[From the Bottom of My Broken Heart]] <small>(Radio Edit)</small>\r"
+188 - "# \"[[Oops!... I Did It Again (song)|Oops!...I Did It Again]]\"\r"
+188 + "# [[Oops!... I Did It Again (song)|Oops!...I Did It Again]]\r"
+190 - "# \"[[Lucky (Britney Spears song)|Lucky]]\"\r"
+190 + "# [[Lucky (Britney Spears song)|Lucky]]\r"
+192 - "# \"[[Stronger (Britney Spears song)|Stronger]]\"\r"
+192 + "# [[Stronger (Britney Spears song)|Stronger]]\r"
+194 - "# \"[[Don't Let Me Be the Last to Know]]\"\r"
+194 + "# [[Don't Let Me Be the Last to Know]]\r"
+195 - "# \"Don't Let Me Be The Last to Know\" (Hex Hector Radio Mix)\r"
+195 + "# \"Don't Let Me Be The Last to Know (Hex Hector Radio Mix)\"\r"
+196 - "# \"[[I'm a Slave 4 U]]\"\r"
+196 + "# [[I'm a Slave 4 U]]\r"
+198 - "# \"[[Overprotected]]\"\r"
+198 + "# [[Overprotected]]\r"
+200 - "# \"[[I'm Not a Girl, Not Yet a Woman]]\"\r"
+200 + "# [[I'm Not a Girl, Not Yet a Woman]]\r"
+202 - "# \"[[I Love Rock 'n' Roll#Britney Spears version|I Love Rock 'N' Roll]]\"\r"
+202 + "# [[I Love Rock 'n' Roll#Britney Spears version|I Love Rock 'N' Roll]]\r"
+203 - "# \"I'm Not A Girl, Not Yet A Woman\" (Metro Remix Radio Edit)\r"
+203 + "# \"I'm Not A Girl, Not Yet A Woman (Metro Remix Radio Edit)\"\r"
+204 - "# \"[[Boys (Britney Spears song)|Boys]]\" <small>(The Co-Ed Remix feat. [[Pharrell Williams]]) </small>\r"
+204 + "# [[Boys (Britney Spears song)|Boys]] <small>(The Co-Ed Remix feat. [[Pharrell Williams]]) </small>\r"
+205 - "# \"Boys\" (Album Version)\r"
+205 + "# \"Boys (Album Version)\"\r"
+206 - "# \"[[Me Against the Music]]\" <small>(feat. [[Madonna (entertainer)|Madonna]]) </small>\r"
+206 + "# [[Me Against the Music]] <small>(feat. [[Madonna (entertainer)|Madonna]]) </small>\r"
+207 - "# \"Me Against the Music\" (Passengerz vs. the Club Mix)\r"
+207 + "# \"Me Against the Music (Passengerz vs. the Club Mix)\"\r"
+208 - "# \"[[Toxic (song)|Toxic]]\"\r"
+208 + "# [[Toxic (song)|Toxic]]\r"
+209 - "# \"Toxic\" (Bloodshy & Avant Intoxicated Remix)\r"
+209 + "# \"Toxic (Bloodshy & Avant Intoxicated Remix)\"\r"
+210 - "# \"[[Everytime]]\"\r"
+210 + "# [[Everytime]]\r"
+211 - "# \"Everytime\" (Above & Beyond Club Mix)\r"
+211 + "# \"Everytime (Above & Beyond Club Mix)\"\r"
+212 - "# \"[[Outrageous]]\"\r"
+212 + "# [[Outrageous]]\r"
+213 - "# \"Outragous\" (Junkie XL's Dancehall Mix)\r"
+213 + "# \"Outragous (Junkie XL's Dancehall Mix)\"\r"
+214 - "# \"[[My Prerogative#Britney Spears version|My Prerogative]]\"\r"
+214 + "# [[My Prerogative#Britney Spears version|My Prerogative]]\r"
+215 - "# \"My Prerogative\" (Armand Van Helden Remix)\r"
+215 + "# \"My Prerogative (Armand Van Helden Remix)\"\r"
+216 - "# \"[[Do Somethin']]\"\r"
+216 + "# [[Do Somethin']]\r"
+217 - "# \"Do Somethin'\" (Thick Vocal Mix)\r"
+217 + "# \"Do Somethin' (Thick Vocal Mix)\"\r"
+218 - "# \"[[Someday (I Will Understand)]]\"\r"
+218 + "# [[Someday (I Will Understand)]]\r"
+220 - "# \"[[Gimme More]]\"\r"
+220 + "# [[Gimme More]]\r"
+221 - "# \"Gimme More\" (Paul Oakenfold Remix)\r"
+221 + "# \"Gimme More (Paul Oakenfold Remix)\"\r"
+222 - "# \"[[Piece of Me]]\"\r"
+222 + "# [[Piece of Me]]\r"
+223 - "# \"Piece of Me\" (Boz O Lo Remix)\r"
+223 + "# \"Piece of Me (Boz O Lo Remix)\"\r"
+224 - "# \"[[Break the Ice (Britney Spears song)|Break the Ice]]\"\r"
+224 + "# [[Break the Ice (Britney Spears song)|Break the Ice]]\r"
+226 - "# \"[[Womanizer (song)|Womanizer]]\"\r"
+226 + "# [[Womanizer (song)|Womanizer]]\r"
+227 - "# \"Womanizer\" (Kaskade Remix)\r"
+227 + "# \"Womanizer (Kaskade Remix)\"\r"
+228 - "# \"[[Circus (song)|Circus]]\"\r"
+228 + "# [[Circus (song)|Circus]]\r"
+229 - "# \"Circus\" (Tom Neville's Ringleader Remix)\r"
+229 + "# \"Circus (Tom Neville's Ringleader Remix)\"\r"
+230 - "# \"[[If U Seek Amy]]\"\r"
+230 + "# [[If U Seek Amy]]\r"
+231 - "# \"If U Seek Amy\" (Crookers Remix)\r"
+231 + "# \"If U Seek Amy (Crookers Remix)\"\r"
+232 - "# \"[[Radar (song)|Radar]]\"\r"
+232 + "# [[Radar (song)|Radar]]\r"
+233 - "# \"Radar\" (Bloodshy & Avant Remix)\r"
+233 + "# \"Radar (Bloodshy & Avant Remix)\"\r"
+234 - "# \"[[3 (song)|3]]\"\r"
+234 + "# [[3 (song)|3]]\r"
+235 - "# \"3\" (Groove Police Club Mix)\r"
+235 + "# \"3 (Groove Police Club Mix)\"\r"
diff --git a/lib/text/diff/testdata/the_singles_collection_diff_LevelWords b/lib/text/diff/testdata/the_singles_collection_diff_LevelWords
index f1ce9388..8612deaa 100644
--- a/lib/text/diff/testdata/the_singles_collection_diff_LevelWords
+++ b/lib/text/diff/testdata/the_singles_collection_diff_LevelWords
@@ -1,185 +1,185 @@
--++
-177 - "# [[...Baby One More Time (song)|...Baby One More Time]]\r"
-177 + "# \"[[...Baby One More Time (song)|...Baby One More Time]]\"\r"
+178 - "# [[...Baby One More Time (song)|...Baby One More Time]]\r"
+178 + "# \"[[...Baby One More Time (song)|...Baby One More Time]]\"\r"
^2 + "\""
^56 + "\""
-179 - "# [[Sometimes (Britney Spears song)|Sometimes]] <small>(Radio Edit)</small>\r"
-179 + "# \"[[Sometimes (Britney Spears song)|Sometimes]]\" <small>(Radio Edit)</small>\r"
+180 - "# [[Sometimes (Britney Spears song)|Sometimes]] <small>(Radio Edit)</small>\r"
+180 + "# \"[[Sometimes (Britney Spears song)|Sometimes]]\" <small>(Radio Edit)</small>\r"
^2 + "\""
^47 + "\""
-181 - "# [[(You Drive Me) Crazy]] <small>(The Stop Remix!)</small>\r"
-181 + "# \"[[(You Drive Me) Crazy]]\" <small>(The Stop Remix!)</small>\r"
+182 - "# [[(You Drive Me) Crazy]] <small>(The Stop Remix!)</small>\r"
+182 + "# \"[[(You Drive Me) Crazy]]\" <small>(The Stop Remix!)</small>\r"
^2 + "\""
^26 + "\""
-183 - "# [[Born to Make You Happy]] <small>(Radio Edit)</small>\r"
-183 + "# \"[[Born to Make You Happy]]\" <small>(Radio Edit)</small>\r"
+184 - "# [[Born to Make You Happy]] <small>(Radio Edit)</small>\r"
+184 + "# \"[[Born to Make You Happy]]\" <small>(Radio Edit)</small>\r"
^2 + "\""
^28 + "\""
-184 - "# \"Born to Make You Happy (Kristian Lundin Bonus Remix)\"\r"
-184 + "# \"Born to Make You Happy\" (Kristian Lundin Bonus Remix)\r"
+185 - "# \"Born to Make You Happy (Kristian Lundin Bonus Remix)\"\r"
+185 + "# \"Born to Make You Happy\" (Kristian Lundin Bonus Remix)\r"
^55 - "\""
^25 + "\""
-185 - "# [[From the Bottom of My Broken Heart]] <small>(Radio Edit)</small>\r"
-185 + "# \"[[From the Bottom of My Broken Heart]]\" <small>(Radio Edit)</small>\r"
+186 - "# [[From the Bottom of My Broken Heart]] <small>(Radio Edit)</small>\r"
+186 + "# \"[[From the Bottom of My Broken Heart]]\" <small>(Radio Edit)</small>\r"
^2 + "\""
^40 + "\""
-187 - "# [[Oops!... I Did It Again (song)|Oops!...I Did It Again]]\r"
-187 + "# \"[[Oops!... I Did It Again (song)|Oops!...I Did It Again]]\"\r"
+188 - "# [[Oops!... I Did It Again (song)|Oops!...I Did It Again]]\r"
+188 + "# \"[[Oops!... I Did It Again (song)|Oops!...I Did It Again]]\"\r"
^2 + "\""
^59 + "\""
-189 - "# [[Lucky (Britney Spears song)|Lucky]]\r"
-189 + "# \"[[Lucky (Britney Spears song)|Lucky]]\"\r"
+190 - "# [[Lucky (Britney Spears song)|Lucky]]\r"
+190 + "# \"[[Lucky (Britney Spears song)|Lucky]]\"\r"
^2 + "\""
^39 + "\""
-191 - "# [[Stronger (Britney Spears song)|Stronger]]\r"
-191 + "# \"[[Stronger (Britney Spears song)|Stronger]]\"\r"
+192 - "# [[Stronger (Britney Spears song)|Stronger]]\r"
+192 + "# \"[[Stronger (Britney Spears song)|Stronger]]\"\r"
^2 + "\""
^45 + "\""
-193 - "# [[Don't Let Me Be the Last to Know]]\r"
-193 + "# \"[[Don't Let Me Be the Last to Know]]\"\r"
+194 - "# [[Don't Let Me Be the Last to Know]]\r"
+194 + "# \"[[Don't Let Me Be the Last to Know]]\"\r"
^2 + "\""
^38 + "\""
-194 - "# \"Don't Let Me Be The Last to Know (Hex Hector Radio Mix)\"\r"
-194 + "# \"Don't Let Me Be The Last to Know\" (Hex Hector Radio Mix)\r"
+195 - "# \"Don't Let Me Be The Last to Know (Hex Hector Radio Mix)\"\r"
+195 + "# \"Don't Let Me Be The Last to Know\" (Hex Hector Radio Mix)\r"
^58 - "\""
^35 + "\""
-195 - "# [[I'm a Slave 4 U]]\r"
-195 + "# \"[[I'm a Slave 4 U]]\"\r"
+196 - "# [[I'm a Slave 4 U]]\r"
+196 + "# \"[[I'm a Slave 4 U]]\"\r"
^2 + "\""
^21 + "\""
-197 - "# [[Overprotected]]\r"
-197 + "# \"[[Overprotected]]\"\r"
+198 - "# [[Overprotected]]\r"
+198 + "# \"[[Overprotected]]\"\r"
^2 + "\""
^19 + "\""
-199 - "# [[I'm Not a Girl, Not Yet a Woman]]\r"
-199 + "# \"[[I'm Not a Girl, Not Yet a Woman]]\"\r"
+200 - "# [[I'm Not a Girl, Not Yet a Woman]]\r"
+200 + "# \"[[I'm Not a Girl, Not Yet a Woman]]\"\r"
^2 + "\""
^37 + "\""
-201 - "# [[I Love Rock 'n' Roll#Britney Spears version|I Love Rock 'N' Roll]]\r"
-201 + "# \"[[I Love Rock 'n' Roll#Britney Spears version|I Love Rock 'N' Roll]]\"\r"
+202 - "# [[I Love Rock 'n' Roll#Britney Spears version|I Love Rock 'N' Roll]]\r"
+202 + "# \"[[I Love Rock 'n' Roll#Britney Spears version|I Love Rock 'N' Roll]]\"\r"
^2 + "\""
^70 + "\""
-202 - "# \"I'm Not A Girl, Not Yet A Woman (Metro Remix Radio Edit)\"\r"
-202 + "# \"I'm Not A Girl, Not Yet A Woman\" (Metro Remix Radio Edit)\r"
+203 - "# \"I'm Not A Girl, Not Yet A Woman (Metro Remix Radio Edit)\"\r"
+203 + "# \"I'm Not A Girl, Not Yet A Woman\" (Metro Remix Radio Edit)\r"
^59 - "\""
^34 + "\""
-203 - "# [[Boys (Britney Spears song)|Boys]] <small>(The Co-Ed Remix feat. [[Pharrell Williams]]) </small>\r"
-203 + "# \"[[Boys (Britney Spears song)|Boys]]\" <small>(The Co-Ed Remix feat. [[Pharrell Williams]]) </small>\r"
+204 - "# [[Boys (Britney Spears song)|Boys]] <small>(The Co-Ed Remix feat. [[Pharrell Williams]]) </small>\r"
+204 + "# \"[[Boys (Britney Spears song)|Boys]]\" <small>(The Co-Ed Remix feat. [[Pharrell Williams]]) </small>\r"
^2 + "\""
^37 + "\""
-204 - "# \"Boys (Album Version)\"\r"
-204 + "# \"Boys\" (Album Version)\r"
+205 - "# \"Boys (Album Version)\"\r"
+205 + "# \"Boys\" (Album Version)\r"
^23 - "\""
^7 + "\""
-205 - "# [[Me Against the Music]] <small>(feat. [[Madonna (entertainer)|Madonna]]) </small>\r"
-205 + "# \"[[Me Against the Music]]\" <small>(feat. [[Madonna (entertainer)|Madonna]]) </small>\r"
+206 - "# [[Me Against the Music]] <small>(feat. [[Madonna (entertainer)|Madonna]]) </small>\r"
+206 + "# \"[[Me Against the Music]]\" <small>(feat. [[Madonna (entertainer)|Madonna]]) </small>\r"
^2 + "\""
^26 + "\""
-206 - "# \"Me Against the Music (Passengerz vs. the Club Mix)\"\r"
-206 + "# \"Me Against the Music\" (Passengerz vs. the Club Mix)\r"
+207 - "# \"Me Against the Music (Passengerz vs. the Club Mix)\"\r"
+207 + "# \"Me Against the Music\" (Passengerz vs. the Club Mix)\r"
^53 - "\""
^23 + "\""
-207 - "# [[Toxic (song)|Toxic]]\r"
-207 + "# \"[[Toxic (song)|Toxic]]\"\r"
+208 - "# [[Toxic (song)|Toxic]]\r"
+208 + "# \"[[Toxic (song)|Toxic]]\"\r"
^2 + "\""
^24 + "\""
-208 - "# \"Toxic (Bloodshy & Avant Intoxicated Remix)\"\r"
-208 + "# \"Toxic\" (Bloodshy & Avant Intoxicated Remix)\r"
+209 - "# \"Toxic (Bloodshy & Avant Intoxicated Remix)\"\r"
+209 + "# \"Toxic\" (Bloodshy & Avant Intoxicated Remix)\r"
^45 - "\""
^8 + "\""
-209 - "# [[Everytime]]\r"
-209 + "# \"[[Everytime]]\"\r"
+210 - "# [[Everytime]]\r"
+210 + "# \"[[Everytime]]\"\r"
^2 + "\""
^15 + "\""
-210 - "# \"Everytime (Above & Beyond Club Mix)\"\r"
-210 + "# \"Everytime\" (Above & Beyond Club Mix)\r"
+211 - "# \"Everytime (Above & Beyond Club Mix)\"\r"
+211 + "# \"Everytime\" (Above & Beyond Club Mix)\r"
^38 - "\""
^12 + "\""
-211 - "# [[Outrageous]]\r"
-211 + "# \"[[Outrageous]]\"\r"
+212 - "# [[Outrageous]]\r"
+212 + "# \"[[Outrageous]]\"\r"
^2 + "\""
^16 + "\""
-212 - "# \"Outragous (Junkie XL's Dancehall Mix)\"\r"
-212 + "# \"Outragous\" (Junkie XL's Dancehall Mix)\r"
+213 - "# \"Outragous (Junkie XL's Dancehall Mix)\"\r"
+213 + "# \"Outragous\" (Junkie XL's Dancehall Mix)\r"
^40 - "\""
^12 + "\""
-213 - "# [[My Prerogative#Britney Spears version|My Prerogative]]\r"
-213 + "# \"[[My Prerogative#Britney Spears version|My Prerogative]]\"\r"
+214 - "# [[My Prerogative#Britney Spears version|My Prerogative]]\r"
+214 + "# \"[[My Prerogative#Britney Spears version|My Prerogative]]\"\r"
^2 + "\""
^58 + "\""
-214 - "# \"My Prerogative (Armand Van Helden Remix)\"\r"
-214 + "# \"My Prerogative\" (Armand Van Helden Remix)\r"
+215 - "# \"My Prerogative (Armand Van Helden Remix)\"\r"
+215 + "# \"My Prerogative\" (Armand Van Helden Remix)\r"
^43 - "\""
^17 + "\""
-215 - "# [[Do Somethin']]\r"
-215 + "# \"[[Do Somethin']]\"\r"
+216 - "# [[Do Somethin']]\r"
+216 + "# \"[[Do Somethin']]\"\r"
^2 + "\""
^18 + "\""
-216 - "# \"Do Somethin' (Thick Vocal Mix)\"\r"
-216 + "# \"Do Somethin'\" (Thick Vocal Mix)\r"
+217 - "# \"Do Somethin' (Thick Vocal Mix)\"\r"
+217 + "# \"Do Somethin'\" (Thick Vocal Mix)\r"
^33 - "\""
^15 + "\""
-217 - "# [[Someday (I Will Understand)]]\r"
-217 + "# \"[[Someday (I Will Understand)]]\"\r"
+218 - "# [[Someday (I Will Understand)]]\r"
+218 + "# \"[[Someday (I Will Understand)]]\"\r"
^2 + "\""
^33 + "\""
-219 - "# [[Gimme More]]\r"
-219 + "# \"[[Gimme More]]\"\r"
+220 - "# [[Gimme More]]\r"
+220 + "# \"[[Gimme More]]\"\r"
^2 + "\""
^16 + "\""
-220 - "# \"Gimme More (Paul Oakenfold Remix)\"\r"
-220 + "# \"Gimme More\" (Paul Oakenfold Remix)\r"
+221 - "# \"Gimme More (Paul Oakenfold Remix)\"\r"
+221 + "# \"Gimme More\" (Paul Oakenfold Remix)\r"
^36 - "\""
^13 + "\""
-221 - "# [[Piece of Me]]\r"
-221 + "# \"[[Piece of Me]]\"\r"
+222 - "# [[Piece of Me]]\r"
+222 + "# \"[[Piece of Me]]\"\r"
^2 + "\""
^17 + "\""
-222 - "# \"Piece of Me (Boz O Lo Remix)\"\r"
-222 + "# \"Piece of Me\" (Boz O Lo Remix)\r"
+223 - "# \"Piece of Me (Boz O Lo Remix)\"\r"
+223 + "# \"Piece of Me\" (Boz O Lo Remix)\r"
^31 - "\""
^14 + "\""
-223 - "# [[Break the Ice (Britney Spears song)|Break the Ice]]\r"
-223 + "# \"[[Break the Ice (Britney Spears song)|Break the Ice]]\"\r"
+224 - "# [[Break the Ice (Britney Spears song)|Break the Ice]]\r"
+224 + "# \"[[Break the Ice (Britney Spears song)|Break the Ice]]\"\r"
^2 + "\""
^55 + "\""
-225 - "# [[Womanizer (song)|Womanizer]]\r"
-225 + "# \"[[Womanizer (song)|Womanizer]]\"\r"
+226 - "# [[Womanizer (song)|Womanizer]]\r"
+226 + "# \"[[Womanizer (song)|Womanizer]]\"\r"
^2 + "\""
^32 + "\""
-226 - "# \"Womanizer (Kaskade Remix)\"\r"
-226 + "# \"Womanizer\" (Kaskade Remix)\r"
+227 - "# \"Womanizer (Kaskade Remix)\"\r"
+227 + "# \"Womanizer\" (Kaskade Remix)\r"
^28 - "\""
^12 + "\""
-227 - "# [[Circus (song)|Circus]]\r"
-227 + "# \"[[Circus (song)|Circus]]\"\r"
+228 - "# [[Circus (song)|Circus]]\r"
+228 + "# \"[[Circus (song)|Circus]]\"\r"
^2 + "\""
^26 + "\""
-228 - "# \"Circus (Tom Neville's Ringleader Remix)\"\r"
-228 + "# \"Circus\" (Tom Neville's Ringleader Remix)\r"
+229 - "# \"Circus (Tom Neville's Ringleader Remix)\"\r"
+229 + "# \"Circus\" (Tom Neville's Ringleader Remix)\r"
^42 - "\""
^9 + "\""
-229 - "# [[If U Seek Amy]]\r"
-229 + "# \"[[If U Seek Amy]]\"\r"
+230 - "# [[If U Seek Amy]]\r"
+230 + "# \"[[If U Seek Amy]]\"\r"
^2 + "\""
^19 + "\""
-230 - "# \"If U Seek Amy (Crookers Remix)\"\r"
-230 + "# \"If U Seek Amy\" (Crookers Remix)\r"
+231 - "# \"If U Seek Amy (Crookers Remix)\"\r"
+231 + "# \"If U Seek Amy\" (Crookers Remix)\r"
^33 - "\""
^16 + "\""
-231 - "# [[Radar (song)|Radar]]\r"
-231 + "# \"[[Radar (song)|Radar]]\"\r"
+232 - "# [[Radar (song)|Radar]]\r"
+232 + "# \"[[Radar (song)|Radar]]\"\r"
^2 + "\""
^24 + "\""
-232 - "# \"Radar (Bloodshy & Avant Remix)\"\r"
-232 + "# \"Radar\" (Bloodshy & Avant Remix)\r"
+233 - "# \"Radar (Bloodshy & Avant Remix)\"\r"
+233 + "# \"Radar\" (Bloodshy & Avant Remix)\r"
^33 - "\""
^8 + "\""
-233 - "# [[3 (song)|3]]\r"
-233 + "# \"[[3 (song)|3]]\"\r"
+234 - "# [[3 (song)|3]]\r"
+234 + "# \"[[3 (song)|3]]\"\r"
^2 + "\""
^16 + "\""
-234 - "# \"3 (Groove Police Club Mix)\"\r"
-234 + "# \"3\" (Groove Police Club Mix)\r"
+235 - "# \"3 (Groove Police Club Mix)\"\r"
+235 + "# \"3\" (Groove Police Club Mix)\r"
^29 - "\""
^4 + "\""
diff --git a/lib/text/diff/testdata/the_singles_collection_diff_LevelWords_reverse b/lib/text/diff/testdata/the_singles_collection_diff_LevelWords_reverse
index de36ba1a..f270db92 100644
--- a/lib/text/diff/testdata/the_singles_collection_diff_LevelWords_reverse
+++ b/lib/text/diff/testdata/the_singles_collection_diff_LevelWords_reverse
@@ -1,185 +1,185 @@
--++
-177 - "# \"[[...Baby One More Time (song)|...Baby One More Time]]\"\r"
-177 + "# [[...Baby One More Time (song)|...Baby One More Time]]\r"
+178 - "# \"[[...Baby One More Time (song)|...Baby One More Time]]\"\r"
+178 + "# [[...Baby One More Time (song)|...Baby One More Time]]\r"
^2 - "\""
^56 - "\""
-179 - "# \"[[Sometimes (Britney Spears song)|Sometimes]]\" <small>(Radio Edit)</small>\r"
-179 + "# [[Sometimes (Britney Spears song)|Sometimes]] <small>(Radio Edit)</small>\r"
+180 - "# \"[[Sometimes (Britney Spears song)|Sometimes]]\" <small>(Radio Edit)</small>\r"
+180 + "# [[Sometimes (Britney Spears song)|Sometimes]] <small>(Radio Edit)</small>\r"
^2 - "\""
^47 - "\""
-181 - "# \"[[(You Drive Me) Crazy]]\" <small>(The Stop Remix!)</small>\r"
-181 + "# [[(You Drive Me) Crazy]] <small>(The Stop Remix!)</small>\r"
+182 - "# \"[[(You Drive Me) Crazy]]\" <small>(The Stop Remix!)</small>\r"
+182 + "# [[(You Drive Me) Crazy]] <small>(The Stop Remix!)</small>\r"
^2 - "\""
^26 - "\""
-183 - "# \"[[Born to Make You Happy]]\" <small>(Radio Edit)</small>\r"
-183 + "# [[Born to Make You Happy]] <small>(Radio Edit)</small>\r"
+184 - "# \"[[Born to Make You Happy]]\" <small>(Radio Edit)</small>\r"
+184 + "# [[Born to Make You Happy]] <small>(Radio Edit)</small>\r"
^2 - "\""
^28 - "\""
-184 - "# \"Born to Make You Happy\" (Kristian Lundin Bonus Remix)\r"
-184 + "# \"Born to Make You Happy (Kristian Lundin Bonus Remix)\"\r"
+185 - "# \"Born to Make You Happy\" (Kristian Lundin Bonus Remix)\r"
+185 + "# \"Born to Make You Happy (Kristian Lundin Bonus Remix)\"\r"
^25 - "\""
^55 + "\""
-185 - "# \"[[From the Bottom of My Broken Heart]]\" <small>(Radio Edit)</small>\r"
-185 + "# [[From the Bottom of My Broken Heart]] <small>(Radio Edit)</small>\r"
+186 - "# \"[[From the Bottom of My Broken Heart]]\" <small>(Radio Edit)</small>\r"
+186 + "# [[From the Bottom of My Broken Heart]] <small>(Radio Edit)</small>\r"
^2 - "\""
^40 - "\""
-187 - "# \"[[Oops!... I Did It Again (song)|Oops!...I Did It Again]]\"\r"
-187 + "# [[Oops!... I Did It Again (song)|Oops!...I Did It Again]]\r"
+188 - "# \"[[Oops!... I Did It Again (song)|Oops!...I Did It Again]]\"\r"
+188 + "# [[Oops!... I Did It Again (song)|Oops!...I Did It Again]]\r"
^2 - "\""
^59 - "\""
-189 - "# \"[[Lucky (Britney Spears song)|Lucky]]\"\r"
-189 + "# [[Lucky (Britney Spears song)|Lucky]]\r"
+190 - "# \"[[Lucky (Britney Spears song)|Lucky]]\"\r"
+190 + "# [[Lucky (Britney Spears song)|Lucky]]\r"
^2 - "\""
^39 - "\""
-191 - "# \"[[Stronger (Britney Spears song)|Stronger]]\"\r"
-191 + "# [[Stronger (Britney Spears song)|Stronger]]\r"
+192 - "# \"[[Stronger (Britney Spears song)|Stronger]]\"\r"
+192 + "# [[Stronger (Britney Spears song)|Stronger]]\r"
^2 - "\""
^45 - "\""
-193 - "# \"[[Don't Let Me Be the Last to Know]]\"\r"
-193 + "# [[Don't Let Me Be the Last to Know]]\r"
+194 - "# \"[[Don't Let Me Be the Last to Know]]\"\r"
+194 + "# [[Don't Let Me Be the Last to Know]]\r"
^2 - "\""
^38 - "\""
-194 - "# \"Don't Let Me Be The Last to Know\" (Hex Hector Radio Mix)\r"
-194 + "# \"Don't Let Me Be The Last to Know (Hex Hector Radio Mix)\"\r"
+195 - "# \"Don't Let Me Be The Last to Know\" (Hex Hector Radio Mix)\r"
+195 + "# \"Don't Let Me Be The Last to Know (Hex Hector Radio Mix)\"\r"
^35 - "\""
^58 + "\""
-195 - "# \"[[I'm a Slave 4 U]]\"\r"
-195 + "# [[I'm a Slave 4 U]]\r"
+196 - "# \"[[I'm a Slave 4 U]]\"\r"
+196 + "# [[I'm a Slave 4 U]]\r"
^2 - "\""
^21 - "\""
-197 - "# \"[[Overprotected]]\"\r"
-197 + "# [[Overprotected]]\r"
+198 - "# \"[[Overprotected]]\"\r"
+198 + "# [[Overprotected]]\r"
^2 - "\""
^19 - "\""
-199 - "# \"[[I'm Not a Girl, Not Yet a Woman]]\"\r"
-199 + "# [[I'm Not a Girl, Not Yet a Woman]]\r"
+200 - "# \"[[I'm Not a Girl, Not Yet a Woman]]\"\r"
+200 + "# [[I'm Not a Girl, Not Yet a Woman]]\r"
^2 - "\""
^37 - "\""
-201 - "# \"[[I Love Rock 'n' Roll#Britney Spears version|I Love Rock 'N' Roll]]\"\r"
-201 + "# [[I Love Rock 'n' Roll#Britney Spears version|I Love Rock 'N' Roll]]\r"
+202 - "# \"[[I Love Rock 'n' Roll#Britney Spears version|I Love Rock 'N' Roll]]\"\r"
+202 + "# [[I Love Rock 'n' Roll#Britney Spears version|I Love Rock 'N' Roll]]\r"
^2 - "\""
^70 - "\""
-202 - "# \"I'm Not A Girl, Not Yet A Woman\" (Metro Remix Radio Edit)\r"
-202 + "# \"I'm Not A Girl, Not Yet A Woman (Metro Remix Radio Edit)\"\r"
+203 - "# \"I'm Not A Girl, Not Yet A Woman\" (Metro Remix Radio Edit)\r"
+203 + "# \"I'm Not A Girl, Not Yet A Woman (Metro Remix Radio Edit)\"\r"
^34 - "\""
^59 + "\""
-203 - "# \"[[Boys (Britney Spears song)|Boys]]\" <small>(The Co-Ed Remix feat. [[Pharrell Williams]]) </small>\r"
-203 + "# [[Boys (Britney Spears song)|Boys]] <small>(The Co-Ed Remix feat. [[Pharrell Williams]]) </small>\r"
+204 - "# \"[[Boys (Britney Spears song)|Boys]]\" <small>(The Co-Ed Remix feat. [[Pharrell Williams]]) </small>\r"
+204 + "# [[Boys (Britney Spears song)|Boys]] <small>(The Co-Ed Remix feat. [[Pharrell Williams]]) </small>\r"
^2 - "\""
^37 - "\""
-204 - "# \"Boys\" (Album Version)\r"
-204 + "# \"Boys (Album Version)\"\r"
+205 - "# \"Boys\" (Album Version)\r"
+205 + "# \"Boys (Album Version)\"\r"
^7 - "\""
^23 + "\""
-205 - "# \"[[Me Against the Music]]\" <small>(feat. [[Madonna (entertainer)|Madonna]]) </small>\r"
-205 + "# [[Me Against the Music]] <small>(feat. [[Madonna (entertainer)|Madonna]]) </small>\r"
+206 - "# \"[[Me Against the Music]]\" <small>(feat. [[Madonna (entertainer)|Madonna]]) </small>\r"
+206 + "# [[Me Against the Music]] <small>(feat. [[Madonna (entertainer)|Madonna]]) </small>\r"
^2 - "\""
^26 - "\""
-206 - "# \"Me Against the Music\" (Passengerz vs. the Club Mix)\r"
-206 + "# \"Me Against the Music (Passengerz vs. the Club Mix)\"\r"
+207 - "# \"Me Against the Music\" (Passengerz vs. the Club Mix)\r"
+207 + "# \"Me Against the Music (Passengerz vs. the Club Mix)\"\r"
^23 - "\""
^53 + "\""
-207 - "# \"[[Toxic (song)|Toxic]]\"\r"
-207 + "# [[Toxic (song)|Toxic]]\r"
+208 - "# \"[[Toxic (song)|Toxic]]\"\r"
+208 + "# [[Toxic (song)|Toxic]]\r"
^2 - "\""
^24 - "\""
-208 - "# \"Toxic\" (Bloodshy & Avant Intoxicated Remix)\r"
-208 + "# \"Toxic (Bloodshy & Avant Intoxicated Remix)\"\r"
+209 - "# \"Toxic\" (Bloodshy & Avant Intoxicated Remix)\r"
+209 + "# \"Toxic (Bloodshy & Avant Intoxicated Remix)\"\r"
^8 - "\""
^45 + "\""
-209 - "# \"[[Everytime]]\"\r"
-209 + "# [[Everytime]]\r"
+210 - "# \"[[Everytime]]\"\r"
+210 + "# [[Everytime]]\r"
^2 - "\""
^15 - "\""
-210 - "# \"Everytime\" (Above & Beyond Club Mix)\r"
-210 + "# \"Everytime (Above & Beyond Club Mix)\"\r"
+211 - "# \"Everytime\" (Above & Beyond Club Mix)\r"
+211 + "# \"Everytime (Above & Beyond Club Mix)\"\r"
^12 - "\""
^38 + "\""
-211 - "# \"[[Outrageous]]\"\r"
-211 + "# [[Outrageous]]\r"
+212 - "# \"[[Outrageous]]\"\r"
+212 + "# [[Outrageous]]\r"
^2 - "\""
^16 - "\""
-212 - "# \"Outragous\" (Junkie XL's Dancehall Mix)\r"
-212 + "# \"Outragous (Junkie XL's Dancehall Mix)\"\r"
+213 - "# \"Outragous\" (Junkie XL's Dancehall Mix)\r"
+213 + "# \"Outragous (Junkie XL's Dancehall Mix)\"\r"
^12 - "\""
^40 + "\""
-213 - "# \"[[My Prerogative#Britney Spears version|My Prerogative]]\"\r"
-213 + "# [[My Prerogative#Britney Spears version|My Prerogative]]\r"
+214 - "# \"[[My Prerogative#Britney Spears version|My Prerogative]]\"\r"
+214 + "# [[My Prerogative#Britney Spears version|My Prerogative]]\r"
^2 - "\""
^58 - "\""
-214 - "# \"My Prerogative\" (Armand Van Helden Remix)\r"
-214 + "# \"My Prerogative (Armand Van Helden Remix)\"\r"
+215 - "# \"My Prerogative\" (Armand Van Helden Remix)\r"
+215 + "# \"My Prerogative (Armand Van Helden Remix)\"\r"
^17 - "\""
^43 + "\""
-215 - "# \"[[Do Somethin']]\"\r"
-215 + "# [[Do Somethin']]\r"
+216 - "# \"[[Do Somethin']]\"\r"
+216 + "# [[Do Somethin']]\r"
^2 - "\""
^18 - "\""
-216 - "# \"Do Somethin'\" (Thick Vocal Mix)\r"
-216 + "# \"Do Somethin' (Thick Vocal Mix)\"\r"
+217 - "# \"Do Somethin'\" (Thick Vocal Mix)\r"
+217 + "# \"Do Somethin' (Thick Vocal Mix)\"\r"
^15 - "\""
^33 + "\""
-217 - "# \"[[Someday (I Will Understand)]]\"\r"
-217 + "# [[Someday (I Will Understand)]]\r"
+218 - "# \"[[Someday (I Will Understand)]]\"\r"
+218 + "# [[Someday (I Will Understand)]]\r"
^2 - "\""
^33 - "\""
-219 - "# \"[[Gimme More]]\"\r"
-219 + "# [[Gimme More]]\r"
+220 - "# \"[[Gimme More]]\"\r"
+220 + "# [[Gimme More]]\r"
^2 - "\""
^16 - "\""
-220 - "# \"Gimme More\" (Paul Oakenfold Remix)\r"
-220 + "# \"Gimme More (Paul Oakenfold Remix)\"\r"
+221 - "# \"Gimme More\" (Paul Oakenfold Remix)\r"
+221 + "# \"Gimme More (Paul Oakenfold Remix)\"\r"
^13 - "\""
^36 + "\""
-221 - "# \"[[Piece of Me]]\"\r"
-221 + "# [[Piece of Me]]\r"
+222 - "# \"[[Piece of Me]]\"\r"
+222 + "# [[Piece of Me]]\r"
^2 - "\""
^17 - "\""
-222 - "# \"Piece of Me\" (Boz O Lo Remix)\r"
-222 + "# \"Piece of Me (Boz O Lo Remix)\"\r"
+223 - "# \"Piece of Me\" (Boz O Lo Remix)\r"
+223 + "# \"Piece of Me (Boz O Lo Remix)\"\r"
^14 - "\""
^31 + "\""
-223 - "# \"[[Break the Ice (Britney Spears song)|Break the Ice]]\"\r"
-223 + "# [[Break the Ice (Britney Spears song)|Break the Ice]]\r"
+224 - "# \"[[Break the Ice (Britney Spears song)|Break the Ice]]\"\r"
+224 + "# [[Break the Ice (Britney Spears song)|Break the Ice]]\r"
^2 - "\""
^55 - "\""
-225 - "# \"[[Womanizer (song)|Womanizer]]\"\r"
-225 + "# [[Womanizer (song)|Womanizer]]\r"
+226 - "# \"[[Womanizer (song)|Womanizer]]\"\r"
+226 + "# [[Womanizer (song)|Womanizer]]\r"
^2 - "\""
^32 - "\""
-226 - "# \"Womanizer\" (Kaskade Remix)\r"
-226 + "# \"Womanizer (Kaskade Remix)\"\r"
+227 - "# \"Womanizer\" (Kaskade Remix)\r"
+227 + "# \"Womanizer (Kaskade Remix)\"\r"
^12 - "\""
^28 + "\""
-227 - "# \"[[Circus (song)|Circus]]\"\r"
-227 + "# [[Circus (song)|Circus]]\r"
+228 - "# \"[[Circus (song)|Circus]]\"\r"
+228 + "# [[Circus (song)|Circus]]\r"
^2 - "\""
^26 - "\""
-228 - "# \"Circus\" (Tom Neville's Ringleader Remix)\r"
-228 + "# \"Circus (Tom Neville's Ringleader Remix)\"\r"
+229 - "# \"Circus\" (Tom Neville's Ringleader Remix)\r"
+229 + "# \"Circus (Tom Neville's Ringleader Remix)\"\r"
^9 - "\""
^42 + "\""
-229 - "# \"[[If U Seek Amy]]\"\r"
-229 + "# [[If U Seek Amy]]\r"
+230 - "# \"[[If U Seek Amy]]\"\r"
+230 + "# [[If U Seek Amy]]\r"
^2 - "\""
^19 - "\""
-230 - "# \"If U Seek Amy\" (Crookers Remix)\r"
-230 + "# \"If U Seek Amy (Crookers Remix)\"\r"
+231 - "# \"If U Seek Amy\" (Crookers Remix)\r"
+231 + "# \"If U Seek Amy (Crookers Remix)\"\r"
^16 - "\""
^33 + "\""
-231 - "# \"[[Radar (song)|Radar]]\"\r"
-231 + "# [[Radar (song)|Radar]]\r"
+232 - "# \"[[Radar (song)|Radar]]\"\r"
+232 + "# [[Radar (song)|Radar]]\r"
^2 - "\""
^24 - "\""
-232 - "# \"Radar\" (Bloodshy & Avant Remix)\r"
-232 + "# \"Radar (Bloodshy & Avant Remix)\"\r"
+233 - "# \"Radar\" (Bloodshy & Avant Remix)\r"
+233 + "# \"Radar (Bloodshy & Avant Remix)\"\r"
^8 - "\""
^33 + "\""
-233 - "# \"[[3 (song)|3]]\"\r"
-233 + "# [[3 (song)|3]]\r"
+234 - "# \"[[3 (song)|3]]\"\r"
+234 + "# [[3 (song)|3]]\r"
^2 - "\""
^16 - "\""
-234 - "# \"3\" (Groove Police Club Mix)\r"
-234 + "# \"3 (Groove Police Club Mix)\"\r"
+235 - "# \"3\" (Groove Police Club Mix)\r"
+235 + "# \"3 (Groove Police Club Mix)\"\r"
^4 - "\""
^29 + "\""