IntenseWebs/sphinx
3
0
Fork 0
mirror of https://github.com/sphinx-doc/sphinx.git synced 2025-02-25 18:55:22 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merged in shino/sphinx (pull request #23)

Browse Source
This commit is contained in:
Georg Brandl 2011-09-22 09:08:14 +02:00
commit 3d93b326f7
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sphinx/writers/latex.py
View File

@ -626,6 +626,7 @@ class LaTeXTranslator(nodes.NodeVisitor):
self.table = Table() self.table = Table()
self.table.longtable = 'longtable' in node['classes'] self.table.longtable = 'longtable' in node['classes']
self.tablebody = [] self.tablebody = []
self.tableheaders = []
# Redirect body output until table is finished. # Redirect body output until table is finished.
self._body = self.body self._body = self.body
self.body = self.tablebody self.body = self.tablebody
@ -670,11 +671,13 @@ class LaTeXTranslator(nodes.NodeVisitor):
self.next_table_ids.clear() self.next_table_ids.clear()
if self.table.longtable: if self.table.longtable:
self.body.append('\\hline\n') self.body.append('\\hline\n')
self.body.extend(self.tableheaders)
self.body.append('\\endfirsthead\n\n') self.body.append('\\endfirsthead\n\n')
self.body.append('\\multicolumn{%s}{c}%%\n' % self.table.colcount) self.body.append('\\multicolumn{%s}{c}%%\n' % self.table.colcount)
self.body.append(r'{{\bfseries \tablename\ \thetable{} -- %s}} \\' self.body.append(r'{{\bfseries \tablename\ \thetable{} -- %s}} \\'
% _('continued from previous page')) % _('continued from previous page'))
self.body.append('\n\\hline\n') self.body.append('\n\\hline\n')
self.body.extend(self.tableheaders)
self.body.append('\\endhead\n\n') self.body.append('\\endhead\n\n')
self.body.append(ur'\hline \multicolumn{%s}{|r|}{{%s}} \\ \hline' self.body.append(ur'\hline \multicolumn{%s}{|r|}{{%s}} \\ \hline'
% (self.table.colcount, % (self.table.colcount,
@ -684,6 +687,7 @@ class LaTeXTranslator(nodes.NodeVisitor):
self.body.append('\\endlastfoot\n\n') self.body.append('\\endlastfoot\n\n')
else: else:
self.body.append('\\hline\n') self.body.append('\\hline\n')
self.body.extend(self.tableheaders)
self.body.extend(self.tablebody) self.body.extend(self.tablebody)
self.body.append(endmacro) self.body.append(endmacro)
if not self.table.longtable and self.table.caption is not None: if not self.table.longtable and self.table.caption is not None:
@ -702,17 +706,19 @@ class LaTeXTranslator(nodes.NodeVisitor):
pass pass
def visit_thead(self, node): def visit_thead(self, node):
self.table.had_head = True
if self.next_table_colspec: if self.next_table_colspec:
self.table.colspec = '{%s}\n' % self.next_table_colspec self.table.colspec = '{%s}\n' % self.next_table_colspec
self.next_table_colspec = None self.next_table_colspec = None
# self.body.append('\\hline\n') # Redirect head output until header is finished. see visit_tbody.
# self.table.had_head = True self.body = self.tableheaders
def depart_thead(self, node): def depart_thead(self, node):
pass pass
def visit_tbody(self, node): def visit_tbody(self, node):
if not self.table.had_head: if not self.table.had_head:
self.visit_thead(node) self.visit_thead(node)
self.body = self.tablebody
def depart_tbody(self, node): def depart_tbody(self, node):
pass pass