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

merge with regrebo/sphinx (PR#151)

Browse Source
This commit is contained in:
Georg Brandl 2013-09-16 04:15:41 +02:00
commit b672e51f0e
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
sphinx/writers/latex.py
View File

@ -700,16 +700,15 @@ class LaTeXTranslator(nodes.NodeVisitor):
self.body.extend(self.tableheaders) 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'{{\textsf{\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.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|}{{\textsf{%s}}} \\ \hline'
% (self.table.colcount, % (self.table.colcount,
_('Continued on next page'))) _('Continued on next page')))
self.body.append('\n\\endfoot\n\n') self.body.append('\n\\endfoot\n\n')
self.body.append('\\hline\n')
self.body.append('\\endlastfoot\n\n') self.body.append('\\endlastfoot\n\n')
else: else:
self.body.append('\\hline\n') self.body.append('\\hline\n')
@ -739,23 +738,21 @@ class LaTeXTranslator(nodes.NodeVisitor):
# Redirect head output until header is finished. see visit_tbody. # Redirect head output until header is finished. see visit_tbody.
self.body = self.tableheaders self.body = self.tableheaders
def depart_thead(self, node): def depart_thead(self, node):
pass self.body.append('\\hline')
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 self.body = self.tablebody
def depart_tbody(self, node): def depart_tbody(self, node):
pass self.body.append('\\hline')
def visit_row(self, node): def visit_row(self, node):
self.table.col = 0 self.table.col = 0
def depart_row(self, node): def depart_row(self, node):
if self.previous_spanning_row == 1: if self.previous_spanning_row == 1:
self.previous_spanning_row = 0 self.previous_spanning_row = 0
self.body.append('\\\\\n') self.body.append('\\\\\n')
else:
self.body.append('\\\\\\hline\n')
self.table.rowcount += 1 self.table.rowcount += 1
def visit_entry(self, node): def visit_entry(self, node):
@ -782,8 +779,10 @@ class LaTeXTranslator(nodes.NodeVisitor):
self.body.append('}{l|}{') self.body.append('}{l|}{')
context += '}' context += '}'
if isinstance(node.parent.parent, nodes.thead): if isinstance(node.parent.parent, nodes.thead):
self.body.append('\\textbf{\\relax ') self.body.append('\\textsf{\\relax ')
context += '}' else:
self.body.append('\\footnotesize{')
context += '}'
if self.remember_multirow.get(self.table.col + 1, 0) > 1: if self.remember_multirow.get(self.table.col + 1, 0) > 1:
self.remember_multirow[self.table.col + 1] -= 1 self.remember_multirow[self.table.col + 1] -= 1
context += ' & ' context += ' & '