[Docutils-checkins] r5049 - in trunk/docutils: HISTORY.txt docutils/writers/latex2e/__init__.py

[<gr...@us...>]

Author: grubert
Date: 2007-04-18 16:02:16 +0200 (Wed, 18 Apr 2007)
New Revision: 5049

Modified:
   trunk/docutils/HISTORY.txt
   trunk/docutils/docutils/writers/latex2e/__init__.py
Log:
Add simply support for nested tables.


Modified: trunk/docutils/HISTORY.txt
===================================================================
--- trunk/docutils/HISTORY.txt	2007-04-18 11:27:47 UTC (rev 5048)
+++ trunk/docutils/HISTORY.txt	2007-04-18 14:02:16 UTC (rev 5049)
@@ -116,6 +116,7 @@
 
 * docutils/writers/latex2e/__init__.py:
 
+  - Add simply support for nested tables.
   - Fix verbatim in tables if use-verbatim-when-possible.
   - Use section commands down to subparagraph.
   - Put ensuremath around some latin1 chars.

Modified: trunk/docutils/docutils/writers/latex2e/__init__.py
===================================================================
--- trunk/docutils/docutils/writers/latex2e/__init__.py	2007-04-18 11:27:47 UTC (rev 5048)
+++ trunk/docutils/docutils/writers/latex2e/__init__.py	2007-04-18 14:02:16 UTC (rev 5049)
@@ -478,7 +478,8 @@
         #    a.append('\\hline\n')
         if self._table_style == 'booktabs':
             a.append('\\midrule\n')
-        a.append('\\endhead\n')
+        if self._latex_type == 'longtable':
+            a.append('\\endhead\n')
         # for longtable one could add firsthead, foot and lastfoot
         self._in_thead = 0
         return a
@@ -598,6 +599,7 @@
 
         self.d_class = DocumentClass(settings.documentclass)
         # object for a table while proccessing.
+        self.table_stack = []
         self.active_table = Table('longtable',settings.table_style)
 
         # HACK.  Should have more sophisticated typearea handling.
@@ -1911,8 +1913,9 @@
 
     def visit_table(self, node):
         if self.active_table.is_open():
-            print 'nested tables are not supported'
-            raise AssertionError
+            self.table_stack.append(self.active_table)
+            # nesting longtable does not work (e.g. 2007-04-18)
+            self.active_table = Table('tabular',self.settings.table_style)
         self.active_table.open()
         for cl in node['classes']:
             self.active_table.set_table_style(cl)
@@ -1921,7 +1924,10 @@
     def depart_table(self, node):
         self.body.append(self.active_table.get_closing() + '\n')
         self.active_table.close()
-        self.active_table.set_table_style(self.settings.table_style)
+        if len(self.table_stack)>0:
+            self.active_table = self.table_stack.pop()
+        else:
+            self.active_table.set_table_style(self.settings.table_style)
 
     def visit_target(self, node):
         # BUG: why not (refuri or refid or refname) means not footnote ?