Fixed the multiple-line table issue. Also increased version number slightly.

DinoZAR · DinoZAR · commit fb0cff451716 · 2013-11-13T13:25:43.000-08:00
diff --git a/src/docx/paragraph.py b/src/docx/paragraph.py
@@ -153,9 +153,12 @@ def parseTable(elem, otherData):
             
             # Column contents
             if child.tag == '{0}tc'.format(w_NS):
-                # Get the paragraph in there
-                myP = child.find('./{0}p'.format(w_NS))
-                rowData['columns'].append(parseParagraph(myP, otherData))
+                # Get the paragraphs in there
+                paras = child.findall('./{0}p'.format(w_NS))
+                myParas = []
+                for p in paras:
+                    myParas.append(parseParagraph(p, otherData))
+                rowData['columns'].append(myParas)
                 
         parseData['rows'].append(rowData)
         
@@ -398,7 +401,9 @@ def _generateTableHTMLNode(t):
          
         for c in r['columns']:
             cRoot = etree.SubElement(rRoot, 'td')
-            cRoot.append(c)
+            for p in c:
+                print 'Paragraph!', p
+                cRoot.append(p)
              
     return tRoot
  
diff --git a/src/gui/download_progress.py b/src/gui/download_progress.py
@@ -139,7 +139,7 @@ def chunkRead(self, response, reportHook, chunkSize=4096):
                 while not self._stop:
                     print 'update_download: restarting connection...'
                     try:
-                        response = urllib2.urlopen(self._url, timeout=0.5)
+                        response = urllib2.urlopen(self._url, timeout=5.0)
                         size = int(response.info().getheader('Content-Length').strip())
                         numBytes = 0
                         contents = ''
diff --git a/src/parsetab.py b/src/parsetab.py
@@ -57,62 +57,3 @@
   ('attribute -> ID ASSIGNS LITERAL','attribute',3,'p_attribute','W:\\Nifty Prose Articulator\\workspace\\nifty-prose-articulator\\src\\mathml_fast\\database_parser.py',216),
   ('output -> STRING','output',1,'p_output','W:\\Nifty Prose Articulator\\workspace\\nifty-prose-articulator\\src\\mathml_fast\\database_parser.py',222),
 ]
