From 2f58c894e72941337daf7f2deb0e82f7e5d59dfc Mon Sep 17 00:00:00 2001
From: smerten <smerten@929543f6-e4f2-0310-98a6-ba3bd3dd1d04>
Date: Sun, 3 Nov 2013 11:38:09 +0000
Subject: Complete refactoring:

* Standard docutils infrastructure is used

* There is a Python based approach besides the XSLT based approach

* XSLT and Python based approach are implemented as standard Docutils
  reader / parser / writer

Python implementation has some failing tests because Python
implementation is not yet as mature as XSLT implementation.

XSLT implementation fails for one test which is beyond the
capabilities of XSLT.


git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk@7724 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 sandbox/odf2docutils/tests/textSimple/expected/emphasis.xml          | 3 +++
 sandbox/odf2docutils/tests/textSimple/expected/empty.xml             | 2 +-
 sandbox/odf2docutils/tests/textSimple/expected/italicAutomatic.xml   | 3 +++
 sandbox/odf2docutils/tests/textSimple/expected/manyHeaders.xml       | 2 +-
 sandbox/odf2docutils/tests/textSimple/expected/nestedHeader.xml      | 2 +-
 sandbox/odf2docutils/tests/textSimple/expected/nestedList.xml        | 2 +-
 sandbox/odf2docutils/tests/textSimple/expected/oneHeader.xml         | 2 +-
 sandbox/odf2docutils/tests/textSimple/expected/oneLine.xml           | 2 +-
 sandbox/odf2docutils/tests/textSimple/expected/simpleList.xml        | 2 +-
 sandbox/odf2docutils/tests/textSimple/expected/twoHeaders.xml        | 2 +-
 sandbox/odf2docutils/tests/textSimple/expected/twoParas.xml          | 2 +-
 sandbox/odf2docutils/tests/textSimple/expected/wrongNestedHeader.xml | 2 +-
 sandbox/odf2docutils/tests/textSimple/expected/wrongNesting.xml      | 2 +-
 sandbox/odf2docutils/tests/textSimple/expected/wrongerNesting.xml    | 2 +-
 14 files changed, 18 insertions(+), 12 deletions(-)
 create mode 100644 sandbox/odf2docutils/tests/textSimple/expected/emphasis.xml
 create mode 100644 sandbox/odf2docutils/tests/textSimple/expected/italicAutomatic.xml

(limited to 'sandbox/odf2docutils/tests/textSimple/expected')

