diff --git a/test/python/headers.qbk b/test/python/headers.qbk
deleted file mode 100644
index e9817a3..0000000
--- a/test/python/headers.qbk
+++ /dev/null
@@ -1,5 +0,0 @@
-[quickbook 1.6]
-[article Headers]
-
-[h1 A]
-[heading B]
diff --git a/test/python/headers.xml b/test/python/headers.xml
deleted file mode 100644
index 3fb2b0d..0000000
--- a/test/python/headers.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
- Headers
-
- A
-
-
- B
-
-
diff --git a/test/python/headers_no_self_linked.xml b/test/python/headers_no_self_linked.xml
deleted file mode 100644
index 260be27..0000000
--- a/test/python/headers_no_self_linked.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
- Headers
-
- A
-
-
- B
-
-
diff --git a/test/python/run_tests.py b/test/python/run_tests.py
index 14e38d9..0dd2f09 100644
--- a/test/python/run_tests.py
+++ b/test/python/run_tests.py
@@ -32,13 +32,19 @@ def main(args, directory):
locations_gold = 'include_glob_locs.txt',
input_path = ['sub1', 'sub2'])
- # Headers tests
+ # Try building a simple document with various flags.
- failures += run_quickbook(quickbook_command, 'headers.qbk',
- output_gold = 'headers.xml')
- failures += run_quickbook(quickbook_command, 'headers.qbk',
+ failures += run_quickbook(quickbook_command, 'simple.qbk',
+ output_gold = 'simple.xml')
+ failures += run_quickbook(quickbook_command, 'simple.qbk',
extra_flags = ['--no-self-linked-headers'],
- output_gold = 'headers_no_self_linked.xml')
+ output_gold = 'simple_no_self_linked.xml')
+ failures += run_quickbook(quickbook_command, 'simple.qbk',
+ extra_flags = ['--no-pretty-print'],
+ output_gold = 'simple_no_pretty_print.xml')
+ failures += run_quickbook(quickbook_command, 'simple.qbk',
+ extra_flags = ['--indent','4','--linewidth','60'],
+ output_gold = 'simple_custom_pretty_print.xml')
if failures == 0:
print "Success"
diff --git a/test/python/simple.qbk b/test/python/simple.qbk
new file mode 100644
index 0000000..a7a1661
--- /dev/null
+++ b/test/python/simple.qbk
@@ -0,0 +1,12 @@
+[quickbook 1.6]
+[article Simple Test Article]
+
+[section:one One]
+
+[h1 A]
+
+Lorem ipsum dolor. Sit amet quis hendrerit pretium massa. Et imperdiet sit luctus et nam. Eget neque vivamus nec aliquam vestibulum. Venenatis id penatibus. Rutrum lobortis tempora. Turpis cras imperdiet. Quis parturient quam sed non libero donec in ut aliquam aliquam purus maecenas con dolor in est felis lorem amet vel. Risus mauris felis. Libero felis fringilla. Sed cursus metus dolor iaculis eget sit ac commodo. Molestie interdum nunc. Erat auctor suscipit. Turpis quisque nonummy. Integer vestibulum vivamus vulputate euismod et sed pretium urna metus scelerisque urna massa vestibulum neque.
+
+[heading B]
+
+[endsect]
diff --git a/test/python/simple.xml b/test/python/simple.xml
new file mode 100644
index 0000000..ac4239f
--- /dev/null
+++ b/test/python/simple.xml
@@ -0,0 +1,25 @@
+
+
+
+ Simple Test Article
+
+ One
+
+ A
+
+
+ Lorem ipsum dolor. Sit amet quis hendrerit pretium massa. Et imperdiet sit
+ luctus et nam. Eget neque vivamus nec aliquam vestibulum. Venenatis id penatibus.
+ Rutrum lobortis tempora. Turpis cras imperdiet. Quis parturient quam sed non
+ libero donec in ut aliquam aliquam purus maecenas con dolor in est felis lorem
+ amet vel. Risus mauris felis. Libero felis fringilla. Sed cursus metus dolor
+ iaculis eget sit ac commodo. Molestie interdum nunc. Erat auctor suscipit.
+ Turpis quisque nonummy. Integer vestibulum vivamus vulputate euismod et sed
+ pretium urna metus scelerisque urna massa vestibulum neque.
+
+
+ B
+
+
+
diff --git a/test/python/simple_custom_pretty_print.xml b/test/python/simple_custom_pretty_print.xml
new file mode 100644
index 0000000..b3502c0
--- /dev/null
+++ b/test/python/simple_custom_pretty_print.xml
@@ -0,0 +1,30 @@
+
+
+
+ Simple Test Article
+
+ One
+
+ A
+
+
+ Lorem ipsum dolor. Sit amet quis hendrerit pretium
+ massa. Et imperdiet sit luctus et nam. Eget neque
+ vivamus nec aliquam vestibulum. Venenatis id penatibus.
+ Rutrum lobortis tempora. Turpis cras imperdiet. Quis
+ parturient quam sed non libero donec in ut aliquam
+ aliquam purus maecenas con dolor in est felis lorem
+ amet vel. Risus mauris felis. Libero felis fringilla.
+ Sed cursus metus dolor iaculis eget sit ac commodo.
+ Molestie interdum nunc. Erat auctor suscipit. Turpis
+ quisque nonummy. Integer vestibulum vivamus vulputate
+ euismod et sed pretium urna metus scelerisque urna
+ massa vestibulum neque.
+
+
+ B
+
+
+
diff --git a/test/python/simple_no_pretty_print.xml b/test/python/simple_no_pretty_print.xml
new file mode 100644
index 0000000..adc2521
--- /dev/null
+++ b/test/python/simple_no_pretty_print.xml
@@ -0,0 +1,18 @@
+
+
+
+ Simple Test Article
+
+
+
+
+One
+A
+Lorem ipsum dolor. Sit amet quis hendrerit pretium massa. Et imperdiet sit luctus et nam. Eget neque vivamus nec aliquam vestibulum. Venenatis id penatibus. Rutrum lobortis tempora. Turpis cras imperdiet. Quis parturient quam sed non libero donec in ut aliquam aliquam purus maecenas con dolor in est felis lorem amet vel. Risus mauris felis. Libero felis fringilla. Sed cursus metus dolor iaculis eget sit ac commodo. Molestie interdum nunc. Erat auctor suscipit. Turpis quisque nonummy. Integer vestibulum vivamus vulputate euismod et sed pretium urna metus scelerisque urna massa vestibulum neque.
+B
+
+
diff --git a/test/python/simple_no_self_linked.xml b/test/python/simple_no_self_linked.xml
new file mode 100644
index 0000000..490e1f2
--- /dev/null
+++ b/test/python/simple_no_self_linked.xml
@@ -0,0 +1,25 @@
+
+
+
+ Simple Test Article
+
+ One
+
+ A
+
+
+ Lorem ipsum dolor. Sit amet quis hendrerit pretium massa. Et imperdiet sit
+ luctus et nam. Eget neque vivamus nec aliquam vestibulum. Venenatis id penatibus.
+ Rutrum lobortis tempora. Turpis cras imperdiet. Quis parturient quam sed non
+ libero donec in ut aliquam aliquam purus maecenas con dolor in est felis lorem
+ amet vel. Risus mauris felis. Libero felis fringilla. Sed cursus metus dolor
+ iaculis eget sit ac commodo. Molestie interdum nunc. Erat auctor suscipit.
+ Turpis quisque nonummy. Integer vestibulum vivamus vulputate euismod et sed
+ pretium urna metus scelerisque urna massa vestibulum neque.
+
+
+ B
+
+
+