-
-# parsetab.py
-# This file is automatically generated. Do not edit.
-_tabversion = '3.2'
-
-_lr_method = 'LALR'
-
-_lr_signature = '\xe3<\xb5\x87\x06!d\xe0\xb1D\xcf-v\x948\xe6'
-    
-_lr_action_items = {'RIGHTBRACKET':([24,25,26,42,],[32,-21,-22,-20,]),'MULTIEXPR':([10,14,15,16,17,18,19,21,22,23,27,30,32,37,44,50,52,54,],[15,-11,-16,-17,-15,-14,-12,15,-18,-13,15,15,-19,-26,-25,15,-24,-23,]),'ASSIGNS':([5,7,12,32,41,],[10,-18,27,-19,47,]),'MULTINUMBEREDEXPR':([10,14,15,16,17,18,19,21,22,23,27,30,32,37,44,50,52,54,],[16,-11,-16,-17,-15,-14,-12,16,-18,-13,16,16,-19,-26,-25,16,-24,-23,]),'ANYEXPR':([10,14,15,16,17,18,19,21,22,23,27,30,32,37,44,50,52,54,],[17,-11,-16,-17,-15,-14,-12,17,-18,-13,17,17,-19,-26,-25,17,-24,-23,]),'OUTPUTS':([14,15,16,17,18,19,20,21,22,23,29,32,34,37,44,52,54,],[-11,-16,-17,-15,-14,-12,28,-10,-18,-13,-9,-19,43,-26,-25,-24,-23,]),'LEFTPAREN':([22,46,],[30,50,]),'LEFTCARET':([22,],[31,]),'LITERAL':([10,14,15,16,17,18,19,21,22,23,27,30,32,37,44,47,50,52,54,],[18,-11,-16,-17,-15,-14,-12,18,-18,-13,18,18,-19,-26,-25,51,18,-24,-23,]),'RIGHTPAREN':([14,15,16,17,18,19,21,22,23,29,30,32,37,38,44,50,52,53,54,],[-11,-16,-17,-15,-14,-12,-10,-18,-13,-9,37,-19,-26,44,-25,52,-24,54,-23,]),'LEFTBRACKET':([5,7,10,14,15,16,17,18,19,21,22,23,27,30,32,37,44,50,52,54,],[11,-18,11,-11,-16,-17,-15,-14,-12,11,-18,-13,11,11,-19,-26,-25,11,-24,-23,]),'RIGHTCARET':([39,40,49,51,],[-28,46,-27,-29,]),'IMPORT':([0,2,6,9,35,36,48,],[4,4,4,-6,-30,-8,-7,]),'STRING':([28,43,],[35,35,]),'COMMA':([25,26,39,51,],[33,-22,45,-29,]),'ID':([0,2,4,6,9,10,11,14,15,16,17,18,19,21,22,23,27,30,31,32,33,35,36,37,44,45,48,50,52,54,],[7,7,9,7,-6,22,26,-11,-16,-17,-15,-14,-12,22,-18,-13,22,22,41,-19,26,-30,-8,-26,-25,41,-7,22,-24,-23,]),'$end':([1,2,3,6,8,9,13,35,36,48,],[0,-4,-1,-5,-2,-6,-3,-30,-8,-7,]),}
-
-_lr_action = { }
-for _k, _v in _lr_action_items.items():
-   for _x,_y in zip(_v[0],_v[1]):
-      if not _x in _lr_action:  _lr_action[_x] = { }
-      _lr_action[_x][_k] = _y
-del _lr_action_items
-
-_lr_goto_items = {'xml':([10,21,27,30,50,],[14,14,14,14,14,]),'database':([0,],[1,]),'pattern':([0,2,6,],[2,2,2,]),'attribute':([31,45,],[39,39,]),'categValues':([11,33,],[24,42,]),'categValue':([11,33,],[25,25,]),'patterns':([0,2,6,],[3,8,13,]),'output':([28,43,],[36,48,]),'variable':([0,2,6,10,21,27,30,50,],[5,5,5,19,19,19,19,19,]),'import':([0,2,6,],[6,6,6,]),'expressions':([10,21,27,30,50,],[20,29,34,38,53,]),'attributes':([31,45,],[40,49,]),'expression':([10,21,27,30,50,],[21,21,21,21,21,]),'categories':([5,10,21,27,30,50,],[12,23,23,23,23,23,]),}
-
-_lr_goto = { }
-for _k, _v in _lr_goto_items.items():
-   for _x,_y in zip(_v[0],_v[1]):
-       if not _x in _lr_goto: _lr_goto[_x] = { }
-       _lr_goto[_x][_k] = _y
-del _lr_goto_items
-_lr_productions = [
-  ("S' -> database","S'",1,None,None,None),
-  ('database -> patterns','database',1,'p_database','C:\\Users\\GraffeS.PC93666W7\\Desktop\\workspace\\nifty-prose-articulator\\src\\mathml_fast\\database_parser.py',83),
-  ('patterns -> pattern patterns','patterns',2,'p_patterns','C:\\Users\\GraffeS.PC93666W7\\Desktop\\workspace\\nifty-prose-articulator\\src\\mathml_fast\\database_parser.py',89),
-  ('patterns -> import patterns','patterns',2,'p_patterns','C:\\Users\\GraffeS.PC93666W7\\Desktop\\workspace\\nifty-prose-articulator\\src\\mathml_fast\\database_parser.py',90),
-  ('patterns -> pattern','patterns',1,'p_patterns','C:\\Users\\GraffeS.PC93666W7\\Desktop\\workspace\\nifty-prose-articulator\\src\\mathml_fast\\database_parser.py',91),
-  ('patterns -> import','patterns',1,'p_patterns','C:\\Users\\GraffeS.PC93666W7\\Desktop\\workspace\\nifty-prose-articulator\\src\\mathml_fast\\database_parser.py',92),
-  ('import -> IMPORT ID','import',2,'p_import','C:\\Users\\GraffeS.PC93666W7\\Desktop\\workspace\\nifty-prose-articulator\\src\\mathml_fast\\database_parser.py',103),
-  ('pattern -> variable categories ASSIGNS expressions OUTPUTS output','pattern',6,'p_pattern','C:\\Users\\GraffeS.PC93666W7\\Desktop\\workspace\\nifty-prose-articulator\\src\\mathml_fast\\database_parser.py',109),
-  ('pattern -> variable ASSIGNS expressions OUTPUTS output','pattern',5,'p_pattern','C:\\Users\\GraffeS.PC93666W7\\Desktop\\workspace\\nifty-prose-articulator\\src\\mathml_fast\\database_parser.py',110),
-  ('expressions -> expression expressions','expressions',2,'p_expressions','C:\\Users\\GraffeS.PC93666W7\\Desktop\\workspace\\nifty-prose-articulator\\src\\mathml_fast\\database_parser.py',121),
-  ('expressions -> expression','expressions',1,'p_expressions','C:\\Users\\GraffeS.PC93666W7\\Desktop\\workspace\\nifty-prose-articulator\\src\\mathml_fast\\database_parser.py',122),
-  ('expression -> xml','expression',1,'p_expression','C:\\Users\\GraffeS.PC93666W7\\Desktop\\workspace\\nifty-prose-articulator\\src\\mathml_fast\\database_parser.py',137),
-  ('expression -> variable','expression',1,'p_expression','C:\\Users\\GraffeS.PC93666W7\\Desktop\\workspace\\nifty-prose-articulator\\src\\mathml_fast\\database_parser.py',138),
-  ('expression -> categories','expression',1,'p_expression','C:\\Users\\GraffeS.PC93666W7\\Desktop\\workspace\\nifty-prose-articulator\\src\\mathml_fast\\database_parser.py',139),
-  ('expression -> LITERAL','expression',1,'p_expression','C:\\Users\\GraffeS.PC93666W7\\Desktop\\workspace\\nifty-prose-articulator\\src\\mathml_fast\\database_parser.py',140),
-  ('expression -> ANYEXPR','expression',1,'p_expression','C:\\Users\\GraffeS.PC93666W7\\Desktop\\workspace\\nifty-prose-articulator\\src\\mathml_fast\\database_parser.py',141),
-  ('expression -> MULTIEXPR','expression',1,'p_expression','C:\\Users\\GraffeS.PC93666W7\\Desktop\\workspace\\nifty-prose-articulator\\src\\mathml_fast\\database_parser.py',142),
-  ('expression -> MULTINUMBEREDEXPR','expression',1,'p_expression','C:\\Users\\GraffeS.PC93666W7\\Desktop\\workspace\\nifty-prose-articulator\\src\\mathml_fast\\database_parser.py',143),
-  ('variable -> ID','variable',1,'p_variable','C:\\Users\\GraffeS.PC93666W7\\Desktop\\workspace\\nifty-prose-articulator\\src\\mathml_fast\\database_parser.py',152),
-  ('categories -> LEFTBRACKET categValues RIGHTBRACKET','categories',3,'p_categories','C:\\Users\\GraffeS.PC93666W7\\Desktop\\workspace\\nifty-prose-articulator\\src\\mathml_fast\\database_parser.py',159),
-  ('categValues -> categValue COMMA categValues','categValues',3,'p_categValues','C:\\Users\\GraffeS.PC93666W7\\Desktop\\workspace\\nifty-prose-articulator\\src\\mathml_fast\\database_parser.py',166),
-  ('categValues -> categValue','categValues',1,'p_categValues','C:\\Users\\GraffeS.PC93666W7\\Desktop\\workspace\\nifty-prose-articulator\\src\\mathml_fast\\database_parser.py',167),
-  ('categValue -> ID','categValue',1,'p_categValue','C:\\Users\\GraffeS.PC93666W7\\Desktop\\workspace\\nifty-prose-articulator\\src\\mathml_fast\\database_parser.py',180),
-  ('xml -> ID LEFTCARET attributes RIGHTCARET LEFTPAREN expressions RIGHTPAREN','xml',7,'p_xml','C:\\Users\\GraffeS.PC93666W7\\Desktop\\workspace\\nifty-prose-articulator\\src\\mathml_fast\\database_parser.py',187),
-  ('xml -> ID LEFTCARET attributes RIGHTCARET LEFTPAREN RIGHTPAREN','xml',6,'p_xml','C:\\Users\\GraffeS.PC93666W7\\Desktop\\workspace\\nifty-prose-articulator\\src\\mathml_fast\\database_parser.py',188),
-  ('xml -> ID LEFTPAREN expressions RIGHTPAREN','xml',4,'p_xml','C:\\Users\\GraffeS.PC93666W7\\Desktop\\workspace\\nifty-prose-articulator\\src\\mathml_fast\\database_parser.py',189),
-  ('xml -> ID LEFTPAREN RIGHTPAREN','xml',3,'p_xml','C:\\Users\\GraffeS.PC93666W7\\Desktop\\workspace\\nifty-prose-articulator\\src\\mathml_fast\\database_parser.py',190),
-  ('attributes -> attribute COMMA attributes','attributes',3,'p_attributes','C:\\Users\\GraffeS.PC93666W7\\Desktop\\workspace\\nifty-prose-articulator\\src\\mathml_fast\\database_parser.py',204),
-  ('attributes -> attribute','attributes',1,'p_attributes','C:\\Users\\GraffeS.PC93666W7\\Desktop\\workspace\\nifty-prose-articulator\\src\\mathml_fast\\database_parser.py',205),
-  ('attribute -> ID ASSIGNS LITERAL','attribute',3,'p_attribute','C:\\Users\\GraffeS.PC93666W7\\Desktop\\workspace\\nifty-prose-articulator\\src\\mathml_fast\\database_parser.py',216),
-  ('output -> STRING','output',1,'p_output','C:\\Users\\GraffeS.PC93666W7\\Desktop\\workspace\\nifty-prose-articulator\\src\\mathml_fast\\database_parser.py',222),
-]
diff --git a/version.txt b/version.txt
@@ -1 +1 @@
-1.13
+1.14
