1 files changed, 81 insertions, 16 deletions
diff --git a/sandbox/code-block-directive/docs/myfunction.py.pseudoxml b/sandbox/code-block-directive/docs/myfunction.py.pseudoxml
index 04bd2cb05..cf21d2eab 100644
--- a/sandbox/code-block-directive/docs/myfunction.py.pseudoxml
+++ b/sandbox/code-block-directive/docs/myfunction.py.pseudoxml
@@ -2,22 +2,91 @@
     <paragraph>
         This is a test of the new "code" directive:
     <comment xml:space="preserve">
-        Translate this document to HTML with a pygments enhanced frontend, e.g.
+        Translate this document with a pygments enhanced frontend, e.g.
         
-        ../rst2html-highlight.py --stylesheet=../data/pygments-default.css
+         ../rst2html-highlight.py --stylesheet=../data/pygments-default.css
+         ../rst2latex-highlight.py --stylesheet=../data/pygments-docutilsroles.sty
         
-        ../rst2latex-highlight.py --stylesheet=../data/pygments-docutilsroles.sty
+        or via the test case in
         
-        ../rst2pseudoxml-highlight.py
+         ../pygments_code_block_directive.py --traceback
     <paragraph>
         The example from Docutils TODO list:
-    <literal_block classes="code pythonsi" xml:space="preserve">
-        print 'This is Python code.'
-           for i in range(10):
-               print i
+    <literal_block classes="code python" xml:space="preserve">
+        <inline classes="k">
+            print
+         
+        <inline classes="s">
+            'This is Python code.'
+        
+        <inline classes="k">
+            for
+         
+        <inline classes="n">
+            i
+         
+        <inline classes="ow">
+            in
+         
+        <inline classes="nb">
+            range
+        <inline classes="p">
+            (
+        <inline classes="mi">
+            10
+        <inline classes="p">
+            ):
+        
+            
+        <inline classes="k">
+            print
+         
+        <inline classes="n">
+            i
+    <paragraph>
+        Numbered lines:
+    <literal_block classes="code python" xml:space="preserve">
+        <inline classes="ln">
+            1 
+        <inline classes="c">
+            # This is Python code,
+        
+        <inline classes="ln">
+            2 
+        <inline classes="c">
+            # that prints the integers from 0 to 9
+        
+        <inline classes="ln">
+            3 
+        <inline classes="k">
+            for
+         
+        <inline classes="n">
+            i
+         
+        <inline classes="ow">
+            in
+         
+        <inline classes="nb">
+            range
+        <inline classes="p">
+            (
+        <inline classes="mi">
+            10
+        <inline classes="p">
+            ):
+        
+        <inline classes="ln">
+            4 
+            
+        <inline classes="k">
+            print
+         
+        <inline classes="n">
+            i
     <paragraph>
         Another example:
-    <literal_block classes="code python silly" ids="my-function" names="my-function" xml:space="preserve">
+    <literal_block classes="code python silly" ids="my-function" names="my_function" xml:space="preserve">
         <inline classes="ln">
              7 
         <inline classes="k">
@@ -36,23 +105,19 @@
         <inline classes="ln">
              9 
         <inline classes="sd">
-            
+                """
+        
         <inline classes="ln">
             10 
-        <inline classes="sd">
-                just a test"""
         
         <inline classes="ln">
             11 
-        
-        <inline classes="ln">
-            12 
             
         <inline classes="c">
             # and now for something completely different
         
         <inline classes="ln">
-            13 
+            12 
             
         <inline classes="k">
             print