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

Code style fixes.

Browse Source
This commit is contained in:
Georg Brandl
2011-09-17 21:05:12 +02:00
parent 1d59011ce6
commit 896b575cdc
2 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sphinx/writers/latex.py
View File

@@ -727,7 +727,7 @@ class LaTeXTranslator(nodes.NodeVisitor):
self.table.rowcount += 1
def visit_entry(self, node):
if self.remember_multirow.has_key('0') and self.remember_multirow['0'] > 1:
if self.remember_multirow.get(0, 0) > 1:
self.body.append(' & ')
if self.table.col > 0:
self.body.append(' & ')
@@ -739,7 +739,7 @@ class LaTeXTranslator(nodes.NodeVisitor):
self.body.append(str(node.get('morerows') + 1))
self.body.append('}{*}{')
self.context.append('}')
self.remember_multirow[str(self.table.col)] = node.get('morerows') + 1;
self.remember_multirow[self.table.col] = node.get('morerows') + 1
if 'morecols' in node:
self.body.append(' \multicolumn{')
self.body.append(str(node.get('morecols') + 1))
@@ -751,8 +751,8 @@ class LaTeXTranslator(nodes.NodeVisitor):
if isinstance(node.parent.parent, nodes.thead):
self.body.append('\\textbf{')
self.context.append('}')
if self.remember_multirow.has_key(str(self.table.col + 1)) and self.remember_multirow[str(self.table.col + 1)] > 1:
self.remember_multirow[str(self.table.col + 1)] -= 1
if self.remember_multirow.get(self.table.col + 1, 0) > 1:
self.remember_multirow[self.table.col + 1] -= 1
self.context.append(' & ')
def depart_entry(self, node):
self.body.append(self.context.pop()) # header

10
tests/root/markup.txt
View File

@@ -169,6 +169,16 @@ Tables
| 2 | Empty cells: | |
+----+----------------+----+
Table with multicol:
+----+---------------------+
| 1 | test! |
+----+---------+------+----+
| 2 | col | col | c |
| y +---------+------+----+
| x | test |
+----+---------------------+
Figures
-------