diff options
| author | Shulhan <ms@kilabit.info> | 2026-04-12 18:49:32 +0700 |
|---|---|---|
| committer | Shulhan <ms@kilabit.info> | 2026-04-12 20:29:02 +0700 |
| commit | 986ad438d702ebf7d2604def94eaf3e807be7cfd (patch) | |
| tree | 0eb80d956698bb8e440d9a17638bde7c41090d14 | |
| parent | c708197eceaee50d29801cff63124a146139e969 (diff) | |
| download | pakakeh.go-986ad438d702ebf7d2604def94eaf3e807be7cfd.tar.xz | |
text/diff: rewrite TestText to test Files with LevelWords
In the struct Data, we add new method WriteLineChunks to print the
LineChunks data into [io.Writer] w.
49 files changed, 993 insertions, 1393 deletions
diff --git a/lib/text/diff/diff.go b/lib/text/diff/diff.go index 0f2faac7..129a8d6d 100644 --- a/lib/text/diff/diff.go +++ b/lib/text/diff/diff.go @@ -7,6 +7,7 @@ package diff import ( "bytes" "fmt" + "io" "strings" ) @@ -233,6 +234,8 @@ func (diff *Data) PushChange(old, new Line) { if old.Num != new.Num { old.NumOther, new.NumOther = new.Num, old.Num } + old.Kind = LineKindDel + new.Kind = LineKindAdd change := LineChunk{ Old: old, New: new, @@ -290,6 +293,35 @@ func (diff Data) String() (s string) { return sb.String() } +// WriteLineChunks writes the formatted line changes and chunks differences +// into w. +// The format of output is, +// +// --- <OldName> +// +++ <NewName> +// --++ +// <LineChunk> +// ... +// +// The OldName and NewName is the file name being compared. +// See the [LineChunk.String] for the format of each LineChunk. +func (diff Data) WriteLineChunks(w io.Writer) (err error) { + if len(diff.LineChunks) == 0 { + return nil + } + logp := `WriteLineChunks` + fmt.Fprintf(w, "--- %s\n", diff.OldName) + fmt.Fprintf(w, "+++ %s\n", diff.OldName) + fmt.Fprintln(w, `--++`) + for _, lchunk := range diff.LineChunks { + _, err = w.Write([]byte(lchunk.String())) + if err != nil { + return fmt.Errorf(`%s: %w`, logp, err) + } + } + return nil +} + // findLine returns true if line is found in the beginning of text start at // line `startat`. // It also return line number of matching line. diff --git a/lib/text/diff/diff_test.go b/lib/text/diff/diff_test.go index c2be8cac..1c3c8479 100644 --- a/lib/text/diff/diff_test.go +++ b/lib/text/diff/diff_test.go @@ -5,7 +5,7 @@ package diff import ( "os" - "reflect" + "strings" "testing" libstrings "git.sr.ht/~shulhan/pakakeh.go/lib/strings" @@ -101,143 +101,121 @@ func TestBytesRatio(t *testing.T) { } } -func TestText(t *testing.T) { - t.Skip(`Unified output in progress`) - type testCase struct { - textBefore string - textAfter string - diffLevelLines string - diffLevelWords string - } - - var cases = []testCase{{ - textBefore: `testdata/List_of_United_Nations.old`, - textAfter: `testdata/List_of_United_Nations.new`, - diffLevelLines: `testdata/List_of_United_Nations_diff_LevelLines`, - diffLevelWords: `testdata/List_of_United_Nations_diff_LevelWords`, +func TestFiles_LevelWords(t *testing.T) { + listCase := []struct { + desc string + oldFile string + newFile string + exp string + }{{ + desc: `List_of_United_Nations`, + oldFile: `testdata/List_of_United_Nations.old`, + newFile: `testdata/List_of_United_Nations.new`, + // No changes on chunk level. }, { - textBefore: `testdata/List_of_United_Nations.new`, - textAfter: `testdata/List_of_United_Nations.old`, - diffLevelLines: `testdata/List_of_United_Nations_diff_LevelLines_reverse`, - diffLevelWords: `testdata/List_of_United_Nations_diff_LevelWords_reverse`, + desc: `List_of_United_Nations.reverse`, + oldFile: `testdata/List_of_United_Nations.new`, + newFile: `testdata/List_of_United_Nations.old`, + // No changes on chunk level. }, { - textBefore: `testdata/Psusennes_II.old`, - textAfter: `testdata/Psusennes_II.new`, - diffLevelLines: `testdata/Psusennes_II_diff_LevelLines`, - diffLevelWords: `testdata/Psusennes_II_diff_LevelWords`, + desc: `Psusennes_II`, + oldFile: `testdata/Psusennes_II.old`, + newFile: `testdata/Psusennes_II.new`, + exp: `testdata/Psusennes_II.chunks`, }, { - textBefore: `testdata/Psusennes_II.new`, - textAfter: `testdata/Psusennes_II.old`, - diffLevelLines: `testdata/Psusennes_II_diff_LevelLines_reverse`, - diffLevelWords: `testdata/Psusennes_II_diff_LevelWords_reverse`, + desc: `Psusennes_II.reverse`, + oldFile: `testdata/Psusennes_II.new`, + newFile: `testdata/Psusennes_II.old`, + exp: `testdata/Psusennes_II.reverse.chunks`, }, { - textBefore: `testdata/Top_Gear_Series_14.old`, - textAfter: `testdata/Top_Gear_Series_14.new`, - diffLevelLines: `testdata/Top_Gear_Series_14_diff_LevelLines`, - diffLevelWords: `testdata/Top_Gear_Series_14_diff_LevelWords`, + desc: `Top_Gear_Series_14`, + oldFile: `testdata/Top_Gear_Series_14.old`, + newFile: `testdata/Top_Gear_Series_14.new`, + exp: `testdata/Top_Gear_Series_14.chunks`, }, { - textBefore: `testdata/Top_Gear_Series_14.new`, - textAfter: `testdata/Top_Gear_Series_14.old`, - diffLevelLines: `testdata/Top_Gear_Series_14_diff_LevelLines_reverse`, - diffLevelWords: `testdata/Top_Gear_Series_14_diff_LevelWords_reverse`, + desc: `Top_Gear_Series_14.reverse`, + oldFile: `testdata/Top_Gear_Series_14.new`, + newFile: `testdata/Top_Gear_Series_14.old`, + exp: `testdata/Top_Gear_Series_14.reverse.chunks`, }, { - textBefore: `testdata/empty3lines.txt`, - textAfter: `testdata/empty5lines.txt`, - diffLevelLines: `testdata/empty_lines_diff_LevelLines`, - diffLevelWords: `testdata/empty_lines_diff_LevelWords`, + desc: `empty_lines`, + oldFile: `testdata/empty3lines.txt`, + newFile: `testdata/empty5lines.txt`, + exp: `testdata/empty_lines.chunks`, }, { - textBefore: `testdata/empty5lines.txt`, - textAfter: `testdata/empty3lines.txt`, - diffLevelLines: `testdata/empty_lines_diff_LevelLines_reverse`, - diffLevelWords: `testdata/empty_lines_diff_LevelWords_reverse`, + desc: `empty_lines.reverse`, + oldFile: `testdata/empty5lines.txt`, + newFile: `testdata/empty3lines.txt`, + exp: `testdata/empty_lines.reverse.chunks`, }, { - textBefore: `testdata/peeps.old`, - textAfter: `testdata/peeps.new`, - diffLevelLines: `testdata/peeps_diff_LevelLines`, - diffLevelWords: `testdata/peeps_diff_LevelWords`, + desc: `peeps`, + oldFile: `testdata/peeps.old`, + newFile: `testdata/peeps.new`, + exp: `testdata/peeps.chunks`, }, { - textBefore: `testdata/peeps.new`, - textAfter: `testdata/peeps.old`, - diffLevelLines: `testdata/peeps_diff_LevelLines_reverse`, - diffLevelWords: `testdata/peeps_diff_LevelWords_reverse`, + desc: `peeps.reverse`, + oldFile: `testdata/peeps.new`, + newFile: `testdata/peeps.old`, + exp: `testdata/peeps.reverse.chunks`, }, { - textBefore: `testdata/text01.old`, - textAfter: `testdata/text01.new`, - diffLevelLines: `testdata/text01_diff_LevelLines`, - diffLevelWords: `testdata/text01_diff_LevelWords`, + desc: `text01`, + oldFile: `testdata/text01.old`, + newFile: `testdata/text01.new`, + exp: `testdata/text01.chunks`, }, { - textBefore: `testdata/text01.new`, - textAfter: `testdata/text01.old`, - diffLevelLines: `testdata/text01_diff_LevelLines_reverse`, - diffLevelWords: `testdata/text01_diff_LevelWords_reverse`, + desc: `text01.reverse`, + oldFile: `testdata/text01.new`, + newFile: `testdata/text01.old`, + exp: `testdata/text01.reverse.chunks`, }, { - textBefore: `testdata/text02.old`, - textAfter: `testdata/text02.new`, - diffLevelLines: `testdata/text02_diff_LevelLines`, - diffLevelWords: `testdata/text02_diff_LevelWords`, + desc: `text02`, + oldFile: `testdata/text02.old`, + newFile: `testdata/text02.new`, + exp: `testdata/text02.chunks`, }, { - textBefore: `testdata/text02.new`, - textAfter: `testdata/text02.old`, - diffLevelLines: `testdata/text02_diff_LevelLines_reverse`, - diffLevelWords: `testdata/text02_diff_LevelWords_reverse`, + desc: `text02.reverse`, + oldFile: `testdata/text02.new`, + newFile: `testdata/text02.old`, + exp: `testdata/text02.reverse.chunks`, }, { - textBefore: `testdata/the_singles_collection.old`, - textAfter: `testdata/the_singles_collection.new`, - diffLevelLines: `testdata/the_singles_collection_diff_LevelLines`, - diffLevelWords: `testdata/the_singles_collection_diff_LevelWords`, + desc: `the_singles_collection`, + oldFile: `testdata/the_singles_collection.old`, + newFile: `testdata/the_singles_collection.new`, + exp: `testdata/the_singles_collection.chunks`, }, { - textBefore: `testdata/the_singles_collection.new`, - textAfter: `testdata/the_singles_collection.old`, - diffLevelLines: `testdata/the_singles_collection_diff_LevelLines_reverse`, - diffLevelWords: `testdata/the_singles_collection_diff_LevelWords_reverse`, + desc: `the_singles_collection.reverse`, + oldFile: `testdata/the_singles_collection.new`, + newFile: `testdata/the_singles_collection.old`, + exp: `testdata/the_singles_collection.reverse.chunks`, }} - var ( - c testCase - got string - expStr string - err error - before []byte - after []byte - exp []byte - ) - - for _, c = range cases { - before, err = os.ReadFile(c.textBefore) + var sb strings.Builder + for _, tc := range listCase { + diff, err := Files(tc.oldFile, tc.newFile, LevelWords) if err != nil { - t.Fatal(err) + t.Fatalf(`%s: %s`, tc.desc, err) } - after, err = os.ReadFile(c.textAfter) + sb.Reset() + err = diff.WriteLineChunks(&sb) if err != nil { - t.Fatal(err) + t.Fatalf(`%s: %s`, tc.desc, err) } + got := sb.String() - diff := Text(before, after, LevelLines) - got = diff.String() - - exp, err = os.ReadFile(c.diffLevelLines) - if err != nil { - t.Fatal(err) - } - - expStr = string(exp) - if !reflect.DeepEqual(expStr, got) { - t.Fatalf("%s not matched:\n<<< want:\n%s\n<<< got:\n%s", - c.diffLevelLines, expStr, got) - } - - diff = Text(before, after, LevelWords) - got = diff.String() - - exp, err = os.ReadFile(c.diffLevelWords) - if err != nil { - t.Fatal(err) + var exp string + if tc.exp != `` { + expb, err := os.ReadFile(tc.exp) + if err != nil { + t.Fatalf(`%s: %s`, tc.desc, err) + } + exp = string(expb) } - expStr = string(exp) - if !reflect.DeepEqual(expStr, got) { - t.Fatalf("%s not matched:\n<<< want:\n%s\n<<< got:\n%s", - c.diffLevelWords, expStr, got) + if exp != got { + os.WriteFile(tc.exp, []byte(got), 0600) + t.Errorf("<<< want:\n%s\n", exp) + t.Errorf("<<< got:\n%s\n", got) + t.Fatalf(`%s: not matched`, tc.desc) } } } diff --git a/lib/text/diff/line_chunk.go b/lib/text/diff/line_chunk.go index 16145883..0da7717d 100644 --- a/lib/text/diff/line_chunk.go +++ b/lib/text/diff/line_chunk.go @@ -26,14 +26,14 @@ type LineChunk struct { // // <OldLine> // <NewLine> -// <StartAt>: <Kind><QuotedVal> +// ^<StartAt> <Kind> <QuotedVal> // -// The OldLine and NewLine print the line being compared, following the format +// The OldLine and NewLine print the line being compared, using the format // from [Line.String]. -// The StartAt print the beginning position where characters differences found -// between old and new line. +// The StartAt print the beginning position where changes found between old +// and new line. // The Kind print '-' for deletion or '+' for deletion. -// The QuoteVal print the string difference. +// The QuoteVal print the string difference in double quote. func (lchunk LineChunk) String() string { var sb strings.Builder @@ -43,10 +43,10 @@ func (lchunk LineChunk) String() string { sb.WriteByte('\n') for _, chunk := range lchunk.Dels { - fmt.Fprintf(&sb, "^%-4d: -%q\n", chunk.StartAt, chunk.V) + fmt.Fprintf(&sb, "^%-4d - %q\n", chunk.StartAt, chunk.V) } for _, chunk := range lchunk.Adds { - fmt.Fprintf(&sb, "^%-4d: +%q\n", chunk.StartAt, chunk.V) + fmt.Fprintf(&sb, "^%-4d + %q\n", chunk.StartAt, chunk.V) } return sb.String() } diff --git a/lib/text/diff/testdata/List_of_United_Nations_diff_LevelLines b/lib/text/diff/testdata/List_of_United_Nations_diff_LevelLines deleted file mode 100644 index b521d459..00000000 --- a/lib/text/diff/testdata/List_of_United_Nations_diff_LevelLines +++ /dev/null @@ -1,13 +0,0 @@ ----- -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" -++++ -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 deleted file mode 100644 index 214d0290..00000000 --- a/lib/text/diff/testdata/List_of_United_Nations_diff_LevelLines_reverse +++ /dev/null @@ -1,13 +0,0 @@ ----- -268 - "==References==\r" -269 - "{{reflist}}\r" -270 - "\r" -271 - "" -++++ -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 deleted file mode 100644 index b521d459..00000000 --- a/lib/text/diff/testdata/List_of_United_Nations_diff_LevelWords +++ /dev/null @@ -1,13 +0,0 @@ ----- -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" -++++ -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 deleted file mode 100644 index 214d0290..00000000 --- a/lib/text/diff/testdata/List_of_United_Nations_diff_LevelWords_reverse +++ /dev/null @@ -1,13 +0,0 @@ ----- -268 - "==References==\r" -269 - "{{reflist}}\r" -270 - "\r" -271 - "" -++++ -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.chunks b/lib/text/diff/testdata/Psusennes_II.chunks new file mode 100644 index 00000000..df2f2e70 --- /dev/null +++ b/lib/text/diff/testdata/Psusennes_II.chunks @@ -0,0 +1,206 @@ +--- testdata/Psusennes_II.old ++++ testdata/Psusennes_II.old +--++ + 1/ 1: -"{{Pharaoh Infobox | \r" + 1/ 1: +"{{Infobox pharaoh\r" +^2 - "Pharaoh " +^10 - "| " +^10 + "pharaoh" + 2/ 2: -" Name= Psusennes II | \r" + 2/ 2: +"| Name= Psusennes II \r" +^0 - " " +^3 - " " +^21 - " |" +^0 + "| " + 3/ 3: -" Alt= Pasebakhaenniut II<ref>[http://www.digitalegypt.ucl.ac.uk/chronology/psusennesii.html Pasebakhenniut II]</ref> |\r" + 3/ 3: +"| Alt= Pasebakhaenniut II<ref>[http://www.digitalegypt.ucl.ac.uk/chronology/psusennesii.html Pasebakhenniut II]</ref> \r" +^0 - " " +^3 - " " +^119 - "|" +^0 + "| " + 4/ 4: -" Image= |\r" + 4/ 4: +"| Image= \r" +^0 - " " +^3 - " " +^10 - "|" +^0 + "| " + 5/ 5: -" NomenHiero= <hiero>M17-Y5:N35:U7-G40-N14*N28-N35:O49</hiero>|\r" + 5/ 5: +"| NomenHiero= <hiero>M17-Y5:N35:U7-G40-N14*N28-N35:O49</hiero>\r" +^0 - " " +^3 - " " +^63 - "|" +^0 + "| " + 6/ 6: -" Nomen=''Hor-Pasebakhaenniut''|\r" + 6/ 6: +"| Nomen=''Hor-Pasebakhaenniut''\r" +^0 - " " +^3 - " " +^32 - "|" +^0 + "| " + 7/ 7: -" PrenomenHiero= <hiero>ra:D17-xpr-Z3-stp:n-ra</hiero>|\r" + 7/ 7: +"| PrenomenHiero= <hiero>ra:D17-xpr-Z3-stp:n-ra</hiero>\r" +^0 - " " +^3 - " " +^55 - "|" +^0 + "| " + 8/ 8: -"Prenomen=''Titkheperure/Tyetkheperre''|\r" + 8/ 8: +"|Prenomen=''Titkheperure/Tyetkheperre''\r" +^38 - "|" +^0 + "|" + 9/ 9: -" Golden= |\r" + 9/ 9: +"| Golden= \r" +^0 - " " +^3 - " " +^11 - "|" +^0 + "| " + 10/ 10: -" Nebty= |\r" + 10/ 10: +"| Nebty= \r" +^0 - " " +^3 - " " +^10 - "|" +^0 + "| " + 11/ 11: -" Horus= |\r" + 11/ 11: +"| Horus= \r" +^0 - " " +^3 - " " +^10 - "|" +^0 + "| " + 12/ 12: -" GoldenHiero= | \r" + 12/ 12: +"| GoldenHiero= \r" +^0 - " " +^3 - " " +^15 - " |" +^0 + "| " + 13/ 13: -" NebtyHiero= |\r" + 13/ 13: +"| NebtyHiero= \r" +^0 - " " +^3 - " " +^16 - "|" +^0 + "| " + 14/ 14: -" HorusHiero= |\r" + 14/ 14: +"| HorusHiero= \r" +^0 - " " +^3 - " " +^15 - "|" +^0 + "| " + 15/ 15: -" Reign=967 – 943 BC | \r" + 15/ 15: +"| Reign=967 – 943 BC \r" +^0 - " " +^3 - " " +^27 - " |" +^0 + "| " + 16/ 16: -" Predecessor= [[Siamun]] |\r" + 16/ 16: +"| Predecessor= [[Siamun]] \r" +^0 - " " +^3 - " " +^27 - "|" +^0 + "| " + 17/ 17: -" Successor= [[Shoshenq I]] |\r" + 17/ 17: +"| Successor= [[Shoshenq I]] \r" +^0 - " " +^3 - " " +^29 - "|" +^0 + "| " + 18/ 18: -" Spouse= |\r" + 18/ 18: +"| Spouse= \r" +^0 - " " +^3 - " " +^11 - "|" +^0 + "| " + 19/ 19: -" Children= [[Maatkare (daughter of Psusennes II)|Maatkare]] |\r" + 19/ 19: +"| Children= [[Maatkare (daughter of Psusennes II)|Maatkare]] \r" +^0 - " " +^3 - " " +^62 - "|" +^0 + "| " + 20/ 20: -" Dynasty= [[Twenty-first dynasty of Egypt|21st Dynasty]] |\r" + 20/ 20: +"| Dynasty= [[Twenty-first dynasty of Egypt|21st Dynasty]] \r" +^0 - " " +^60 - "|" +^0 + "|" + 21/ 21: -" Father= |\r" + 21/ 21: +"| Father= \r" +^0 - " " +^3 - " " +^11 - "|" +^0 + "| " + 22/ 22: -" Mother= |\r" + 22/ 22: +"| Mother= \r" +^0 - " " +^3 - " " +^11 - "|" +^0 + "| " + 23/ 23: -" Died= [[943 BC]] |\r" + 23/ 23: +"| Died= [[943 BC]] \r" +^0 - " " +^3 - " " +^20 - "|" +^0 + "| " + 24/ 24: -" Burial= Unknown |\r" + 24/ 24: +"| Burial= Unknown \r" +^0 - " " +^3 - " " +^19 - "|" +^0 + "| " + 25/ 25: -" Monuments= |\r" + 25/ 25: +"| Monuments=\r" +^0 - " " +^3 - " " +^13 - " |" +^0 + "| " + 30/ 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 – one referring to Psusennes II and the other to [[Shoshenq I]] – 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/ 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 – one referring to Psusennes II and the other to [[Shoshenq I]] – 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\"" + 32/ 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/ 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 - ">" +^1153 - "</ref" +^672 + " name=\"Payraudeau, BIFAO 108, p.294\"" +^895 + "—" +^919 + "—" +^1126 + " name=\"" +^1161 + "\"/" + 37/ 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/ 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 - "-" +^1610 - "--" +^1849 - "--" +^388 + " name=\"Kitchen, p.290\"" +^947 + " name=\"" +^968 + "\"/" +^1263 + "–" +^1615 + "—" +^1855 + "—" + 39/ 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/ 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 + "—" + 41/ 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/ 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" +^322 + "—" +^2081 + " name=\"Krauss, DE 62, pp.43-48\"" +^2380 + " name=\"" +^2410 + "\"/" + 44/ 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/ 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 - "--" +^701 - ">" +^716 - "</ref" +^1030 - "--" +^134 + "—" +^562 + "—" +^618 + "—" +^704 + " name=\"" +^725 + "\"/" +^1036 + "—" + 51/ 51: -"* Aidan Dodson, RdE 38(1987), pp.50-51.\r" + 51/ 51: +"* Aidan Dodson, RdE 38(1987), pp. 50-51.\r" +^33 + " " diff --git a/lib/text/diff/testdata/Psusennes_II.reverse.chunks b/lib/text/diff/testdata/Psusennes_II.reverse.chunks new file mode 100644 index 00000000..f6685736 --- /dev/null +++ b/lib/text/diff/testdata/Psusennes_II.reverse.chunks @@ -0,0 +1,207 @@ +--- testdata/Psusennes_II.new ++++ testdata/Psusennes_II.new +--++ + 1/ 1: -"{{Infobox pharaoh\r" + 1/ 1: +"{{Pharaoh Infobox | \r" +^10 - "pharaoh" +^2 + "Pharaoh " +^10 + "| " + 2/ 2: -"| Name= Psusennes II \r" + 2/ 2: +" Name= Psusennes II | \r" +^0 - "| " +^0 + " " +^3 + " " +^20 + " |" + 3/ 3: -"| Alt= Pasebakhaenniut II<ref>[http://www.digitalegypt.ucl.ac.uk/chronology/psusennesii.html Pasebakhenniut II]</ref> \r" + 3/ 3: +" Alt= Pasebakhaenniut II<ref>[http://www.digitalegypt.ucl.ac.uk/chronology/psusennesii.html Pasebakhenniut II]</ref> |\r" +^0 - "| " +^0 + " " +^3 + " " +^118 + "|" + 4/ 4: -"| Image= \r" + 4/ 4: +" Image= |\r" +^0 - "| " +^0 + " " +^3 + " " +^9 + "|" + 5/ 5: -"| NomenHiero= <hiero>M17-Y5:N35:U7-G40-N14*N28-N35:O49</hiero>\r" + 5/ 5: +" NomenHiero= <hiero>M17-Y5:N35:U7-G40-N14*N28-N35:O49</hiero>|\r" +^0 - "| " +^0 + " " +^3 + " " +^62 + "|" + 6/ 6: -"| Nomen=''Hor-Pasebakhaenniut''\r" + 6/ 6: +" Nomen=''Hor-Pasebakhaenniut''|\r" +^0 - "| " +^0 + " " +^3 + " " +^31 + "|" + 7/ 7: -"| PrenomenHiero= <hiero>ra:D17-xpr-Z3-stp:n-ra</hiero>\r" + 7/ 7: +" PrenomenHiero= <hiero>ra:D17-xpr-Z3-stp:n-ra</hiero>|\r" +^0 - "| " +^0 + " " +^3 + " " +^54 + "|" + 8/ 8: -"|Prenomen=''Titkheperure/Tyetkheperre''\r" + 8/ 8: +"Prenomen=''Titkheperure/Tyetkheperre''|\r" +^0 - "|" +^38 + "|" + 9/ 9: -"| Golden= \r" + 9/ 9: +" Golden= |\r" +^0 - "| " +^0 + " " +^3 + " " +^10 + "|" + 10/ 10: -"| Nebty= \r" + 10/ 10: +" Nebty= |\r" +^0 - "| " +^0 + " " +^3 + " " +^9 + "|" + 11/ 11: -"| Horus= \r" + 11/ 11: +" Horus= |\r" +^0 - "| " +^0 + " " +^3 + " " +^9 + "|" + 12/ 12: -"| GoldenHiero= \r" + 12/ 12: +" GoldenHiero= | \r" +^0 - "| " +^0 + " " +^3 + " " +^14 + " |" + 13/ 13: -"| NebtyHiero= \r" + 13/ 13: +" NebtyHiero= |\r" +^0 - "| " +^0 + " " +^3 + " " +^15 + "|" + 14/ 14: -"| HorusHiero= \r" + 14/ 14: +" HorusHiero= |\r" +^0 - "| " +^0 + " " +^3 + " " +^14 + "|" + 15/ 15: -"| Reign=967 – 943 BC \r" + 15/ 15: +" Reign=967 – 943 BC | \r" +^0 - "| " +^0 + " " +^3 + " " +^26 + " |" + 16/ 16: -"| Predecessor= [[Siamun]] \r" + 16/ 16: +" Predecessor= [[Siamun]] |\r" +^0 - "| " +^0 + " " +^3 + " " +^26 + "|" + 17/ 17: -"| Successor= [[Shoshenq I]] \r" + 17/ 17: +" Successor= [[Shoshenq I]] |\r" +^0 - "| " +^0 + " " +^3 + " " +^28 + "|" + 18/ 18: -"| Spouse= \r" + 18/ 18: +" Spouse= |\r" +^0 - "| " +^0 + " " +^3 + " " +^10 + "|" + 19/ 19: -"| Children= [[Maatkare (daughter of Psusennes II)|Maatkare]] \r" + 19/ 19: +" Children= [[Maatkare (daughter of Psusennes II)|Maatkare]] |\r" +^0 - "| " +^0 + " " +^3 + " " +^61 + "|" + 20/ 20: -"| Dynasty= [[Twenty-first dynasty of Egypt|21st Dynasty]] \r" + 20/ 20: +" Dynasty= [[Twenty-first dynasty of Egypt|21st Dynasty]] |\r" +^0 - "|" +^0 + " " +^58 + "|" + 21/ 21: -"| Father= \r" + 21/ 21: +" Father= |\r" +^0 - "| " +^0 + " " +^3 + " " +^10 + "|" + 22/ 22: -"| Mother= \r" + 22/ 22: +" Mother= |\r" +^0 - "| " +^0 + " " +^3 + " " +^10 + "|" + 23/ 23: -"| Died= [[943 BC]] \r" + 23/ 23: +" Died= [[943 BC]] |\r" +^0 - "| " +^0 + " " +^3 + " " +^19 + "|" + 24/ 24: -"| Burial= Unknown \r" + 24/ 24: +" Burial= Unknown |\r" +^0 - "| " +^0 + " " +^3 + " " +^18 + "|" + 25/ 25: -"| Monuments=\r" + 25/ 25: +" Monuments= |\r" +^0 - "| " +^0 + " " +^3 + " " +^12 + " |" + 30/ 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 – one referring to Psusennes II and the other to [[Shoshenq I]] – 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/ 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 – one referring to Psusennes II and the other to [[Shoshenq I]] – 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\"" + 32/ 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/ 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 - "—" +^1126 - " name=\"" +^1161 - "\"/" +^895 + "--" +^918 + "--" +^1124 + ">" +^1153 + "</ref" + 37/ 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/ 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 - "\"/" +^1030 - "–" +^1382 - "—" +^1622 - "—" +^388 + ">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" +^714 + ">" +^729 + "</ref" +^1027 + "-" +^1377 + "--" +^1616 + "--" + 39/ 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/ 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 + "--" + 41/ 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/ 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=\"" +^2410 - "\"/" +^322 + "--" +^2379 + ">" +^2403 + "</ref" + 44/ 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/ 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 - "—" +^704 - " name=\"" +^725 - "\"/" +^1036 - "—" +^134 + "--" +^561 + "--" +^616 + "--" +^701 + ">" +^716 + "</ref" +^1030 + "--" + 51/ 51: -"* Aidan Dodson, RdE 38(1987), pp. 50-51.\r" + 51/ 51: +"* Aidan Dodson, RdE 38(1987), pp.50-51.\r" +^33 - " " diff --git a/lib/text/diff/testdata/Psusennes_II_diff_LevelLines b/lib/text/diff/testdata/Psusennes_II_diff_LevelLines deleted file mode 100644 index bd078304..00000000 --- a/lib/text/diff/testdata/Psusennes_II_diff_LevelLines +++ /dev/null @@ -1,67 +0,0 @@ -++++ -54 + "{{DEFAULTSORT:Psusennes Ii}}\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 – 943 BC | \r" -15 + "| Reign=967 – 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 – one referring to Psusennes II and the other to [[Shoshenq I]] – 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 – one referring to Psusennes II and the other to [[Shoshenq I]] – 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. 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 deleted file mode 100644 index 1444e683..00000000 --- a/lib/text/diff/testdata/Psusennes_II_diff_LevelLines_reverse +++ /dev/null @@ -1,67 +0,0 @@ ----- -54 - "{{DEFAULTSORT:Psusennes Ii}}\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 – 943 BC \r" -15 + " Reign=967 – 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 – one referring to Psusennes II and the other to [[Shoshenq I]] – 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 – one referring to Psusennes II and the other to [[Shoshenq I]] – 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. 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 deleted file mode 100644 index 6752360b..00000000 --- a/lib/text/diff/testdata/Psusennes_II_diff_LevelWords +++ /dev/null @@ -1,206 +0,0 @@ -++++ -54 + "{{DEFAULTSORT:Psusennes Ii}}\r" ---++ -1 - "{{Pharaoh Infobox | \r" -1 + "{{Infobox pharaoh\r" -^2 - "Pharaoh " -^10 - "| " -^10 + "pharaoh" -2 - " Name= Psusennes II | \r" -2 + "| Name= Psusennes II \r" -^0 - " " -^3 - " " -^21 - " |" -^0 + "| " -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 + "| " -4 - " Image= |\r" -4 + "| Image= \r" -^0 - " " -^3 - " " -^10 - "|" -^0 + "| " -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 + "| " -6 - " Nomen=''Hor-Pasebakhaenniut''|\r" -6 + "| Nomen=''Hor-Pasebakhaenniut''\r" -^0 - " " -^3 - " " -^32 - "|" -^0 + "| " -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 + "| " -8 - "Prenomen=''Titkheperure/Tyetkheperre''|\r" -8 + "|Prenomen=''Titkheperure/Tyetkheperre''\r" -^38 - "|" -^0 + "|" -9 - " Golden= |\r" -9 + "| Golden= \r" -^0 - " " -^3 - " " -^11 - "|" -^0 + "| " -10 - " Nebty= |\r" -10 + "| Nebty= \r" -^0 - " " -^3 - " " -^10 - "|" -^0 + "| " -11 - " Horus= |\r" -11 + "| Horus= \r" -^0 - " " -^3 - " " -^10 - "|" -^0 + "| " -12 - " GoldenHiero= | \r" -12 + "| GoldenHiero= \r" -^0 - " " -^3 - " " -^15 - " |" -^0 + "| " -13 - " NebtyHiero= |\r" -13 + "| NebtyHiero= \r" -^0 - " " -^3 - " " -^16 - "|" -^0 + "| " -14 - " HorusHiero= |\r" -14 + "| HorusHiero= \r" -^0 - " " -^3 - " " -^15 - "|" -^0 + "| " -15 - " Reign=967 – 943 BC | \r" -15 + "| Reign=967 – 943 BC \r" -^0 - " " -^3 - " " -^27 - " |" -^0 + "| " -16 - " Predecessor= [[Siamun]] |\r" -16 + "| Predecessor= [[Siamun]] \r" -^0 - " " -^3 - " " -^27 - "|" -^0 + "| " -17 - " Successor= [[Shoshenq I]] |\r" -17 + "| Successor= [[Shoshenq I]] \r" -^0 - " " -^3 - " " -^29 - "|" -^0 + "| " -18 - " Spouse= |\r" -18 + "| Spouse= \r" -^0 - " " -^3 - " " -^11 - "|" -^0 + "| " -19 - " Children= [[Maatkare (daughter of Psusennes II)|Maatkare]] |\r" -19 + "| Children= [[Maatkare (daughter of Psusennes II)|Maatkare]] \r" -^0 - " " -^3 - " " -^62 - "|" -^0 + "| " -20 - " Dynasty= [[Twenty-first dynasty of Egypt|21st Dynasty]] |\r" -20 + "| Dynasty= [[Twenty-first dynasty of Egypt|21st Dynasty]] \r" -^0 - " " -^60 - "|" -^0 + "|" -21 - " Father= |\r" -21 + "| Father= \r" -^0 - " " -^3 - " " -^11 - "|" -^0 + "| " -22 - " Mother= |\r" -22 + "| Mother= \r" -^0 - " " -^3 - " " -^11 - "|" -^0 + "| " -23 - " Died= [[943 BC]] |\r" -23 + "| Died= [[943 BC]] \r" -^0 - " " -^3 - " " -^20 - "|" -^0 + "| " -24 - " Burial= Unknown |\r" -24 + "| Burial= Unknown \r" -^0 - " " -^3 - " " -^19 - "|" -^0 + "| " -25 - " Monuments= |\r" -25 + "| Monuments=\r" -^0 - " " -^3 - " " -^13 - " |" -^0 + "| " -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 – one referring to Psusennes II and the other to [[Shoshenq I]] – 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 – one referring to Psusennes II and the other to [[Shoshenq I]] – 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\"" -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 - ">" -^1153 - "</ref" -^672 + " name=\"Payraudeau, BIFAO 108, p.294\"" -^895 + "—" -^919 + "—" -^1126 + " name=\"" -^1161 + "\"/" -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 - "-" -^1610 - "--" -^1849 - "--" -^388 + " name=\"Kitchen, p.290\"" -^947 + " name=\"" -^968 + "\"/" -^1263 + "–" -^1615 + "—" -^1855 + "—" -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 + "—" -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" -^322 + "—" -^2081 + " name=\"Krauss, DE 62, pp.43-48\"" -^2380 + " name=\"" -^2410 + "\"/" -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 - "--" -^701 - ">" -^716 - "</ref" -^1030 - "--" -^134 + "—" -^562 + "—" -^618 + "—" -^704 + " name=\"" -^725 + "\"/" -^1036 + "—" -51 - "* Aidan Dodson, RdE 38(1987), pp.50-51.\r" -51 + "* Aidan Dodson, RdE 38(1987), pp. 50-51.\r" -^33 + " " diff --git a/lib/text/diff/testdata/Psusennes_II_diff_LevelWords_reverse b/lib/text/diff/testdata/Psusennes_II_diff_LevelWords_reverse deleted file mode 100644 index 4b7c023d..00000000 --- a/lib/text/diff/testdata/Psusennes_II_diff_LevelWords_reverse +++ /dev/null @@ -1,207 +0,0 @@ ----- -54 - "{{DEFAULTSORT:Psusennes Ii}}\r" ---++ -1 - "{{Infobox pharaoh\r" -1 + "{{Pharaoh Infobox | \r" -^10 - "pharaoh" -^2 + "Pharaoh " -^10 + "| " -2 - "| Name= Psusennes II \r" -2 + " Name= Psusennes II | \r" -^0 - "| " -^0 + " " -^3 + " " -^20 + " |" -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 + "|" -4 - "| Image= \r" -4 + " Image= |\r" -^0 - "| " -^0 + " " -^3 + " " -^9 + "|" -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 + "|" -6 - "| Nomen=''Hor-Pasebakhaenniut''\r" -6 + " Nomen=''Hor-Pasebakhaenniut''|\r" -^0 - "| " -^0 + " " -^3 + " " -^31 + "|" -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 + "|" -8 - "|Prenomen=''Titkheperure/Tyetkheperre''\r" -8 + "Prenomen=''Titkheperure/Tyetkheperre''|\r" -^0 - "|" -^38 + "|" -9 - "| Golden= \r" -9 + " Golden= |\r" -^0 - "| " -^0 + " " -^3 + " " -^10 + "|" -10 - "| Nebty= \r" -10 + " Nebty= |\r" -^0 - "| " -^0 + " " -^3 + " " -^9 + "|" -11 - "| Horus= \r" -11 + " Horus= |\r" -^0 - "| " -^0 + " " -^3 + " " -^9 + "|" -12 - "| GoldenHiero= \r" -12 + " GoldenHiero= | \r" -^0 - "| " -^0 + " " -^3 + " " -^14 + " |" -13 - "| NebtyHiero= \r" -13 + " NebtyHiero= |\r" -^0 - "| " -^0 + " " -^3 + " " -^15 + "|" -14 - "| HorusHiero= \r" -14 + " HorusHiero= |\r" -^0 - "| " -^0 + " " -^3 + " " -^14 + "|" -15 - "| Reign=967 – 943 BC \r" -15 + " Reign=967 – 943 BC | \r" -^0 - "| " -^0 + " " -^3 + " " -^26 + " |" -16 - "| Predecessor= [[Siamun]] \r" -16 + " Predecessor= [[Siamun]] |\r" -^0 - "| " -^0 + " " -^3 + " " -^26 + "|" -17 - "| Successor= [[Shoshenq I]] \r" -17 + " Successor= [[Shoshenq I]] |\r" -^0 - "| " -^0 + " " -^3 + " " -^28 + "|" -18 - "| Spouse= \r" -18 + " Spouse= |\r" -^0 - "| " -^0 + " " -^3 + " " -^10 + "|" -19 - "| Children= [[Maatkare (daughter of Psusennes II)|Maatkare]] \r" -19 + " Children= [[Maatkare (daughter of Psusennes II)|Maatkare]] |\r" -^0 - "| " -^0 + " " -^3 + " " -^61 + "|" -20 - "| Dynasty= [[Twenty-first dynasty of Egypt|21st Dynasty]] \r" -20 + " Dynasty= [[Twenty-first dynasty of Egypt|21st Dynasty]] |\r" -^0 - "|" -^0 + " " -^58 + "|" -21 - "| Father= \r" -21 + " Father= |\r" -^0 - "| " -^0 + " " -^3 + " " -^10 + "|" -22 - "| Mother= \r" -22 + " Mother= |\r" -^0 - "| " -^0 + " " -^3 + " " -^10 + "|" -23 - "| Died= [[943 BC]] \r" -23 + " Died= [[943 BC]] |\r" -^0 - "| " -^0 + " " -^3 + " " -^19 + "|" -24 - "| Burial= Unknown \r" -24 + " Burial= Unknown |\r" -^0 - "| " -^0 + " " -^3 + " " -^18 + "|" -25 - "| Monuments=\r" -25 + " Monuments= |\r" -^0 - "| " -^0 + " " -^3 + " " -^12 + " |" -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 – one referring to Psusennes II and the other to [[Shoshenq I]] – 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 – one referring to Psusennes II and the other to [[Shoshenq I]] – 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\"" -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 - "—" -^1126 - " name=\"" -^1161 - "\"/" -^895 + "--" -^918 + "--" -^1124 + ">" -^1153 + "</ref" -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 - "\"/" -^1030 - "–" -^1382 - "—" -^1622 - "—" -^388 + ">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" -^714 + ">" -^729 + "</ref" -^1027 + "-" -^1377 + "--" -^1616 + "--" -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 + "--" -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=\"" -^2410 - "\"/" -^322 + "--" -^2379 + ">" -^2403 + "</ref" -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 - "—" -^704 - " name=\"" -^725 - "\"/" -^1036 - "—" -^134 + "--" -^561 + "--" -^616 + "--" -^701 + ">" -^716 + "</ref" -^1030 + "--" -51 - "* Aidan Dodson, RdE 38(1987), pp. 50-51.\r" -51 + "* Aidan Dodson, RdE 38(1987), pp.50-51.\r" -^33 - " " diff --git a/lib/text/diff/testdata/Top_Gear_Series_14.chunks b/lib/text/diff/testdata/Top_Gear_Series_14.chunks new file mode 100644 index 00000000..be17010f --- /dev/null +++ b/lib/text/diff/testdata/Top_Gear_Series_14.chunks @@ -0,0 +1,7 @@ +--- testdata/Top_Gear_Series_14.old ++++ testdata/Top_Gear_Series_14.old +--++ + 48/ 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/ 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.reverse.chunks b/lib/text/diff/testdata/Top_Gear_Series_14.reverse.chunks new file mode 100644 index 00000000..94855a40 --- /dev/null +++ b/lib/text/diff/testdata/Top_Gear_Series_14.reverse.chunks @@ -0,0 +1,7 @@ +--- testdata/Top_Gear_Series_14.new ++++ testdata/Top_Gear_Series_14.new +--++ + 48/ 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/ 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/Top_Gear_Series_14_diff_LevelLines b/lib/text/diff/testdata/Top_Gear_Series_14_diff_LevelLines deleted file mode 100644 index fdb463fb..00000000 --- a/lib/text/diff/testdata/Top_Gear_Series_14_diff_LevelLines +++ /dev/null @@ -1,3 +0,0 @@ ---++ -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 deleted file mode 100644 index d0836b47..00000000 --- a/lib/text/diff/testdata/Top_Gear_Series_14_diff_LevelLines_reverse +++ /dev/null @@ -1,3 +0,0 @@ ---++ -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 deleted file mode 100644 index cc0d0794..00000000 --- a/lib/text/diff/testdata/Top_Gear_Series_14_diff_LevelWords +++ /dev/null @@ -1,5 +0,0 @@ ---++ -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 deleted file mode 100644 index 212e7b2e..00000000 --- a/lib/text/diff/testdata/Top_Gear_Series_14_diff_LevelWords_reverse +++ /dev/null @@ -1,5 +0,0 @@ ---++ -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.chunks b/lib/text/diff/testdata/empty_lines.chunks new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/lib/text/diff/testdata/empty_lines.chunks diff --git a/lib/text/diff/testdata/empty_lines.reverse.chunks b/lib/text/diff/testdata/empty_lines.reverse.chunks new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/lib/text/diff/testdata/empty_lines.reverse.chunks diff --git a/lib/text/diff/testdata/empty_lines_diff_LevelLines b/lib/text/diff/testdata/empty_lines_diff_LevelLines deleted file mode 100644 index d881fc13..00000000 --- a/lib/text/diff/testdata/empty_lines_diff_LevelLines +++ /dev/null @@ -1,3 +0,0 @@ -++++ -5 + "" -6 + "" diff --git a/lib/text/diff/testdata/empty_lines_diff_LevelLines_reverse b/lib/text/diff/testdata/empty_lines_diff_LevelLines_reverse deleted file mode 100644 index d587491f..00000000 --- a/lib/text/diff/testdata/empty_lines_diff_LevelLines_reverse +++ /dev/null @@ -1,3 +0,0 @@ ----- -5 - "" -6 - "" diff --git a/lib/text/diff/testdata/empty_lines_diff_LevelWords b/lib/text/diff/testdata/empty_lines_diff_LevelWords deleted file mode 100644 index d881fc13..00000000 --- a/lib/text/diff/testdata/empty_lines_diff_LevelWords +++ /dev/null @@ -1,3 +0,0 @@ -++++ -5 + "" -6 + "" diff --git a/lib/text/diff/testdata/empty_lines_diff_LevelWords_reverse b/lib/text/diff/testdata/empty_lines_diff_LevelWords_reverse deleted file mode 100644 index d587491f..00000000 --- a/lib/text/diff/testdata/empty_lines_diff_LevelWords_reverse +++ /dev/null @@ -1,3 +0,0 @@ ----- -5 - "" -6 - "" diff --git a/lib/text/diff/testdata/peeps.chunks b/lib/text/diff/testdata/peeps.chunks new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/lib/text/diff/testdata/peeps.chunks diff --git a/lib/text/diff/testdata/peeps.reverse.chunks b/lib/text/diff/testdata/peeps.reverse.chunks new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/lib/text/diff/testdata/peeps.reverse.chunks diff --git a/lib/text/diff/testdata/peeps_diff_LevelLines b/lib/text/diff/testdata/peeps_diff_LevelLines deleted file mode 100644 index 218ee3bb..00000000 --- a/lib/text/diff/testdata/peeps_diff_LevelLines +++ /dev/null @@ -1,6 +0,0 @@ -++++ -23 + "\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 deleted file mode 100644 index 8129fcc5..00000000 --- a/lib/text/diff/testdata/peeps_diff_LevelLines_reverse +++ /dev/null @@ -1,6 +0,0 @@ ----- -23 - "\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 deleted file mode 100644 index 218ee3bb..00000000 --- a/lib/text/diff/testdata/peeps_diff_LevelWords +++ /dev/null @@ -1,6 +0,0 @@ -++++ -23 + "\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 deleted file mode 100644 index 8129fcc5..00000000 --- a/lib/text/diff/testdata/peeps_diff_LevelWords_reverse +++ /dev/null @@ -1,6 +0,0 @@ ----- -23 - "\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.chunks b/lib/text/diff/testdata/text01.chunks new file mode 100644 index 00000000..43abbfbf --- /dev/null +++ b/lib/text/diff/testdata/text01.chunks @@ -0,0 +1,14 @@ +--- testdata/text01.old ++++ testdata/text01.old +--++ + 1/ 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/ 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 - ">" +^1153 - "</ref" +^672 + " name=\"Payraudeau, BIFAO 108, p.294\"" +^895 + "—" +^919 + "—" +^1126 + " name=\"" +^1161 + "\"/" diff --git a/lib/text/diff/testdata/text01.reverse.chunks b/lib/text/diff/testdata/text01.reverse.chunks new file mode 100644 index 00000000..177c7006 --- /dev/null +++ b/lib/text/diff/testdata/text01.reverse.chunks @@ -0,0 +1,14 @@ +--- testdata/text01.new ++++ testdata/text01.new +--++ + 1/ 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/ 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 - "—" +^1126 - " name=\"" +^1161 - "\"/" +^895 + "--" +^918 + "--" +^1124 + ">" +^1153 + "</ref" diff --git a/lib/text/diff/testdata/text01_diff_LevelLines b/lib/text/diff/testdata/text01_diff_LevelLines deleted file mode 100644 index d8a9329b..00000000 --- a/lib/text/diff/testdata/text01_diff_LevelLines +++ /dev/null @@ -1,3 +0,0 @@ ---++ -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 deleted file mode 100644 index 9f6dc893..00000000 --- a/lib/text/diff/testdata/text01_diff_LevelLines_reverse +++ /dev/null @@ -1,3 +0,0 @@ ---++ -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 deleted file mode 100644 index 8bea701c..00000000 --- a/lib/text/diff/testdata/text01_diff_LevelWords +++ /dev/null @@ -1,12 +0,0 @@ ---++ -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 - ">" -^1153 - "</ref" -^672 + " name=\"Payraudeau, BIFAO 108, p.294\"" -^895 + "—" -^919 + "—" -^1126 + " name=\"" -^1161 + "\"/" diff --git a/lib/text/diff/testdata/text01_diff_LevelWords_reverse b/lib/text/diff/testdata/text01_diff_LevelWords_reverse deleted file mode 100644 index 4d9f64a3..00000000 --- a/lib/text/diff/testdata/text01_diff_LevelWords_reverse +++ /dev/null @@ -1,12 +0,0 @@ ---++ -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 - "—" -^1126 - " name=\"" -^1161 - "\"/" -^895 + "--" -^918 + "--" -^1124 + ">" -^1153 + "</ref" diff --git a/lib/text/diff/testdata/text02.chunks b/lib/text/diff/testdata/text02.chunks new file mode 100644 index 00000000..7d5a4aa5 --- /dev/null +++ b/lib/text/diff/testdata/text02.chunks @@ -0,0 +1,16 @@ +--- testdata/text02.old ++++ testdata/text02.old +--++ + 1/ 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/ 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 - "-" +^1610 - "--" +^1849 - "--" +^388 + " name=\"Kitchen, p.290\"" +^947 + " name=\"" +^968 + "\"/" +^1263 + "–" +^1615 + "—" +^1855 + "—" diff --git a/lib/text/diff/testdata/text02.reverse.chunks b/lib/text/diff/testdata/text02.reverse.chunks new file mode 100644 index 00000000..8f38a2a2 --- /dev/null +++ b/lib/text/diff/testdata/text02.reverse.chunks @@ -0,0 +1,17 @@ +--- testdata/text02.new ++++ testdata/text02.new +--++ + 1/ 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/ 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 - "\"/" +^1030 - "–" +^1382 - "—" +^1622 - "—" +^388 + ">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" +^714 + ">" +^729 + "</ref" +^1027 + "-" +^1377 + "--" +^1616 + "--" diff --git a/lib/text/diff/testdata/text02_diff_LevelLines b/lib/text/diff/testdata/text02_diff_LevelLines deleted file mode 100644 index dc98a3e1..00000000 --- a/lib/text/diff/testdata/text02_diff_LevelLines +++ /dev/null @@ -1,3 +0,0 @@ ---++ -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 deleted file mode 100644 index 311b6c4c..00000000 --- a/lib/text/diff/testdata/text02_diff_LevelLines_reverse +++ /dev/null @@ -1,3 +0,0 @@ ---++ -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 deleted file mode 100644 index 5e5ebb34..00000000 --- a/lib/text/diff/testdata/text02_diff_LevelWords +++ /dev/null @@ -1,14 +0,0 @@ ---++ -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 - "-" -^1610 - "--" -^1849 - "--" -^388 + " name=\"Kitchen, p.290\"" -^947 + " name=\"" -^968 + "\"/" -^1263 + "–" -^1615 + "—" -^1855 + "—" diff --git a/lib/text/diff/testdata/text02_diff_LevelWords_reverse b/lib/text/diff/testdata/text02_diff_LevelWords_reverse deleted file mode 100644 index 27da31ea..00000000 --- a/lib/text/diff/testdata/text02_diff_LevelWords_reverse +++ /dev/null @@ -1,15 +0,0 @@ ---++ -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 - "\"/" -^1030 - "–" -^1382 - "—" -^1622 - "—" -^388 + ">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" -^714 + ">" -^729 + "</ref" -^1027 + "-" -^1377 + "--" -^1616 + "--" diff --git a/lib/text/diff/testdata/the_singles_collection.chunks b/lib/text/diff/testdata/the_singles_collection.chunks new file mode 100644 index 00000000..97c65fa8 --- /dev/null +++ b/lib/text/diff/testdata/the_singles_collection.chunks @@ -0,0 +1,187 @@ +--- testdata/the_singles_collection.old ++++ testdata/the_singles_collection.old +--++ + 178/ 178: -"# [[...Baby One More Time (song)|...Baby One More Time]]\r" + 178/ 178: +"# \"[[...Baby One More Time (song)|...Baby One More Time]]\"\r" +^2 + "\"" +^56 + "\"" + 180/ 180: -"# [[Sometimes (Britney Spears song)|Sometimes]] <small>(Radio Edit)</small>\r" + 180/ 180: +"# \"[[Sometimes (Britney Spears song)|Sometimes]]\" <small>(Radio Edit)</small>\r" +^2 + "\"" +^47 + "\"" + 182/ 182: -"# [[(You Drive Me) Crazy]] <small>(The Stop Remix!)</small>\r" + 182/ 182: +"# \"[[(You Drive Me) Crazy]]\" <small>(The Stop Remix!)</small>\r" +^2 + "\"" +^26 + "\"" + 184/ 184: -"# [[Born to Make You Happy]] <small>(Radio Edit)</small>\r" + 184/ 184: +"# \"[[Born to Make You Happy]]\" <small>(Radio Edit)</small>\r" +^2 + "\"" +^28 + "\"" + 185/ 185: -"# \"Born to Make You Happy (Kristian Lundin Bonus Remix)\"\r" + 185/ 185: +"# \"Born to Make You Happy\" (Kristian Lundin Bonus Remix)\r" +^55 - "\"" +^25 + "\"" + 186/ 186: -"# [[From the Bottom of My Broken Heart]] <small>(Radio Edit)</small>\r" + 186/ 186: +"# \"[[From the Bottom of My Broken Heart]]\" <small>(Radio Edit)</small>\r" +^2 + "\"" +^40 + "\"" + 188/ 188: -"# [[Oops!... I Did It Again (song)|Oops!...I Did It Again]]\r" + 188/ 188: +"# \"[[Oops!... I Did It Again (song)|Oops!...I Did It Again]]\"\r" +^2 + "\"" +^59 + "\"" + 190/ 190: -"# [[Lucky (Britney Spears song)|Lucky]]\r" + 190/ 190: +"# \"[[Lucky (Britney Spears song)|Lucky]]\"\r" +^2 + "\"" +^39 + "\"" + 192/ 192: -"# [[Stronger (Britney Spears song)|Stronger]]\r" + 192/ 192: +"# \"[[Stronger (Britney Spears song)|Stronger]]\"\r" +^2 + "\"" +^45 + "\"" + 194/ 194: -"# [[Don't Let Me Be the Last to Know]]\r" + 194/ 194: +"# \"[[Don't Let Me Be the Last to Know]]\"\r" +^2 + "\"" +^38 + "\"" + 195/ 195: -"# \"Don't Let Me Be The Last to Know (Hex Hector Radio Mix)\"\r" + 195/ 195: +"# \"Don't Let Me Be The Last to Know\" (Hex Hector Radio Mix)\r" +^58 - "\"" +^35 + "\"" + 196/ 196: -"# [[I'm a Slave 4 U]]\r" + 196/ 196: +"# \"[[I'm a Slave 4 U]]\"\r" +^2 + "\"" +^21 + "\"" + 198/ 198: -"# [[Overprotected]]\r" + 198/ 198: +"# \"[[Overprotected]]\"\r" +^2 + "\"" +^19 + "\"" + 200/ 200: -"# [[I'm Not a Girl, Not Yet a Woman]]\r" + 200/ 200: +"# \"[[I'm Not a Girl, Not Yet a Woman]]\"\r" +^2 + "\"" +^37 + "\"" + 202/ 202: -"# [[I Love Rock 'n' Roll#Britney Spears version|I Love Rock 'N' Roll]]\r" + 202/ 202: +"# \"[[I Love Rock 'n' Roll#Britney Spears version|I Love Rock 'N' Roll]]\"\r" +^2 + "\"" +^70 + "\"" + 203/ 203: -"# \"I'm Not A Girl, Not Yet A Woman (Metro Remix Radio Edit)\"\r" + 203/ 203: +"# \"I'm Not A Girl, Not Yet A Woman\" (Metro Remix Radio Edit)\r" +^59 - "\"" +^34 + "\"" + 204/ 204: -"# [[Boys (Britney Spears song)|Boys]] <small>(The Co-Ed Remix feat. [[Pharrell Williams]]) </small>\r" + 204/ 204: +"# \"[[Boys (Britney Spears song)|Boys]]\" <small>(The Co-Ed Remix feat. [[Pharrell Williams]]) </small>\r" +^2 + "\"" +^37 + "\"" + 205/ 205: -"# \"Boys (Album Version)\"\r" + 205/ 205: +"# \"Boys\" (Album Version)\r" +^23 - "\"" +^7 + "\"" + 206/ 206: -"# [[Me Against the Music]] <small>(feat. [[Madonna (entertainer)|Madonna]]) </small>\r" + 206/ 206: +"# \"[[Me Against the Music]]\" <small>(feat. [[Madonna (entertainer)|Madonna]]) </small>\r" +^2 + "\"" +^26 + "\"" + 207/ 207: -"# \"Me Against the Music (Passengerz vs. the Club Mix)\"\r" + 207/ 207: +"# \"Me Against the Music\" (Passengerz vs. the Club Mix)\r" +^53 - "\"" +^23 + "\"" + 208/ 208: -"# [[Toxic (song)|Toxic]]\r" + 208/ 208: +"# \"[[Toxic (song)|Toxic]]\"\r" +^2 + "\"" +^24 + "\"" + 209/ 209: -"# \"Toxic (Bloodshy & Avant Intoxicated Remix)\"\r" + 209/ 209: +"# \"Toxic\" (Bloodshy & Avant Intoxicated Remix)\r" +^45 - "\"" +^8 + "\"" + 210/ 210: -"# [[Everytime]]\r" + 210/ 210: +"# \"[[Everytime]]\"\r" +^2 + "\"" +^15 + "\"" + 211/ 211: -"# \"Everytime (Above & Beyond Club Mix)\"\r" + 211/ 211: +"# \"Everytime\" (Above & Beyond Club Mix)\r" +^38 - "\"" +^12 + "\"" + 212/ 212: -"# [[Outrageous]]\r" + 212/ 212: +"# \"[[Outrageous]]\"\r" +^2 + "\"" +^16 + "\"" + 213/ 213: -"# \"Outragous (Junkie XL's Dancehall Mix)\"\r" + 213/ 213: +"# \"Outragous\" (Junkie XL's Dancehall Mix)\r" +^40 - "\"" +^12 + "\"" + 214/ 214: -"# [[My Prerogative#Britney Spears version|My Prerogative]]\r" + 214/ 214: +"# \"[[My Prerogative#Britney Spears version|My Prerogative]]\"\r" +^2 + "\"" +^58 + "\"" + 215/ 215: -"# \"My Prerogative (Armand Van Helden Remix)\"\r" + 215/ 215: +"# \"My Prerogative\" (Armand Van Helden Remix)\r" +^43 - "\"" +^17 + "\"" + 216/ 216: -"# [[Do Somethin']]\r" + 216/ 216: +"# \"[[Do Somethin']]\"\r" +^2 + "\"" +^18 + "\"" + 217/ 217: -"# \"Do Somethin' (Thick Vocal Mix)\"\r" + 217/ 217: +"# \"Do Somethin'\" (Thick Vocal Mix)\r" +^33 - "\"" +^15 + "\"" + 218/ 218: -"# [[Someday (I Will Understand)]]\r" + 218/ 218: +"# \"[[Someday (I Will Understand)]]\"\r" +^2 + "\"" +^33 + "\"" + 220/ 220: -"# [[Gimme More]]\r" + 220/ 220: +"# \"[[Gimme More]]\"\r" +^2 + "\"" +^16 + "\"" + 221/ 221: -"# \"Gimme More (Paul Oakenfold Remix)\"\r" + 221/ 221: +"# \"Gimme More\" (Paul Oakenfold Remix)\r" +^36 - "\"" +^13 + "\"" + 222/ 222: -"# [[Piece of Me]]\r" + 222/ 222: +"# \"[[Piece of Me]]\"\r" +^2 + "\"" +^17 + "\"" + 223/ 223: -"# \"Piece of Me (Boz O Lo Remix)\"\r" + 223/ 223: +"# \"Piece of Me\" (Boz O Lo Remix)\r" +^31 - "\"" +^14 + "\"" + 224/ 224: -"# [[Break the Ice (Britney Spears song)|Break the Ice]]\r" + 224/ 224: +"# \"[[Break the Ice (Britney Spears song)|Break the Ice]]\"\r" +^2 + "\"" +^55 + "\"" + 226/ 226: -"# [[Womanizer (song)|Womanizer]]\r" + 226/ 226: +"# \"[[Womanizer (song)|Womanizer]]\"\r" +^2 + "\"" +^32 + "\"" + 227/ 227: -"# \"Womanizer (Kaskade Remix)\"\r" + 227/ 227: +"# \"Womanizer\" (Kaskade Remix)\r" +^28 - "\"" +^12 + "\"" + 228/ 228: -"# [[Circus (song)|Circus]]\r" + 228/ 228: +"# \"[[Circus (song)|Circus]]\"\r" +^2 + "\"" +^26 + "\"" + 229/ 229: -"# \"Circus (Tom Neville's Ringleader Remix)\"\r" + 229/ 229: +"# \"Circus\" (Tom Neville's Ringleader Remix)\r" +^42 - "\"" +^9 + "\"" + 230/ 230: -"# [[If U Seek Amy]]\r" + 230/ 230: +"# \"[[If U Seek Amy]]\"\r" +^2 + "\"" +^19 + "\"" + 231/ 231: -"# \"If U Seek Amy (Crookers Remix)\"\r" + 231/ 231: +"# \"If U Seek Amy\" (Crookers Remix)\r" +^33 - "\"" +^16 + "\"" + 232/ 232: -"# [[Radar (song)|Radar]]\r" + 232/ 232: +"# \"[[Radar (song)|Radar]]\"\r" +^2 + "\"" +^24 + "\"" + 233/ 233: -"# \"Radar (Bloodshy & Avant Remix)\"\r" + 233/ 233: +"# \"Radar\" (Bloodshy & Avant Remix)\r" +^33 - "\"" +^8 + "\"" + 234/ 234: -"# [[3 (song)|3]]\r" + 234/ 234: +"# \"[[3 (song)|3]]\"\r" +^2 + "\"" +^16 + "\"" + 235/ 235: -"# \"3 (Groove Police Club Mix)\"\r" + 235/ 235: +"# \"3\" (Groove Police Club Mix)\r" +^29 - "\"" +^4 + "\"" diff --git a/lib/text/diff/testdata/the_singles_collection.reverse.chunks b/lib/text/diff/testdata/the_singles_collection.reverse.chunks new file mode 100644 index 00000000..abcd21d4 --- /dev/null +++ b/lib/text/diff/testdata/the_singles_collection.reverse.chunks @@ -0,0 +1,187 @@ +--- testdata/the_singles_collection.new ++++ testdata/the_singles_collection.new +--++ + 178/ 178: -"# \"[[...Baby One More Time (song)|...Baby One More Time]]\"\r" + 178/ 178: +"# [[...Baby One More Time (song)|...Baby One More Time]]\r" +^2 - "\"" +^56 - "\"" + 180/ 180: -"# \"[[Sometimes (Britney Spears song)|Sometimes]]\" <small>(Radio Edit)</small>\r" + 180/ 180: +"# [[Sometimes (Britney Spears song)|Sometimes]] <small>(Radio Edit)</small>\r" +^2 - "\"" +^47 - "\"" + 182/ 182: -"# \"[[(You Drive Me) Crazy]]\" <small>(The Stop Remix!)</small>\r" + 182/ 182: +"# [[(You Drive Me) Crazy]] <small>(The Stop Remix!)</small>\r" +^2 - "\"" +^26 - "\"" + 184/ 184: -"# \"[[Born to Make You Happy]]\" <small>(Radio Edit)</small>\r" + 184/ 184: +"# [[Born to Make You Happy]] <small>(Radio Edit)</small>\r" +^2 - "\"" +^28 - "\"" + 185/ 185: -"# \"Born to Make You Happy\" (Kristian Lundin Bonus Remix)\r" + 185/ 185: +"# \"Born to Make You Happy (Kristian Lundin Bonus Remix)\"\r" +^25 - "\"" +^55 + "\"" + 186/ 186: -"# \"[[From the Bottom of My Broken Heart]]\" <small>(Radio Edit)</small>\r" + 186/ 186: +"# [[From the Bottom of My Broken Heart]] <small>(Radio Edit)</small>\r" +^2 - "\"" +^40 - "\"" + 188/ 188: -"# \"[[Oops!... I Did It Again (song)|Oops!...I Did It Again]]\"\r" + 188/ 188: +"# [[Oops!... I Did It Again (song)|Oops!...I Did It Again]]\r" +^2 - "\"" +^59 - "\"" + 190/ 190: -"# \"[[Lucky (Britney Spears song)|Lucky]]\"\r" + 190/ 190: +"# [[Lucky (Britney Spears song)|Lucky]]\r" +^2 - "\"" +^39 - "\"" + 192/ 192: -"# \"[[Stronger (Britney Spears song)|Stronger]]\"\r" + 192/ 192: +"# [[Stronger (Britney Spears song)|Stronger]]\r" +^2 - "\"" +^45 - "\"" + 194/ 194: -"# \"[[Don't Let Me Be the Last to Know]]\"\r" + 194/ 194: +"# [[Don't Let Me Be the Last to Know]]\r" +^2 - "\"" +^38 - "\"" + 195/ 195: -"# \"Don't Let Me Be The Last to Know\" (Hex Hector Radio Mix)\r" + 195/ 195: +"# \"Don't Let Me Be The Last to Know (Hex Hector Radio Mix)\"\r" +^35 - "\"" +^58 + "\"" + 196/ 196: -"# \"[[I'm a Slave 4 U]]\"\r" + 196/ 196: +"# [[I'm a Slave 4 U]]\r" +^2 - "\"" +^21 - "\"" + 198/ 198: -"# \"[[Overprotected]]\"\r" + 198/ 198: +"# [[Overprotected]]\r" +^2 - "\"" +^19 - "\"" + 200/ 200: -"# \"[[I'm Not a Girl, Not Yet a Woman]]\"\r" + 200/ 200: +"# [[I'm Not a Girl, Not Yet a Woman]]\r" +^2 - "\"" +^37 - "\"" + 202/ 202: -"# \"[[I Love Rock 'n' Roll#Britney Spears version|I Love Rock 'N' Roll]]\"\r" + 202/ 202: +"# [[I Love Rock 'n' Roll#Britney Spears version|I Love Rock 'N' Roll]]\r" +^2 - "\"" +^70 - "\"" + 203/ 203: -"# \"I'm Not A Girl, Not Yet A Woman\" (Metro Remix Radio Edit)\r" + 203/ 203: +"# \"I'm Not A Girl, Not Yet A Woman (Metro Remix Radio Edit)\"\r" +^34 - "\"" +^59 + "\"" + 204/ 204: -"# \"[[Boys (Britney Spears song)|Boys]]\" <small>(The Co-Ed Remix feat. [[Pharrell Williams]]) </small>\r" + 204/ 204: +"# [[Boys (Britney Spears song)|Boys]] <small>(The Co-Ed Remix feat. [[Pharrell Williams]]) </small>\r" +^2 - "\"" +^37 - "\"" + 205/ 205: -"# \"Boys\" (Album Version)\r" + 205/ 205: +"# \"Boys (Album Version)\"\r" +^7 - "\"" +^23 + "\"" + 206/ 206: -"# \"[[Me Against the Music]]\" <small>(feat. [[Madonna (entertainer)|Madonna]]) </small>\r" + 206/ 206: +"# [[Me Against the Music]] <small>(feat. [[Madonna (entertainer)|Madonna]]) </small>\r" +^2 - "\"" +^26 - "\"" + 207/ 207: -"# \"Me Against the Music\" (Passengerz vs. the Club Mix)\r" + 207/ 207: +"# \"Me Against the Music (Passengerz vs. the Club Mix)\"\r" +^23 - "\"" +^53 + "\"" + 208/ 208: -"# \"[[Toxic (song)|Toxic]]\"\r" + 208/ 208: +"# [[Toxic (song)|Toxic]]\r" +^2 - "\"" +^24 - "\"" + 209/ 209: -"# \"Toxic\" (Bloodshy & Avant Intoxicated Remix)\r" + 209/ 209: +"# \"Toxic (Bloodshy & Avant Intoxicated Remix)\"\r" +^8 - "\"" +^45 + "\"" + 210/ 210: -"# \"[[Everytime]]\"\r" + 210/ 210: +"# [[Everytime]]\r" +^2 - "\"" +^15 - "\"" + 211/ 211: -"# \"Everytime\" (Above & Beyond Club Mix)\r" + 211/ 211: +"# \"Everytime (Above & Beyond Club Mix)\"\r" +^12 - "\"" +^38 + "\"" + 212/ 212: -"# \"[[Outrageous]]\"\r" + 212/ 212: +"# [[Outrageous]]\r" +^2 - "\"" +^16 - "\"" + 213/ 213: -"# \"Outragous\" (Junkie XL's Dancehall Mix)\r" + 213/ 213: +"# \"Outragous (Junkie XL's Dancehall Mix)\"\r" +^12 - "\"" +^40 + "\"" + 214/ 214: -"# \"[[My Prerogative#Britney Spears version|My Prerogative]]\"\r" + 214/ 214: +"# [[My Prerogative#Britney Spears version|My Prerogative]]\r" +^2 - "\"" +^58 - "\"" + 215/ 215: -"# \"My Prerogative\" (Armand Van Helden Remix)\r" + 215/ 215: +"# \"My Prerogative (Armand Van Helden Remix)\"\r" +^17 - "\"" +^43 + "\"" + 216/ 216: -"# \"[[Do Somethin']]\"\r" + 216/ 216: +"# [[Do Somethin']]\r" +^2 - "\"" +^18 - "\"" + 217/ 217: -"# \"Do Somethin'\" (Thick Vocal Mix)\r" + 217/ 217: +"# \"Do Somethin' (Thick Vocal Mix)\"\r" +^15 - "\"" +^33 + "\"" + 218/ 218: -"# \"[[Someday (I Will Understand)]]\"\r" + 218/ 218: +"# [[Someday (I Will Understand)]]\r" +^2 - "\"" +^33 - "\"" + 220/ 220: -"# \"[[Gimme More]]\"\r" + 220/ 220: +"# [[Gimme More]]\r" +^2 - "\"" +^16 - "\"" + 221/ 221: -"# \"Gimme More\" (Paul Oakenfold Remix)\r" + 221/ 221: +"# \"Gimme More (Paul Oakenfold Remix)\"\r" +^13 - "\"" +^36 + "\"" + 222/ 222: -"# \"[[Piece of Me]]\"\r" + 222/ 222: +"# [[Piece of Me]]\r" +^2 - "\"" +^17 - "\"" + 223/ 223: -"# \"Piece of Me\" (Boz O Lo Remix)\r" + 223/ 223: +"# \"Piece of Me (Boz O Lo Remix)\"\r" +^14 - "\"" +^31 + "\"" + 224/ 224: -"# \"[[Break the Ice (Britney Spears song)|Break the Ice]]\"\r" + 224/ 224: +"# [[Break the Ice (Britney Spears song)|Break the Ice]]\r" +^2 - "\"" +^55 - "\"" + 226/ 226: -"# \"[[Womanizer (song)|Womanizer]]\"\r" + 226/ 226: +"# [[Womanizer (song)|Womanizer]]\r" +^2 - "\"" +^32 - "\"" + 227/ 227: -"# \"Womanizer\" (Kaskade Remix)\r" + 227/ 227: +"# \"Womanizer (Kaskade Remix)\"\r" +^12 - "\"" +^28 + "\"" + 228/ 228: -"# \"[[Circus (song)|Circus]]\"\r" + 228/ 228: +"# [[Circus (song)|Circus]]\r" +^2 - "\"" +^26 - "\"" + 229/ 229: -"# \"Circus\" (Tom Neville's Ringleader Remix)\r" + 229/ 229: +"# \"Circus (Tom Neville's Ringleader Remix)\"\r" +^9 - "\"" +^42 + "\"" + 230/ 230: -"# \"[[If U Seek Amy]]\"\r" + 230/ 230: +"# [[If U Seek Amy]]\r" +^2 - "\"" +^19 - "\"" + 231/ 231: -"# \"If U Seek Amy\" (Crookers Remix)\r" + 231/ 231: +"# \"If U Seek Amy (Crookers Remix)\"\r" +^16 - "\"" +^33 + "\"" + 232/ 232: -"# \"[[Radar (song)|Radar]]\"\r" + 232/ 232: +"# [[Radar (song)|Radar]]\r" +^2 - "\"" +^24 - "\"" + 233/ 233: -"# \"Radar\" (Bloodshy & Avant Remix)\r" + 233/ 233: +"# \"Radar (Bloodshy & Avant Remix)\"\r" +^8 - "\"" +^33 + "\"" + 234/ 234: -"# \"[[3 (song)|3]]\"\r" + 234/ 234: +"# [[3 (song)|3]]\r" +^2 - "\"" +^16 - "\"" + 235/ 235: -"# \"3\" (Groove Police Club Mix)\r" + 235/ 235: +"# \"3 (Groove Police Club Mix)\"\r" +^4 - "\"" +^29 + "\"" diff --git a/lib/text/diff/testdata/the_singles_collection_diff_LevelLines b/lib/text/diff/testdata/the_singles_collection_diff_LevelLines deleted file mode 100644 index 117d3759..00000000 --- a/lib/text/diff/testdata/the_singles_collection_diff_LevelLines +++ /dev/null @@ -1,93 +0,0 @@ ---++ -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 deleted file mode 100644 index 2ac51306..00000000 --- a/lib/text/diff/testdata/the_singles_collection_diff_LevelLines_reverse +++ /dev/null @@ -1,93 +0,0 @@ ---++ -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 deleted file mode 100644 index 8612deaa..00000000 --- a/lib/text/diff/testdata/the_singles_collection_diff_LevelWords +++ /dev/null @@ -1,185 +0,0 @@ ---++ -178 - "# [[...Baby One More Time (song)|...Baby One More Time]]\r" -178 + "# \"[[...Baby One More Time (song)|...Baby One More Time]]\"\r" -^2 + "\"" -^56 + "\"" -180 - "# [[Sometimes (Britney Spears song)|Sometimes]] <small>(Radio Edit)</small>\r" -180 + "# \"[[Sometimes (Britney Spears song)|Sometimes]]\" <small>(Radio Edit)</small>\r" -^2 + "\"" -^47 + "\"" -182 - "# [[(You Drive Me) Crazy]] <small>(The Stop Remix!)</small>\r" -182 + "# \"[[(You Drive Me) Crazy]]\" <small>(The Stop Remix!)</small>\r" -^2 + "\"" -^26 + "\"" -184 - "# [[Born to Make You Happy]] <small>(Radio Edit)</small>\r" -184 + "# \"[[Born to Make You Happy]]\" <small>(Radio Edit)</small>\r" -^2 + "\"" -^28 + "\"" -185 - "# \"Born to Make You Happy (Kristian Lundin Bonus Remix)\"\r" -185 + "# \"Born to Make You Happy\" (Kristian Lundin Bonus Remix)\r" -^55 - "\"" -^25 + "\"" -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 + "\"" -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 + "\"" -190 - "# [[Lucky (Britney Spears song)|Lucky]]\r" -190 + "# \"[[Lucky (Britney Spears song)|Lucky]]\"\r" -^2 + "\"" -^39 + "\"" -192 - "# [[Stronger (Britney Spears song)|Stronger]]\r" -192 + "# \"[[Stronger (Britney Spears song)|Stronger]]\"\r" -^2 + "\"" -^45 + "\"" -194 - "# [[Don't Let Me Be the Last to Know]]\r" -194 + "# \"[[Don't Let Me Be the Last to Know]]\"\r" -^2 + "\"" -^38 + "\"" -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 + "\"" -196 - "# [[I'm a Slave 4 U]]\r" -196 + "# \"[[I'm a Slave 4 U]]\"\r" -^2 + "\"" -^21 + "\"" -198 - "# [[Overprotected]]\r" -198 + "# \"[[Overprotected]]\"\r" -^2 + "\"" -^19 + "\"" -200 - "# [[I'm Not a Girl, Not Yet a Woman]]\r" -200 + "# \"[[I'm Not a Girl, Not Yet a Woman]]\"\r" -^2 + "\"" -^37 + "\"" -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 + "\"" -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 + "\"" -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 + "\"" -205 - "# \"Boys (Album Version)\"\r" -205 + "# \"Boys\" (Album Version)\r" -^23 - "\"" -^7 + "\"" -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 + "\"" -207 - "# \"Me Against the Music (Passengerz vs. the Club Mix)\"\r" -207 + "# \"Me Against the Music\" (Passengerz vs. the Club Mix)\r" -^53 - "\"" -^23 + "\"" -208 - "# [[Toxic (song)|Toxic]]\r" -208 + "# \"[[Toxic (song)|Toxic]]\"\r" -^2 + "\"" -^24 + "\"" -209 - "# \"Toxic (Bloodshy & Avant Intoxicated Remix)\"\r" -209 + "# \"Toxic\" (Bloodshy & Avant Intoxicated Remix)\r" -^45 - "\"" -^8 + "\"" -210 - "# [[Everytime]]\r" -210 + "# \"[[Everytime]]\"\r" -^2 + "\"" -^15 + "\"" -211 - "# \"Everytime (Above & Beyond Club Mix)\"\r" -211 + "# \"Everytime\" (Above & Beyond Club Mix)\r" -^38 - "\"" -^12 + "\"" -212 - "# [[Outrageous]]\r" -212 + "# \"[[Outrageous]]\"\r" -^2 + "\"" -^16 + "\"" -213 - "# \"Outragous (Junkie XL's Dancehall Mix)\"\r" -213 + "# \"Outragous\" (Junkie XL's Dancehall Mix)\r" -^40 - "\"" -^12 + "\"" -214 - "# [[My Prerogative#Britney Spears version|My Prerogative]]\r" -214 + "# \"[[My Prerogative#Britney Spears version|My Prerogative]]\"\r" -^2 + "\"" -^58 + "\"" -215 - "# \"My Prerogative (Armand Van Helden Remix)\"\r" -215 + "# \"My Prerogative\" (Armand Van Helden Remix)\r" -^43 - "\"" -^17 + "\"" -216 - "# [[Do Somethin']]\r" -216 + "# \"[[Do Somethin']]\"\r" -^2 + "\"" -^18 + "\"" -217 - "# \"Do Somethin' (Thick Vocal Mix)\"\r" -217 + "# \"Do Somethin'\" (Thick Vocal Mix)\r" -^33 - "\"" -^15 + "\"" -218 - "# [[Someday (I Will Understand)]]\r" -218 + "# \"[[Someday (I Will Understand)]]\"\r" -^2 + "\"" -^33 + "\"" -220 - "# [[Gimme More]]\r" -220 + "# \"[[Gimme More]]\"\r" -^2 + "\"" -^16 + "\"" -221 - "# \"Gimme More (Paul Oakenfold Remix)\"\r" -221 + "# \"Gimme More\" (Paul Oakenfold Remix)\r" -^36 - "\"" -^13 + "\"" -222 - "# [[Piece of Me]]\r" -222 + "# \"[[Piece of Me]]\"\r" -^2 + "\"" -^17 + "\"" -223 - "# \"Piece of Me (Boz O Lo Remix)\"\r" -223 + "# \"Piece of Me\" (Boz O Lo Remix)\r" -^31 - "\"" -^14 + "\"" -224 - "# [[Break the Ice (Britney Spears song)|Break the Ice]]\r" -224 + "# \"[[Break the Ice (Britney Spears song)|Break the Ice]]\"\r" -^2 + "\"" -^55 + "\"" -226 - "# [[Womanizer (song)|Womanizer]]\r" -226 + "# \"[[Womanizer (song)|Womanizer]]\"\r" -^2 + "\"" -^32 + "\"" -227 - "# \"Womanizer (Kaskade Remix)\"\r" -227 + "# \"Womanizer\" (Kaskade Remix)\r" -^28 - "\"" -^12 + "\"" -228 - "# [[Circus (song)|Circus]]\r" -228 + "# \"[[Circus (song)|Circus]]\"\r" -^2 + "\"" -^26 + "\"" -229 - "# \"Circus (Tom Neville's Ringleader Remix)\"\r" -229 + "# \"Circus\" (Tom Neville's Ringleader Remix)\r" -^42 - "\"" -^9 + "\"" -230 - "# [[If U Seek Amy]]\r" -230 + "# \"[[If U Seek Amy]]\"\r" -^2 + "\"" -^19 + "\"" -231 - "# \"If U Seek Amy (Crookers Remix)\"\r" -231 + "# \"If U Seek Amy\" (Crookers Remix)\r" -^33 - "\"" -^16 + "\"" -232 - "# [[Radar (song)|Radar]]\r" -232 + "# \"[[Radar (song)|Radar]]\"\r" -^2 + "\"" -^24 + "\"" -233 - "# \"Radar (Bloodshy & Avant Remix)\"\r" -233 + "# \"Radar\" (Bloodshy & Avant Remix)\r" -^33 - "\"" -^8 + "\"" -234 - "# [[3 (song)|3]]\r" -234 + "# \"[[3 (song)|3]]\"\r" -^2 + "\"" -^16 + "\"" -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 deleted file mode 100644 index f270db92..00000000 --- a/lib/text/diff/testdata/the_singles_collection_diff_LevelWords_reverse +++ /dev/null @@ -1,185 +0,0 @@ ---++ -178 - "# \"[[...Baby One More Time (song)|...Baby One More Time]]\"\r" -178 + "# [[...Baby One More Time (song)|...Baby One More Time]]\r" -^2 - "\"" -^56 - "\"" -180 - "# \"[[Sometimes (Britney Spears song)|Sometimes]]\" <small>(Radio Edit)</small>\r" -180 + "# [[Sometimes (Britney Spears song)|Sometimes]] <small>(Radio Edit)</small>\r" -^2 - "\"" -^47 - "\"" -182 - "# \"[[(You Drive Me) Crazy]]\" <small>(The Stop Remix!)</small>\r" -182 + "# [[(You Drive Me) Crazy]] <small>(The Stop Remix!)</small>\r" -^2 - "\"" -^26 - "\"" -184 - "# \"[[Born to Make You Happy]]\" <small>(Radio Edit)</small>\r" -184 + "# [[Born to Make You Happy]] <small>(Radio Edit)</small>\r" -^2 - "\"" -^28 - "\"" -185 - "# \"Born to Make You Happy\" (Kristian Lundin Bonus Remix)\r" -185 + "# \"Born to Make You Happy (Kristian Lundin Bonus Remix)\"\r" -^25 - "\"" -^55 + "\"" -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 - "\"" -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 - "\"" -190 - "# \"[[Lucky (Britney Spears song)|Lucky]]\"\r" -190 + "# [[Lucky (Britney Spears song)|Lucky]]\r" -^2 - "\"" -^39 - "\"" -192 - "# \"[[Stronger (Britney Spears song)|Stronger]]\"\r" -192 + "# [[Stronger (Britney Spears song)|Stronger]]\r" -^2 - "\"" -^45 - "\"" -194 - "# \"[[Don't Let Me Be the Last to Know]]\"\r" -194 + "# [[Don't Let Me Be the Last to Know]]\r" -^2 - "\"" -^38 - "\"" -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 + "\"" -196 - "# \"[[I'm a Slave 4 U]]\"\r" -196 + "# [[I'm a Slave 4 U]]\r" -^2 - "\"" -^21 - "\"" -198 - "# \"[[Overprotected]]\"\r" -198 + "# [[Overprotected]]\r" -^2 - "\"" -^19 - "\"" -200 - "# \"[[I'm Not a Girl, Not Yet a Woman]]\"\r" -200 + "# [[I'm Not a Girl, Not Yet a Woman]]\r" -^2 - "\"" -^37 - "\"" -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 - "\"" -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 + "\"" -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 - "\"" -205 - "# \"Boys\" (Album Version)\r" -205 + "# \"Boys (Album Version)\"\r" -^7 - "\"" -^23 + "\"" -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 - "\"" -207 - "# \"Me Against the Music\" (Passengerz vs. the Club Mix)\r" -207 + "# \"Me Against the Music (Passengerz vs. the Club Mix)\"\r" -^23 - "\"" -^53 + "\"" -208 - "# \"[[Toxic (song)|Toxic]]\"\r" -208 + "# [[Toxic (song)|Toxic]]\r" -^2 - "\"" -^24 - "\"" -209 - "# \"Toxic\" (Bloodshy & Avant Intoxicated Remix)\r" -209 + "# \"Toxic (Bloodshy & Avant Intoxicated Remix)\"\r" -^8 - "\"" -^45 + "\"" -210 - "# \"[[Everytime]]\"\r" -210 + "# [[Everytime]]\r" -^2 - "\"" -^15 - "\"" -211 - "# \"Everytime\" (Above & Beyond Club Mix)\r" -211 + "# \"Everytime (Above & Beyond Club Mix)\"\r" -^12 - "\"" -^38 + "\"" -212 - "# \"[[Outrageous]]\"\r" -212 + "# [[Outrageous]]\r" -^2 - "\"" -^16 - "\"" -213 - "# \"Outragous\" (Junkie XL's Dancehall Mix)\r" -213 + "# \"Outragous (Junkie XL's Dancehall Mix)\"\r" -^12 - "\"" -^40 + "\"" -214 - "# \"[[My Prerogative#Britney Spears version|My Prerogative]]\"\r" -214 + "# [[My Prerogative#Britney Spears version|My Prerogative]]\r" -^2 - "\"" -^58 - "\"" -215 - "# \"My Prerogative\" (Armand Van Helden Remix)\r" -215 + "# \"My Prerogative (Armand Van Helden Remix)\"\r" -^17 - "\"" -^43 + "\"" -216 - "# \"[[Do Somethin']]\"\r" -216 + "# [[Do Somethin']]\r" -^2 - "\"" -^18 - "\"" -217 - "# \"Do Somethin'\" (Thick Vocal Mix)\r" -217 + "# \"Do Somethin' (Thick Vocal Mix)\"\r" -^15 - "\"" -^33 + "\"" -218 - "# \"[[Someday (I Will Understand)]]\"\r" -218 + "# [[Someday (I Will Understand)]]\r" -^2 - "\"" -^33 - "\"" -220 - "# \"[[Gimme More]]\"\r" -220 + "# [[Gimme More]]\r" -^2 - "\"" -^16 - "\"" -221 - "# \"Gimme More\" (Paul Oakenfold Remix)\r" -221 + "# \"Gimme More (Paul Oakenfold Remix)\"\r" -^13 - "\"" -^36 + "\"" -222 - "# \"[[Piece of Me]]\"\r" -222 + "# [[Piece of Me]]\r" -^2 - "\"" -^17 - "\"" -223 - "# \"Piece of Me\" (Boz O Lo Remix)\r" -223 + "# \"Piece of Me (Boz O Lo Remix)\"\r" -^14 - "\"" -^31 + "\"" -224 - "# \"[[Break the Ice (Britney Spears song)|Break the Ice]]\"\r" -224 + "# [[Break the Ice (Britney Spears song)|Break the Ice]]\r" -^2 - "\"" -^55 - "\"" -226 - "# \"[[Womanizer (song)|Womanizer]]\"\r" -226 + "# [[Womanizer (song)|Womanizer]]\r" -^2 - "\"" -^32 - "\"" -227 - "# \"Womanizer\" (Kaskade Remix)\r" -227 + "# \"Womanizer (Kaskade Remix)\"\r" -^12 - "\"" -^28 + "\"" -228 - "# \"[[Circus (song)|Circus]]\"\r" -228 + "# [[Circus (song)|Circus]]\r" -^2 - "\"" -^26 - "\"" -229 - "# \"Circus\" (Tom Neville's Ringleader Remix)\r" -229 + "# \"Circus (Tom Neville's Ringleader Remix)\"\r" -^9 - "\"" -^42 + "\"" -230 - "# \"[[If U Seek Amy]]\"\r" -230 + "# [[If U Seek Amy]]\r" -^2 - "\"" -^19 - "\"" -231 - "# \"If U Seek Amy\" (Crookers Remix)\r" -231 + "# \"If U Seek Amy (Crookers Remix)\"\r" -^16 - "\"" -^33 + "\"" -232 - "# \"[[Radar (song)|Radar]]\"\r" -232 + "# [[Radar (song)|Radar]]\r" -^2 - "\"" -^24 - "\"" -233 - "# \"Radar\" (Bloodshy & Avant Remix)\r" -233 + "# \"Radar (Bloodshy & Avant Remix)\"\r" -^8 - "\"" -^33 + "\"" -234 - "# \"[[3 (song)|3]]\"\r" -234 + "# [[3 (song)|3]]\r" -^2 - "\"" -^16 - "\"" -235 - "# \"3\" (Groove Police Club Mix)\r" -235 + "# \"3 (Groove Police Club Mix)\"\r" -^4 - "\"" -^29 + "\"" |