diff --git a/sandbox/odf2docutils/tests/textSimple/expected/emphasis.xml b/sandbox/odf2docutils/tests/textSimple/expected/emphasis.xml
new file mode 100644
index 000000000..7e3aab44a
--- /dev/null
+++ b/sandbox/odf2docutils/tests/textSimple/expected/emphasis.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE document PUBLIC "+//IDN docutils.sourceforge.net//DTD Docutils Generic//EN//XML" "http://docutils.sourceforge.net/docs/ref/docutils.dtd">
+<document source="input/emphasis.odt"><paragraph>One <emphasis>emphasis</emphasis> word.</paragraph></document>
diff --git a/sandbox/odf2docutils/tests/textSimple/expected/empty.xml b/sandbox/odf2docutils/tests/textSimple/expected/empty.xml
index 9984e1a84..4d73ace54 100644
--- a/sandbox/odf2docutils/tests/textSimple/expected/empty.xml
+++ b/sandbox/odf2docutils/tests/textSimple/expected/empty.xml
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE document PUBLIC "+//IDN docutils.sourceforge.net//DTD Docutils Generic//EN//XML" "http://docutils.sourceforge.net/docs/ref/docutils.dtd">
-<document><paragraph/></document>
+<document source="input/empty.odt"><paragraph/></document>
diff --git a/sandbox/odf2docutils/tests/textSimple/expected/italicAutomatic.xml b/sandbox/odf2docutils/tests/textSimple/expected/italicAutomatic.xml
new file mode 100644
index 000000000..588817902
--- /dev/null
+++ b/sandbox/odf2docutils/tests/textSimple/expected/italicAutomatic.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE document PUBLIC "+//IDN docutils.sourceforge.net//DTD Docutils Generic//EN//XML" "http://docutils.sourceforge.net/docs/ref/docutils.dtd">
+<document source="input/italicAutomatic.odt"><paragraph>One <emphasis>italic</emphasis> word.</paragraph></document>
diff --git a/sandbox/odf2docutils/tests/textSimple/expected/manyHeaders.xml b/sandbox/odf2docutils/tests/textSimple/expected/manyHeaders.xml
index f60bbba71..bcca7979e 100644
--- a/sandbox/odf2docutils/tests/textSimple/expected/manyHeaders.xml
+++ b/sandbox/odf2docutils/tests/textSimple/expected/manyHeaders.xml
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE document PUBLIC "+//IDN docutils.sourceforge.net//DTD Docutils Generic//EN//XML" "http://docutils.sourceforge.net/docs/ref/docutils.dtd">
-<document><section><title>H1 A</title><paragraph>P1 A</paragraph><section><title>H2 A.A</title><paragraph>P2 A.A.A</paragraph></section><section><title>H2 A.B</title><section><title>H3 A.B.A</title><paragraph>P3 A.B.A.A</paragraph></section><section><title>H3 A.B.B</title></section></section><section><title>H2 A.C</title></section></section><section><title>H1 B</title><section><title>H2 B.A</title><section><title>H3 B.A.A</title></section><section><title>H3 B.A.B</title></section><section><title>H3 B.A.C</title></section><section><title>H3 B.A.D</title></section><section><title>H3 B.A.E</title></section></section></section><section><title>H1 C</title><paragraph>P1 C</paragraph><section><title>H2 C.A</title></section><section><title>H2 C.B</title></section><section><title>H2 C.C</title></section><section><title>H2 C.D</title></section></section></document>
+<document source="input/manyHeaders.odt"><section><title>H1 A</title><paragraph>P1 A</paragraph><section><title>H2 A.A</title><paragraph>P2 A.A.A</paragraph></section><section><title>H2 A.B</title><section><title>H3 A.B.A</title><paragraph>P3 A.B.A.A</paragraph></section><section><title>H3 A.B.B</title></section></section><section><title>H2 A.C</title></section></section><section><title>H1 B</title><section><title>H2 B.A</title><section><title>H3 B.A.A</title></section><section><title>H3 B.A.B</title></section><section><title>H3 B.A.C</title></section><section><title>H3 B.A.D</title></section><section><title>H3 B.A.E</title></section></section></section><section><title>H1 C</title><paragraph>P1 C</paragraph><section><title>H2 C.A</title></section><section><title>H2 C.B</title></section><section><title>H2 C.C</title></section><section><title>H2 C.D</title></section></section></document>
diff --git a/sandbox/odf2docutils/tests/textSimple/expected/nestedHeader.xml b/sandbox/odf2docutils/tests/textSimple/expected/nestedHeader.xml
index 8970122de..aa9d608db 100644
--- a/sandbox/odf2docutils/tests/textSimple/expected/nestedHeader.xml
+++ b/sandbox/odf2docutils/tests/textSimple/expected/nestedHeader.xml
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE document PUBLIC "+//IDN docutils.sourceforge.net//DTD Docutils Generic//EN//XML" "http://docutils.sourceforge.net/docs/ref/docutils.dtd">
-<document><section><title>Level 1</title><paragraph>Content of level 1.</paragraph><section><title>Level 2</title><paragraph>Content of level 2.</paragraph></section></section></document>
+<document source="input/nestedHeader.odt"><section><title>Level 1</title><paragraph>Content of level 1.</paragraph><section><title>Level 2</title><paragraph>Content of level 2.</paragraph></section></section></document>
diff --git a/sandbox/odf2docutils/tests/textSimple/expected/nestedList.xml b/sandbox/odf2docutils/tests/textSimple/expected/nestedList.xml
index 68294d370..d80fd3b44 100644
--- a/sandbox/odf2docutils/tests/textSimple/expected/nestedList.xml
+++ b/sandbox/odf2docutils/tests/textSimple/expected/nestedList.xml
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE document PUBLIC "+//IDN docutils.sourceforge.net//DTD Docutils Generic//EN//XML" "http://docutils.sourceforge.net/docs/ref/docutils.dtd">
-<document><bullet_list bullet="*"><list_item><paragraph>First level</paragraph><bullet_list bullet="*"><list_item><paragraph>Second level</paragraph></list_item></bullet_list></list_item><list_item><paragraph>First again</paragraph><bullet_list bullet="*"><list_item><paragraph>Second again</paragraph></list_item><list_item><paragraph>Once more</paragraph><bullet_list bullet="*"><list_item><paragraph>Third level</paragraph><bullet_list bullet="*"><list_item><paragraph>And number four</paragraph></list_item></bullet_list></list_item></bullet_list></list_item><list_item><paragraph>Closing on second level</paragraph></list_item></bullet_list></list_item></bullet_list></document>
+<document source="input/nestedList.odt"><bullet_list bullet="*"><list_item><paragraph>First level</paragraph><bullet_list bullet="*"><list_item><paragraph>Second level</paragraph></list_item></bullet_list></list_item><list_item><paragraph>First again</paragraph><bullet_list bullet="*"><list_item><paragraph>Second again</paragraph></list_item><list_item><paragraph>Once more</paragraph><bullet_list bullet="*"><list_item><paragraph>Third level</paragraph><bullet_list bullet="*"><list_item><paragraph>And number four</paragraph></list_item></bullet_list></list_item></bullet_list></list_item><list_item><paragraph>Closing on second level</paragraph></list_item></bullet_list></list_item></bullet_list></document>
diff --git a/sandbox/odf2docutils/tests/textSimple/expected/oneHeader.xml b/sandbox/odf2docutils/tests/textSimple/expected/oneHeader.xml
index e716735f6..911e175c4 100644
--- a/sandbox/odf2docutils/tests/textSimple/expected/oneHeader.xml
+++ b/sandbox/odf2docutils/tests/textSimple/expected/oneHeader.xml
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE document PUBLIC "+//IDN docutils.sourceforge.net//DTD Docutils Generic//EN//XML" "http://docutils.sourceforge.net/docs/ref/docutils.dtd">
-<document><section><title>One header</title></section></document>
+<document source="input/oneHeader.odt"><section><title>One header</title></section></document>
diff --git a/sandbox/odf2docutils/tests/textSimple/expected/oneLine.xml b/sandbox/odf2docutils/tests/textSimple/expected/oneLine.xml
index 098829871..772c1d17a 100644
--- a/sandbox/odf2docutils/tests/textSimple/expected/oneLine.xml
+++ b/sandbox/odf2docutils/tests/textSimple/expected/oneLine.xml
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE document PUBLIC "+//IDN docutils.sourceforge.net//DTD Docutils Generic//EN//XML" "http://docutils.sourceforge.net/docs/ref/docutils.dtd">
-<document><paragraph>One line.</paragraph></document>
+<document source="input/oneLine.odt"><paragraph>One line.</paragraph></document>
diff --git a/sandbox/odf2docutils/tests/textSimple/expected/simpleList.xml b/sandbox/odf2docutils/tests/textSimple/expected/simpleList.xml
index d344de0a8..c6fae2a11 100644
--- a/sandbox/odf2docutils/tests/textSimple/expected/simpleList.xml
+++ b/sandbox/odf2docutils/tests/textSimple/expected/simpleList.xml
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE document PUBLIC "+//IDN docutils.sourceforge.net//DTD Docutils Generic//EN//XML" "http://docutils.sourceforge.net/docs/ref/docutils.dtd">
-<document><bullet_list bullet="*"><list_item><paragraph>First bullet</paragraph></list_item><list_item><paragraph>Second bullet</paragraph></list_item></bullet_list></document>
+<document source="input/simpleList.odt"><bullet_list bullet="*"><list_item><paragraph>First bullet</paragraph></list_item><list_item><paragraph>Second bullet</paragraph></list_item></bullet_list></document>
diff --git a/sandbox/odf2docutils/tests/textSimple/expected/twoHeaders.xml b/sandbox/odf2docutils/tests/textSimple/expected/twoHeaders.xml
index fc235e189..d251e136c 100644
--- a/sandbox/odf2docutils/tests/textSimple/expected/twoHeaders.xml
+++ b/sandbox/odf2docutils/tests/textSimple/expected/twoHeaders.xml
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE document PUBLIC "+//IDN docutils.sourceforge.net//DTD Docutils Generic//EN//XML" "http://docutils.sourceforge.net/docs/ref/docutils.dtd">
-<document><section><title>Level 1</title></section><section><title>Level 1 again</title></section></document>
+<document source="input/twoHeaders.odt"><section><title>Level 1</title></section><section><title>Level 1 again</title></section></document>
diff --git a/sandbox/odf2docutils/tests/textSimple/expected/twoParas.xml b/sandbox/odf2docutils/tests/textSimple/expected/twoParas.xml
index bac0ae1aa..393a03cc3 100644
--- a/sandbox/odf2docutils/tests/textSimple/expected/twoParas.xml
+++ b/sandbox/odf2docutils/tests/textSimple/expected/twoParas.xml
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE document PUBLIC "+//IDN docutils.sourceforge.net//DTD Docutils Generic//EN//XML" "http://docutils.sourceforge.net/docs/ref/docutils.dtd">
-<document><paragraph>First paragraph.</paragraph><paragraph>Second paragraph.</paragraph></document>
+<document source="input/twoParas.odt"><paragraph>First paragraph.</paragraph><paragraph>Second paragraph.</paragraph></document>
diff --git a/sandbox/odf2docutils/tests/textSimple/expected/wrongNestedHeader.xml b/sandbox/odf2docutils/tests/textSimple/expected/wrongNestedHeader.xml
index 2ff039bb9..d0817ad4b 100644
--- a/sandbox/odf2docutils/tests/textSimple/expected/wrongNestedHeader.xml
+++ b/sandbox/odf2docutils/tests/textSimple/expected/wrongNestedHeader.xml
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE document PUBLIC "+//IDN docutils.sourceforge.net//DTD Docutils Generic//EN//XML" "http://docutils.sourceforge.net/docs/ref/docutils.dtd">
-<document><section><title>Level 1</title><paragraph>Content of level 1.</paragraph></section><section><title>Level 2</title><paragraph>Content of level 2.</paragraph></section></document>
+<document source="input/wrongNestedHeader.odt"><section><title>Level 1</title><paragraph>Content of level 1.</paragraph></section><section><title>Level 2</title><paragraph>Content of level 2.</paragraph></section></document>
diff --git a/sandbox/odf2docutils/tests/textSimple/expected/wrongNesting.xml b/sandbox/odf2docutils/tests/textSimple/expected/wrongNesting.xml
index b471597f0..3a1b33b3d 100644
--- a/sandbox/odf2docutils/tests/textSimple/expected/wrongNesting.xml
+++ b/sandbox/odf2docutils/tests/textSimple/expected/wrongNesting.xml
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE document PUBLIC "+//IDN docutils.sourceforge.net//DTD Docutils Generic//EN//XML" "http://docutils.sourceforge.net/docs/ref/docutils.dtd">
-<document><bullet_list bullet="*"><list_item><paragraph>First level</paragraph><bullet_list bullet="*"><list_item><paragraph>Second level</paragraph></list_item></bullet_list></list_item></bullet_list><bullet_list bullet="*"><list_item><bullet_list bullet="*"><list_item><paragraph>Second but restarted</paragraph></list_item></bullet_list></list_item></bullet_list></document>
+<document source="input/wrongNesting.odt"><bullet_list bullet="*"><list_item><paragraph>First level</paragraph><bullet_list bullet="*"><list_item><paragraph>Second level</paragraph></list_item></bullet_list></list_item></bullet_list><bullet_list bullet="*"><list_item><bullet_list bullet="*"><list_item><paragraph>Second but restarted</paragraph></list_item></bullet_list></list_item></bullet_list></document>
diff --git a/sandbox/odf2docutils/tests/textSimple/expected/wrongerNesting.xml b/sandbox/odf2docutils/tests/textSimple/expected/wrongerNesting.xml
index 95af877ff..1a1b93ecd 100644
--- a/sandbox/odf2docutils/tests/textSimple/expected/wrongerNesting.xml
+++ b/sandbox/odf2docutils/tests/textSimple/expected/wrongerNesting.xml
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE document PUBLIC "+//IDN docutils.sourceforge.net//DTD Docutils Generic//EN//XML" "http://docutils.sourceforge.net/docs/ref/docutils.dtd">
-<document><bullet_list bullet="*"><list_item><paragraph>First level</paragraph><bullet_list bullet="*"><list_item><paragraph>Second level</paragraph></list_item></bullet_list></list_item></bullet_list><bullet_list bullet="*"><list_item><bullet_list bullet="*"><list_item><paragraph>Second but restarted</paragraph></list_item></bullet_list></list_item><list_item><paragraph>First again</paragraph></list_item></bullet_list></document>
+<document source="input/wrongerNesting.odt"><bullet_list bullet="*"><list_item><paragraph>First level</paragraph><bullet_list bullet="*"><list_item><paragraph>Second level</paragraph></list_item></bullet_list></list_item></bullet_list><bullet_list bullet="*"><list_item><bullet_list bullet="*"><list_item><paragraph>Second but restarted</paragraph></list_item></bullet_list></list_item><list_item><paragraph>First again</paragraph></list_item></bullet_list></document>
-- 
cgit v1.2.1