From a505bc732a9a1e350d80475f19c18af334cf1465 Mon Sep 17 00:00:00 2001
From: Steve Canny <scanny@cisco.com>
Date: Wed, 9 Jan 2013 13:31:21 -0800
Subject: [PATCH 01/25] add 'jpg' default content type

---
 docx.py | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/docx.py b/docx.py
index 0f41b09..79aa185 100755
--- a/docx.py
+++ b/docx.py
@@ -215,7 +215,14 @@ def contenttypes():
     for part in parts:
         types.append(makeelement('Override',nsprefix=None,attributes={'PartName':part,'ContentType':parts[part]}))
     # Add support for filetypes
-    filetypes = {'rels':'application/vnd.openxmlformats-package.relationships+xml','xml':'application/xml','jpeg':'image/jpeg','gif':'image/gif','png':'image/png'}
+    filetypes =\
+        { 'gif'  : 'image/gif'
+        , 'jpeg' : 'image/jpeg'
+        , 'jpg'  : 'image/jpeg'
+        , 'png'  : 'image/png'
+        , 'rels' : 'application/vnd.openxmlformats-package.relationships+xml'
+        , 'xml'  : 'application/xml'
+        }
     for extension in filetypes:
         types.append(makeelement('Default',nsprefix=None,attributes={'Extension':extension,'ContentType':filetypes[extension]}))
     return types

From 0c4379c6b89a7c745890e940a9be88b04147dfc2 Mon Sep 17 00:00:00 2001
From: Steve Canny <scanny@cisco.com>
Date: Sat, 19 Jan 2013 22:05:20 -0800
Subject: [PATCH 02/25] PEP8 formatting and whitespace adjustments

---
 docx.py                 | 488 ++++++++++++++++++++--------------------
 example-makedocument.py | 124 ++++++----
 2 files changed, 321 insertions(+), 291 deletions(-)

diff --git a/docx.py b/docx.py
index 79aa185..b573b49 100755
--- a/docx.py
+++ b/docx.py
@@ -24,40 +24,41 @@
 
 # Record template directory's location which is just 'template' for a docx
 # developer or 'site-packages/docx-template' if you have installed docx
-template_dir = join(os.path.dirname(__file__),'docx-template') # installed
+template_dir = join(os.path.dirname(__file__), 'docx-template') # installed
 if not os.path.isdir(template_dir):
-    template_dir = join(os.path.dirname(__file__),'template') # dev
+    template_dir = join(os.path.dirname(__file__), 'template') # dev
 
 # All Word prefixes / namespace matches used in document.xml & core.xml.
 # LXML doesn't actually use prefixes (just the real namespace) , but these
 # make it easier to copy Word output more easily.
-nsprefixes = {
-    # Text Content
-    'mv':'urn:schemas-microsoft-com:mac:vml',
-    'mo':'http://schemas.microsoft.com/office/mac/office/2008/main',
-    've':'http://schemas.openxmlformats.org/markup-compatibility/2006',
-    'o':'urn:schemas-microsoft-com:office:office',
-    'r':'http://schemas.openxmlformats.org/officeDocument/2006/relationships',
-    'm':'http://schemas.openxmlformats.org/officeDocument/2006/math',
-    'v':'urn:schemas-microsoft-com:vml',
-    'w':'http://schemas.openxmlformats.org/wordprocessingml/2006/main',
-    'w10':'urn:schemas-microsoft-com:office:word',
-    'wne':'http://schemas.microsoft.com/office/word/2006/wordml',
-    # Drawing
-    'wp':'http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing',
-    'a':'http://schemas.openxmlformats.org/drawingml/2006/main',
-    'pic':'http://schemas.openxmlformats.org/drawingml/2006/picture',
-    # Properties (core and extended)
-    'cp':"http://schemas.openxmlformats.org/package/2006/metadata/core-properties",
-    'dc':"http://purl.org/dc/elements/1.1/",
-    'dcterms':"http://purl.org/dc/terms/",
-    'dcmitype':"http://purl.org/dc/dcmitype/",
-    'xsi':"http://www.w3.org/2001/XMLSchema-instance",
-    'ep':'http://schemas.openxmlformats.org/officeDocument/2006/extended-properties',
-    # Content Types (we're just making up our own namespaces here to save time)
-    'ct':'http://schemas.openxmlformats.org/package/2006/content-types',
-    # Package Relationships (we're just making up our own namespaces here to save time)
-    'pr':'http://schemas.openxmlformats.org/package/2006/relationships'
+nsprefixes =\
+    { 'mo'  : 'http://schemas.microsoft.com/office/mac/office/2008/main'
+    , 'o'   : 'urn:schemas-microsoft-com:office:office'
+    , 've'  : 'http://schemas.openxmlformats.org/markup-compatibility/2006'
+      # Text Content
+    , 'w'   : 'http://schemas.openxmlformats.org/wordprocessingml/2006/main'
+    , 'w10' : 'urn:schemas-microsoft-com:office:word'
+    , 'wne' : 'http://schemas.microsoft.com/office/word/2006/wordml'
+      # Drawing
+    , 'a'   : 'http://schemas.openxmlformats.org/drawingml/2006/main'
+    , 'm'   : 'http://schemas.openxmlformats.org/officeDocument/2006/math'
+    , 'mv'  : 'urn:schemas-microsoft-com:mac:vml'
+    , 'pic' : 'http://schemas.openxmlformats.org/drawingml/2006/picture'
+    , 'v'   : 'urn:schemas-microsoft-com:vml'
+    , 'wp'  : 'http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing'
+      # Properties (core and extended)
+    , 'cp'  : 'http://schemas.openxmlformats.org/package/2006/metadata/core-properties'
+    , 'dc'  : 'http://purl.org/dc/elements/1.1/'
+    , 'ep'  : 'http://schemas.openxmlformats.org/officeDocument/2006/extended-properties'
+    , 'xsi' : 'http://www.w3.org/2001/XMLSchema-instance'
+      # Content Types (we're just making up our own namespaces here to save time)
+    , 'ct'  : 'http://schemas.openxmlformats.org/package/2006/content-types'
+      # Package Relationships (we're just making up our own namespaces here to save time)
+    , 'r'   : 'http://schemas.openxmlformats.org/officeDocument/2006/relationships'
+    , 'pr'  : 'http://schemas.openxmlformats.org/package/2006/relationships'
+      # Dublin Core document properties
+    , 'dcmitype' :'http://purl.org/dc/dcmitype/'
+    , 'dcterms'  :'http://purl.org/dc/terms/'
     }
 
 def opendocx(file):
@@ -72,7 +73,7 @@ def newdocument():
     document.append(makeelement('body'))
     return document
 
-def makeelement(tagname,tagtext=None,nsprefix='w',attributes=None,attrnsprefix=None):
+def makeelement(tagname, tagtext=None, nsprefix='w', attributes=None, attrnsprefix=None):
     '''Create an element & return it'''
     # Deal with list of nsprefix by making namespacemap
     namespacemap = None
@@ -99,7 +100,7 @@ def makeelement(tagname,tagtext=None,nsprefix='w',attributes=None,attrnsprefix=N
                 attributenamespace = ''
         else:
             attributenamespace = '{'+nsprefixes[attrnsprefix]+'}'
-
+            
         for tagattribute in attributes:
             newelement.set(attributenamespace+tagattribute, attributes[tagattribute])
     if tagtext:
@@ -117,60 +118,60 @@ def pagebreak(type='page', orient='portrait'):
     pagebreak = makeelement('p')
     if type == 'page':
         run = makeelement('r')
-        br = makeelement('br',attributes={'type':type})
+        br = makeelement('br', attributes={'type':type})
         run.append(br)
         pagebreak.append(run)
     elif type == 'section':
         pPr = makeelement('pPr')
         sectPr = makeelement('sectPr')
         if orient == 'portrait':
-            pgSz = makeelement('pgSz',attributes={'w':'12240','h':'15840'})
+            pgSz = makeelement('pgSz', attributes={'w':'12240', 'h':'15840'})
         elif orient == 'landscape':
-            pgSz = makeelement('pgSz',attributes={'h':'12240','w':'15840', 'orient':'landscape'})
+            pgSz = makeelement('pgSz', attributes={'h':'12240', 'w':'15840', 'orient':'landscape'})
         sectPr.append(pgSz)
         pPr.append(sectPr)
         pagebreak.append(pPr)
     return pagebreak
 
-def paragraph(paratext,style='BodyText',breakbefore=False,jc='left'):
+def paragraph(paratext, style='BodyText', breakbefore=False, jc='left'):
     '''Make a new paragraph element, containing a run, and some text.
     Return the paragraph element.
-
+    
     @param string jc: Paragraph alignment, possible values:
                       left, center, right, both (justified), ...
                       see http://www.schemacentral.com/sc/ooxml/t-w_ST_Jc.html
                       for a full list
-
+    
     If paratext is a list, spawn multiple run/text elements.
     Support text styles (paratext must then be a list of lists in the form
     <text> / <style>. Stile is a string containing a combination od 'bui' chars
-
+    
     example
-    paratext = [
-        ('some bold text', 'b'),
-        ('some normal text', ''),
-        ('some italic underlined text', 'iu'),
-    ]
-
+    paratext =\
+        [ ('some bold text', 'b')
+        , ('some normal text', '')
+        , ('some italic underlined text', 'iu')
+        ]
+    
     '''
     # Make our elements
     paragraph = makeelement('p')
-
+    
     if isinstance(paratext, list):
         text = []
         for pt in paratext:
-            if isinstance(pt, (list,tuple)):
-                text.append([makeelement('t',tagtext=pt[0]), pt[1]])
+            if isinstance(pt, (list, tuple)):
+                text.append([makeelement('t', tagtext=pt[0]), pt[1]])
             else:
-                text.append([makeelement('t',tagtext=pt), ''])
+                text.append([makeelement('t', tagtext=pt), ''])
     else:
-        text = [[makeelement('t',tagtext=paratext),''],]
+        text = [[makeelement('t', tagtext=paratext), ''], ]
     pPr = makeelement('pPr')
-    pStyle = makeelement('pStyle',attributes={'val':style})
-    pJc = makeelement('jc',attributes={'val':jc})
+    pStyle = makeelement('pStyle', attributes={'val':style})
+    pJc = makeelement('jc', attributes={'val':jc})
     pPr.append(pStyle)
     pPr.append(pJc)
-
+    
     # Add the text the run, and the run to the paragraph
     paragraph.append(pPr)
     for t in text:
@@ -181,7 +182,7 @@ def paragraph(paratext,style='BodyText',breakbefore=False,jc='left'):
             b = makeelement('b')
             rPr.append(b)
         if t[1].find('u') > -1:
-            u = makeelement('u',attributes={'val':'single'})
+            u = makeelement('u', attributes={'val':'single'})
             rPr.append(u)
         if t[1].find('i') > -1:
             i = makeelement('i')
@@ -199,21 +200,21 @@ def paragraph(paratext,style='BodyText',breakbefore=False,jc='left'):
 
 def contenttypes():
     # FIXME - doesn't quite work...read from string as temp hack...
-    #types = makeelement('Types',nsprefix='ct')
-    types = etree.fromstring('''<Types xmlns="http://schemas.openxmlformats.org/package/2006/content-types"></Types>''')
-    parts = {
-        '/word/theme/theme1.xml':'application/vnd.openxmlformats-officedocument.theme+xml',
-        '/word/fontTable.xml':'application/vnd.openxmlformats-officedocument.wordprocessingml.fontTable+xml',
-        '/docProps/core.xml':'application/vnd.openxmlformats-package.core-properties+xml',
-        '/docProps/app.xml':'application/vnd.openxmlformats-officedocument.extended-properties+xml',
-        '/word/document.xml':'application/vnd.openxmlformats-officedocument.wordprocessingml.document.main+xml',
-        '/word/settings.xml':'application/vnd.openxmlformats-officedocument.wordprocessingml.settings+xml',
-        '/word/numbering.xml':'application/vnd.openxmlformats-officedocument.wordprocessingml.numbering+xml',
-        '/word/styles.xml':'application/vnd.openxmlformats-officedocument.wordprocessingml.styles+xml',
-        '/word/webSettings.xml':'application/vnd.openxmlformats-officedocument.wordprocessingml.webSettings+xml'
+    #types = makeelement('Types', nsprefix='ct')
+    types = etree.fromstring('<Types xmlns="http://schemas.openxmlformats.org/package/2006/content-types"></Types>')
+    parts =\
+        { '/word/theme/theme1.xml' : 'application/vnd.openxmlformats-officedocument.theme+xml'
+        , '/word/fontTable.xml'    : 'application/vnd.openxmlformats-officedocument.wordprocessingml.fontTable+xml'
+        , '/docProps/core.xml'     : 'application/vnd.openxmlformats-package.core-properties+xml'
+        , '/docProps/app.xml'      : 'application/vnd.openxmlformats-officedocument.extended-properties+xml'
+        , '/word/document.xml'     : 'application/vnd.openxmlformats-officedocument.wordprocessingml.document.main+xml'
+        , '/word/settings.xml'     : 'application/vnd.openxmlformats-officedocument.wordprocessingml.settings+xml'
+        , '/word/numbering.xml'    : 'application/vnd.openxmlformats-officedocument.wordprocessingml.numbering+xml'
+        , '/word/styles.xml'       : 'application/vnd.openxmlformats-officedocument.wordprocessingml.styles+xml'
+        , '/word/webSettings.xml'  : 'application/vnd.openxmlformats-officedocument.wordprocessingml.webSettings+xml'
         }
     for part in parts:
-        types.append(makeelement('Override',nsprefix=None,attributes={'PartName':part,'ContentType':parts[part]}))
+        types.append(makeelement('Override', nsprefix=None, attributes={'PartName':part, 'ContentType':parts[part]}))
     # Add support for filetypes
     filetypes =\
         { 'gif'  : 'image/gif'
@@ -224,21 +225,18 @@ def contenttypes():
         , 'xml'  : 'application/xml'
         }
     for extension in filetypes:
-        types.append(makeelement('Default',nsprefix=None,attributes={'Extension':extension,'ContentType':filetypes[extension]}))
+        types.append(makeelement('Default', nsprefix=None, attributes={'Extension':extension, 'ContentType':filetypes[extension]}))
     return types
 
-def heading(headingtext,headinglevel,lang='en'):
+def heading(headingtext, headinglevel, lang='en'):
     '''Make a new heading, return the heading element'''
-    lmap = {
-        'en': 'Heading',
-        'it': 'Titolo',
-    }
+    lmap = {'en': 'Heading', 'it': 'Titolo'}
     # Make our elements
     paragraph = makeelement('p')
     pr = makeelement('pPr')
-    pStyle = makeelement('pStyle',attributes={'val':lmap[lang]+str(headinglevel)})
+    pStyle = makeelement('pStyle', attributes={'val':lmap[lang]+str(headinglevel)})
     run = makeelement('r')
-    text = makeelement('t',tagtext=headingtext)
+    text = makeelement('t', tagtext=headingtext)
     # Add the text the run, and the run to the paragraph
     pr.append(pStyle)
     run.append(text)
@@ -249,7 +247,7 @@ def heading(headingtext,headinglevel,lang='en'):
 
 def table(contents, heading=True, colw=None, cwunit='dxa', tblw=0, twunit='auto', borders={}, celstyle=None):
     '''Get a list of lists, return a table
-
+    
         @param list contents: A list of lists describing contents
                               Every item in the list can be a string or a valid
                               XML element itself. It can also be a list. In that case
@@ -276,17 +274,17 @@ def table(contents, heading=True, colw=None, cwunit='dxa', tblw=0, twunit='auto'
                              val: The style of the border, see http://www.schemacentral.com/sc/ooxml/t-w_ST_Border.htm
         @param list celstyle: Specify the style for each colum, list of dicts.
                               supported keys:
-                              'align': specify the alignment, see paragraph documentation,
-
+                              'align': specify the alignment, see paragraph documentation.
+    
         @return lxml.etree: Generated XML etree element
     '''
     table = makeelement('tbl')
     columns = len(contents[0])
     # Table properties
     tableprops = makeelement('tblPr')
-    tablestyle = makeelement('tblStyle',attributes={'val':''})
+    tablestyle = makeelement('tblStyle', attributes={'val':''})
     tableprops.append(tablestyle)
-    tablewidth = makeelement('tblW',attributes={'w':str(tblw),'type':str(twunit)})
+    tablewidth = makeelement('tblW', attributes={'w':str(tblw), 'type':str(twunit)})
     tableprops.append(tablewidth)
     if len(borders.keys()):
         tableborders = makeelement('tblBorders')
@@ -296,21 +294,21 @@ def table(contents, heading=True, colw=None, cwunit='dxa', tblw=0, twunit='auto'
                 attrs = {}
                 for a in borders[k].keys():
                     attrs[a] = unicode(borders[k][a])
-                borderelem = makeelement(b,attributes=attrs)
+                borderelem = makeelement(b, attributes=attrs)
                 tableborders.append(borderelem)
         tableprops.append(tableborders)
-    tablelook = makeelement('tblLook',attributes={'val':'0400'})
+    tablelook = makeelement('tblLook', attributes={'val':'0400'})
     tableprops.append(tablelook)
     table.append(tableprops)
     # Table Grid
     tablegrid = makeelement('tblGrid')
     for i in range(columns):
-        tablegrid.append(makeelement('gridCol',attributes={'w':str(colw[i]) if colw else '2390'}))
+        tablegrid.append(makeelement('gridCol', attributes={'w':str(colw[i]) if colw else '2390'}))
     table.append(tablegrid)
     # Heading Row
     row = makeelement('tr')
     rowprops = makeelement('trPr')
-    cnfStyle = makeelement('cnfStyle',attributes={'val':'000000100000'})
+    cnfStyle = makeelement('cnfStyle', attributes={'val':'000000100000'})
     rowprops.append(cnfStyle)
     row.append(rowprops)
     if heading:
@@ -320,22 +318,22 @@ def table(contents, heading=True, colw=None, cwunit='dxa', tblw=0, twunit='auto'
             # Cell properties
             cellprops = makeelement('tcPr')
             if colw:
-                wattr = {'w':str(colw[i]),'type':cwunit}
+                wattr = {'w':str(colw[i]), 'type':cwunit}
             else:
-                wattr = {'w':'0','type':'auto'}
-            cellwidth = makeelement('tcW',attributes=wattr)
-            cellstyle = makeelement('shd',attributes={'val':'clear','color':'auto','fill':'FFFFFF','themeFill':'text2','themeFillTint':'99'})
+                wattr = {'w':'0', 'type':'auto'}
+            cellwidth = makeelement('tcW', attributes=wattr)
+            cellstyle = makeelement('shd', attributes={'val':'clear', 'color':'auto', 'fill':'FFFFFF', 'themeFill':'text2', 'themeFillTint':'99'})
             cellprops.append(cellwidth)
             cellprops.append(cellstyle)
             cell.append(cellprops)
             # Paragraph (Content)
             if not isinstance(heading, (list, tuple)):
-                heading = [heading,]
+                heading = [heading]
             for h in heading:
                 if isinstance(h, etree._Element):
                     cell.append(h)
                 else:
-                    cell.append(paragraph(h,jc='center'))
+                    cell.append(paragraph(h, jc='center'))
             row.append(cell)
             i += 1
         table.append(row)
@@ -348,15 +346,15 @@ def table(contents, heading=True, colw=None, cwunit='dxa', tblw=0, twunit='auto'
             # Properties
             cellprops = makeelement('tcPr')
             if colw:
-                wattr = {'w':str(colw[i]),'type':cwunit}
+                wattr = {'w':str(colw[i]), 'type':cwunit}
             else:
-                wattr = {'w':'0','type':'auto'}
-            cellwidth = makeelement('tcW',attributes=wattr)
+                wattr = {'w':'0', 'type':'auto'}
+            cellwidth = makeelement('tcW', attributes=wattr)
             cellprops.append(cellwidth)
             cell.append(cellprops)
             # Paragraph (Content)
             if not isinstance(content, (list, tuple)):
-                content = [content,]
+                content = [content]
             for c in content:
                 if isinstance(c, etree._Element):
                     cell.append(c)
@@ -365,97 +363,96 @@ def table(contents, heading=True, colw=None, cwunit='dxa', tblw=0, twunit='auto'
                         align = celstyle[i]['align']
                     else:
                         align = 'left'
-                    cell.append(paragraph(c,jc=align))
+                    cell.append(paragraph(c, jc=align))
             row.append(cell)
             i += 1
         table.append(row)
     return table
 
-def picture(relationshiplist, picname, picdescription, pixelwidth=None,
-            pixelheight=None, nochangeaspect=True, nochangearrowheads=True):
+def picture(relationshiplist, picname, picdescription, pixelwidth=None, pixelheight=None, nochangeaspect=True, nochangearrowheads=True):
     '''Take a relationshiplist, picture file name, and return a paragraph containing the image
     and an updated relationshiplist'''
     # http://openxmldeveloper.org/articles/462.aspx
     # Create an image. Size may be specified, otherwise it will based on the
     # pixel size of image. Return a paragraph containing the picture'''
     # Copy the file into the media dir
-    media_dir = join(template_dir,'word','media')
+    media_dir = join(template_dir, 'word', 'media')
     if not os.path.isdir(media_dir):
         os.mkdir(media_dir)
-    shutil.copyfile(picname, join(media_dir,picname))
-
+    shutil.copyfile(picname, join(media_dir, picname))
+    
     # Check if the user has specified a size
     if not pixelwidth or not pixelheight:
         # If not, get info from the picture itself
-        pixelwidth,pixelheight = Image.open(picname).size[0:2]
-
+        pixelwidth, pixelheight = Image.open(picname).size[0:2]
+    
     # OpenXML measures on-screen objects in English Metric Units
     # 1cm = 36000 EMUs
     emuperpixel = 12667
     width = str(pixelwidth * emuperpixel)
     height = str(pixelheight * emuperpixel)
-
+    
     # Set relationship ID to the first available
     picid = '2'
     picrelid = 'rId'+str(len(relationshiplist)+1)
     relationshiplist.append([
         'http://schemas.openxmlformats.org/officeDocument/2006/relationships/image',
         'media/'+picname])
-
+    
     # There are 3 main elements inside a picture
     # 1. The Blipfill - specifies how the image fills the picture area (stretch, tile, etc.)
-    blipfill = makeelement('blipFill',nsprefix='pic')
-    blipfill.append(makeelement('blip',nsprefix='a',attrnsprefix='r',attributes={'embed':picrelid}))
-    stretch = makeelement('stretch',nsprefix='a')
-    stretch.append(makeelement('fillRect',nsprefix='a'))
-    blipfill.append(makeelement('srcRect',nsprefix='a'))
+    blipfill = makeelement('blipFill', nsprefix='pic')
+    blipfill.append(makeelement('blip', nsprefix='a', attrnsprefix='r', attributes={'embed':picrelid}))
+    stretch = makeelement('stretch', nsprefix='a')
+    stretch.append(makeelement('fillRect', nsprefix='a'))
+    blipfill.append(makeelement('srcRect', nsprefix='a'))
     blipfill.append(stretch)
-
+    
     # 2. The non visual picture properties
-    nvpicpr = makeelement('nvPicPr',nsprefix='pic')
-    cnvpr = makeelement('cNvPr',nsprefix='pic',
-                        attributes={'id':'0','name':'Picture 1','descr':picname})
+    nvpicpr = makeelement('nvPicPr', nsprefix='pic')
+    cnvpr = makeelement('cNvPr', nsprefix='pic',
+                        attributes={'id':'0', 'name':'Picture 1', 'descr':picname})
     nvpicpr.append(cnvpr)
-    cnvpicpr = makeelement('cNvPicPr',nsprefix='pic')
+    cnvpicpr = makeelement('cNvPicPr', nsprefix='pic')
     cnvpicpr.append(makeelement('picLocks', nsprefix='a',
                     attributes={'noChangeAspect':str(int(nochangeaspect)),
                     'noChangeArrowheads':str(int(nochangearrowheads))}))
     nvpicpr.append(cnvpicpr)
-
+    
     # 3. The Shape properties
-    sppr = makeelement('spPr',nsprefix='pic',attributes={'bwMode':'auto'})
-    xfrm = makeelement('xfrm',nsprefix='a')
-    xfrm.append(makeelement('off',nsprefix='a',attributes={'x':'0','y':'0'}))
-    xfrm.append(makeelement('ext',nsprefix='a',attributes={'cx':width,'cy':height}))
-    prstgeom = makeelement('prstGeom',nsprefix='a',attributes={'prst':'rect'})
-    prstgeom.append(makeelement('avLst',nsprefix='a'))
+    sppr = makeelement('spPr', nsprefix='pic', attributes={'bwMode':'auto'})
+    xfrm = makeelement('xfrm', nsprefix='a')
+    xfrm.append(makeelement('off', nsprefix='a', attributes={'x':'0', 'y':'0'}))
+    xfrm.append(makeelement('ext', nsprefix='a', attributes={'cx':width, 'cy':height}))
+    prstgeom = makeelement('prstGeom', nsprefix='a', attributes={'prst':'rect'})
+    prstgeom.append(makeelement('avLst', nsprefix='a'))
     sppr.append(xfrm)
     sppr.append(prstgeom)
-
+    
     # Add our 3 parts to the picture element
-    pic = makeelement('pic',nsprefix='pic')
+    pic = makeelement('pic', nsprefix='pic')
     pic.append(nvpicpr)
     pic.append(blipfill)
     pic.append(sppr)
-
+    
     # Now make the supporting elements
     # The following sequence is just: make element, then add its children
-    graphicdata = makeelement('graphicData',nsprefix='a',
+    graphicdata = makeelement('graphicData', nsprefix='a',
         attributes={'uri':'http://schemas.openxmlformats.org/drawingml/2006/picture'})
     graphicdata.append(pic)
-    graphic = makeelement('graphic',nsprefix='a')
+    graphic = makeelement('graphic', nsprefix='a')
     graphic.append(graphicdata)
-
-    framelocks = makeelement('graphicFrameLocks',nsprefix='a',attributes={'noChangeAspect':'1'})
-    framepr = makeelement('cNvGraphicFramePr',nsprefix='wp')
+    
+    framelocks = makeelement('graphicFrameLocks', nsprefix='a', attributes={'noChangeAspect':'1'})
+    framepr = makeelement('cNvGraphicFramePr', nsprefix='wp')
     framepr.append(framelocks)
-    docpr = makeelement('docPr',nsprefix='wp',
-        attributes={'id':picid,'name':'Picture 1','descr':picdescription})
-    effectextent = makeelement('effectExtent',nsprefix='wp',
-        attributes={'l':'25400','t':'0','r':'0','b':'0'})
-    extent = makeelement('extent',nsprefix='wp',attributes={'cx':width,'cy':height})
+    docpr = makeelement('docPr', nsprefix='wp',
+        attributes={'id':picid, 'name':'Picture 1', 'descr':picdescription})
+    effectextent = makeelement('effectExtent', nsprefix='wp',
+        attributes={'l':'25400', 't':'0', 'r':'0', 'b':'0'})
+    extent = makeelement('extent', nsprefix='wp', attributes={'cx':width, 'cy':height})
     inline = makeelement('inline',
-        attributes={'distT':"0",'distB':"0",'distL':"0",'distR':"0"},nsprefix='wp')
+        attributes={'distT':"0", 'distB':"0", 'distL':"0", 'distR':"0"}, nsprefix='wp')
     inline.append(extent)
     inline.append(effectextent)
     inline.append(docpr)
@@ -467,10 +464,9 @@ def picture(relationshiplist, picname, picdescription, pixelwidth=None,
     run.append(drawing)
     paragraph = makeelement('p')
     paragraph.append(run)
-    return relationshiplist,paragraph
-
+    return relationshiplist, paragraph
 
-def search(document,search):
+def search(document, search):
     '''Search a document for a regex, return success / fail result'''
     result = False
     searchre = re.compile(search)
@@ -481,7 +477,7 @@ def search(document,search):
                     result = True
     return result
 
-def replace(document,search,replace):
+def replace(document, search, replace):
     '''Replace all occurences of string with a different string, return updated document'''
     newdocument = document
     searchre = re.compile(search)
@@ -489,16 +485,16 @@ def replace(document,search,replace):
         if element.tag == '{%s}t' % nsprefixes['w']: # t (text) elements
             if element.text:
                 if searchre.search(element.text):
-                    element.text = re.sub(search,replace,element.text)
+                    element.text = re.sub(search, replace, element.text)
     return newdocument
 
 def clean(document):
     """ Perform misc cleaning operations on documents.
         Returns cleaned document.
     """
-
+    
     newdocument = document
-
+    
     # Clean empty text and r tags
     for t in ('t', 'r'):
         rmlist = []
@@ -508,7 +504,7 @@ def clean(document):
                     rmlist.append(element)
         for element in rmlist:
             element.getparent().remove(element)
-
+    
     return newdocument
 
 def findTypeParent(element, tag):
@@ -531,10 +527,10 @@ def findTypeParent(element, tag):
 
 def AdvSearch(document, search, bs=3):
     '''Return set of all regex matches
-
+    
     This is an advanced version of python-docx.search() that takes into
     account blocks of <bs> elements at a time.
-
+    
     What it does:
     It searches the entire document body for text blocks.
     Since the text to search could be spawned across multiple text blocks,
@@ -542,34 +538,34 @@ def AdvSearch(document, search, bs=3):
     The smaller matching group of blocks (up to bs) is then adopted.
     If the matching group has more than one block, blocks other than first
     are cleared and all the replacement text is put on first block.
-
+    
     Examples:
     original text blocks : [ 'Hel', 'lo,', ' world!' ]
     search : 'Hello,'
     output blocks : [ 'Hello,' ]
-
+    
     original text blocks : [ 'Hel', 'lo', ' __', 'name', '__!' ]
     search : '(__[a-z]+__)'
     output blocks : [ '__name__' ]
-
+    
     @param instance  document: The original document
     @param str       search: The text to search for (regexp)
                           append, or a list of etree elements
     @param int       bs: See above
-
+    
     @return set      All occurences of search string
-
+    
     '''
-
+    
     # Compile the search regexp
     searchre = re.compile(search)
-
+    
     matches = []
-
+    
     # Will match against searchels. Searchels is a list that contains last
     # n text elements found in the document. 1 < n < bs
     searchels = []
-
+    
     for element in document.iter():
         if element.tag == '{%s}t' % nsprefixes['w']: # t (text) elements
             if element.text:
@@ -578,44 +574,41 @@ def AdvSearch(document, search, bs=3):
                 if len(searchels) > bs:
                     # Is searchels is too long, remove first elements
                     searchels.pop(0)
-
+    
                 # Search all combinations, of searchels, starting from
                 # smaller up to bigger ones
                 # l = search lenght
                 # s = search start
                 # e = element IDs to merge
                 found = False
-                for l in range(1,len(searchels)+1):
+                for l in range(1, len(searchels)+1):
                     if found:
                         break
                     for s in range(len(searchels)):
                         if found:
                             break
                         if s+l <= len(searchels):
-                            e = range(s,s+l)
+                            e = range(s, s+l)
                             txtsearch = ''
                             for k in e:
                                 txtsearch += searchels[k].text
-
+    
                             # Searcs for the text in the whole txtsearch
                             match = searchre.search(txtsearch)
                             if match:
                                 matches.append(match.group())
                                 found = True
-
+    
     return set(matches)
 
-
-
-
-
-def advReplace(document,search,replace,bs=3):
-    '''Replace all occurences of string with a different string, return updated document
-
+def advReplace(document, search, replace, bs=3):
+    """
+    Replace all occurences of string with a different string, return updated document
+    
     This is a modified version of python-docx.replace() that takes into
     account blocks of <bs> elements at a time. The replace element can also
     be a string or an xml etree element.
-
+    
     What it does:
     It searches the entire document body for text blocks.
     Then scan thos text blocks for replace.
@@ -624,41 +617,41 @@ def advReplace(document,search,replace,bs=3):
     The smaller matching group of blocks (up to bs) is then adopted.
     If the matching group has more than one block, blocks other than first
     are cleared and all the replacement text is put on first block.
-
+    
     Examples:
     original text blocks : [ 'Hel', 'lo,', ' world!' ]
     search / replace: 'Hello,' / 'Hi!'
     output blocks : [ 'Hi!', '', ' world!' ]
-
+    
     original text blocks : [ 'Hel', 'lo,', ' world!' ]
     search / replace: 'Hello, world' / 'Hi!'
     output blocks : [ 'Hi!!', '', '' ]
-
+    
     original text blocks : [ 'Hel', 'lo,', ' world!' ]
     search / replace: 'Hel' / 'Hal'
     output blocks : [ 'Hal', 'lo,', ' world!' ]
-
+    
     @param instance  document: The original document
     @param str       search: The text to search for (regexp)
     @param mixed replace: The replacement text or lxml.etree element to
                           append, or a list of etree elements
     @param int       bs: See above
-
+    
     @return instance The document with replacement applied
-
-    '''
+    
+    """
     # Enables debug output
     DEBUG = False
-
+    
     newdocument = document
-
+    
     # Compile the search regexp
     searchre = re.compile(search)
-
+    
     # Will match against searchels. Searchels is a list that contains last
     # n text elements found in the document. 1 < n < bs
     searchels = []
-
+    
     for element in newdocument.iter():
         if element.tag == '{%s}t' % nsprefixes['w']: # t (text) elements
             if element.text:
@@ -667,14 +660,14 @@ def advReplace(document,search,replace,bs=3):
                 if len(searchels) > bs:
                     # Is searchels is too long, remove first elements
                     searchels.pop(0)
-
+    
                 # Search all combinations, of searchels, starting from
                 # smaller up to bigger ones
                 # l = search lenght
                 # s = search start
                 # e = element IDs to merge
                 found = False
-                for l in range(1,len(searchels)+1):
+                for l in range(1, len(searchels)+1):
                     if found:
                         break
                     #print "slen:", l
@@ -682,24 +675,24 @@ def advReplace(document,search,replace,bs=3):
                         if found:
                             break
                         if s+l <= len(searchels):
-                            e = range(s,s+l)
+                            e = range(s, s+l)
                             #print "elems:", e
                             txtsearch = ''
                             for k in e:
                                 txtsearch += searchels[k].text
-
+    
                             # Searcs for the text in the whole txtsearch
                             match = searchre.search(txtsearch)
                             if match:
                                 found = True
-
+    
                                 # I've found something :)
                                 if DEBUG:
                                     log.debug("Found element!")
                                     log.debug("Search regexp: %s", searchre.pattern)
                                     log.debug("Requested replacement: %s", replace)
                                     log.debug("Matched text: %s", txtsearch)
-                                    log.debug( "Matched text (splitted): %s", map(lambda i:i.text,searchels))
+                                    log.debug( "Matched text (splitted): %s", map(lambda i:i.text, searchels))
                                     log.debug("Matched at position: %s", match.start())
                                     log.debug( "matched in elements: %s", e)
                                     if isinstance(replace, etree._Element):
@@ -707,8 +700,8 @@ def advReplace(document,search,replace,bs=3):
                                     elif isinstance(replace (list, tuple)):
                                         log.debug("Will replace with LIST OF ELEMENTS")
                                     else:
-                                        log.debug("Will replace with:", re.sub(search,replace,txtsearch))
-
+                                        log.debug("Will replace with:", re.sub(search, replace, txtsearch))
+    
                                 curlen = 0
                                 replaced = False
                                 for i in e:
@@ -719,20 +712,20 @@ def advReplace(document,search,replace,bs=3):
                                         if isinstance(replace, etree._Element):
                                             # Convert to a list and process it later
                                             replace = [ replace, ]
-                                        if isinstance(replace, (list,tuple)):
+                                        if isinstance(replace, (list, tuple)):
                                             # I'm replacing with a list of etree elements
                                             # clear the text in the tag and append the element after the
                                             # parent paragraph
                                             # (because t elements cannot have childs)
                                             p = findTypeParent(searchels[i], '{%s}p' % nsprefixes['w'])
-                                            searchels[i].text = re.sub(search,'',txtsearch)
+                                            searchels[i].text = re.sub(search, '', txtsearch)
                                             insindex = p.getparent().index(p) + 1
                                             for r in replace:
                                                 p.getparent().insert(insindex, r)
                                                 insindex += 1
                                         else:
                                             # Replacing with pure text
-                                            searchels[i].text = re.sub(search,replace,txtsearch)
+                                            searchels[i].text = re.sub(search, replace, txtsearch)
                                         replaced = True
                                         log.debug("Replacing in element #: %s", i)
                                     else:
@@ -766,58 +759,63 @@ def getdocumenttext(document):
             paratextlist.append(paratext)
     return paratextlist
 
-def coreproperties(title,subject,creator,keywords,lastmodifiedby=None):
+def coreproperties(title, subject, creator, keywords, lastmodifiedby=None):
     '''Create core properties (common document properties referred to in the 'Dublin Core' specification).
     See appproperties() for other stuff.'''
-    coreprops = makeelement('coreProperties',nsprefix='cp')
-    coreprops.append(makeelement('title',tagtext=title,nsprefix='dc'))
-    coreprops.append(makeelement('subject',tagtext=subject,nsprefix='dc'))
-    coreprops.append(makeelement('creator',tagtext=creator,nsprefix='dc'))
-    coreprops.append(makeelement('keywords',tagtext=','.join(keywords),nsprefix='cp'))
+    coreprops = makeelement('coreProperties', nsprefix='cp')
+    coreprops.append(makeelement('title', tagtext=title, nsprefix='dc'))
+    coreprops.append(makeelement('subject', tagtext=subject, nsprefix='dc'))
+    coreprops.append(makeelement('creator', tagtext=creator, nsprefix='dc'))
+    coreprops.append(makeelement('keywords', tagtext=','.join(keywords), nsprefix='cp'))
     if not lastmodifiedby:
         lastmodifiedby = creator
-    coreprops.append(makeelement('lastModifiedBy',tagtext=lastmodifiedby,nsprefix='cp'))
-    coreprops.append(makeelement('revision',tagtext='1',nsprefix='cp'))
-    coreprops.append(makeelement('category',tagtext='Examples',nsprefix='cp'))
-    coreprops.append(makeelement('description',tagtext='Examples',nsprefix='dc'))
+    coreprops.append(makeelement('lastModifiedBy', tagtext=lastmodifiedby, nsprefix='cp'))
+    coreprops.append(makeelement('revision', tagtext='1', nsprefix='cp'))
+    coreprops.append(makeelement('category', tagtext='Examples', nsprefix='cp'))
+    coreprops.append(makeelement('description', tagtext='Examples', nsprefix='dc'))
     currenttime = time.strftime('%Y-%m-%dT%H:%M:%SZ')
     # Document creation and modify times
     # Prob here: we have an attribute who name uses one namespace, and that
     # attribute's value uses another namespace.
-    # We're creating the lement from a string as a workaround...
-    for doctime in ['created','modified']:
+    # We're creating the element from a string as a workaround...
+    for doctime in ['created', 'modified']:
         coreprops.append(etree.fromstring('''<dcterms:'''+doctime+''' xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:dcterms="http://purl.org/dc/terms/" xsi:type="dcterms:W3CDTF">'''+currenttime+'''</dcterms:'''+doctime+'''>'''))
         pass
     return coreprops
 
 def appproperties():
-    '''Create app-specific properties. See docproperties() for more common document properties.'''
-    appprops = makeelement('Properties',nsprefix='ep')
+    """
+    Create app-specific properties. See docproperties() for more common
+    document properties.
+    
+    """
+    appprops = makeelement('Properties', nsprefix='ep')
     appprops = etree.fromstring(
-    '''<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-    <Properties xmlns="http://schemas.openxmlformats.org/officeDocument/2006/extended-properties" xmlns:vt="http://schemas.openxmlformats.org/officeDocument/2006/docPropsVTypes"></Properties>''')
-    props = {
-            'Template':'Normal.dotm',
-            'TotalTime':'6',
-            'Pages':'1',
-            'Words':'83',
-            'Characters':'475',
-            'Application':'Microsoft Word 12.0.0',
-            'DocSecurity':'0',
-            'Lines':'12',
-            'Paragraphs':'8',
-            'ScaleCrop':'false',
-            'LinksUpToDate':'false',
-            'CharactersWithSpaces':'583',
-            'SharedDoc':'false',
-            'HyperlinksChanged':'false',
-            'AppVersion':'12.0000',
-            }
+        '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>'
+        '<Properties xmlns="http://schemas.openxmlformats.org/officeDocument/'
+        '2006/extended-properties" xmlns:vt="http://schemas.openxmlformats.or'
+        'g/officeDocument/2006/docPropsVTypes"></Properties>')
+    props =\
+        { 'Template'             : 'Normal.dotm'
+        , 'TotalTime'            : '6'
+        , 'Pages'                : '1'
+        , 'Words'                : '83'
+        , 'Characters'           : '475'
+        , 'Application'          : 'Microsoft Word 12.0.0'
+        , 'DocSecurity'          : '0'
+        , 'Lines'                : '12'
+        , 'Paragraphs'           : '8'
+        , 'ScaleCrop'            : 'false'
+        , 'LinksUpToDate'        : 'false'
+        , 'CharactersWithSpaces' : '583'
+        , 'SharedDoc'            : 'false'
+        , 'HyperlinksChanged'    : 'false'
+        , 'AppVersion'           : '12.0000'
+        }
     for prop in props:
-        appprops.append(makeelement(prop,tagtext=props[prop],nsprefix=None))
+        appprops.append(makeelement(prop, tagtext=props[prop], nsprefix=None))
     return appprops
 
-
 def websettings():
     '''Generate websettings'''
     web = makeelement('webSettings')
@@ -826,42 +824,40 @@ def websettings():
     return web
 
 def relationshiplist():
-    relationshiplist = [
-    ['http://schemas.openxmlformats.org/officeDocument/2006/relationships/numbering','numbering.xml'],
-    ['http://schemas.openxmlformats.org/officeDocument/2006/relationships/styles','styles.xml'],
-    ['http://schemas.openxmlformats.org/officeDocument/2006/relationships/settings','settings.xml'],
-    ['http://schemas.openxmlformats.org/officeDocument/2006/relationships/webSettings','webSettings.xml'],
-    ['http://schemas.openxmlformats.org/officeDocument/2006/relationships/fontTable','fontTable.xml'],
-    ['http://schemas.openxmlformats.org/officeDocument/2006/relationships/theme','theme/theme1.xml'],
-    ]
+    relationshiplist =\
+        [ [ 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/numbering'   , 'numbering.xml'    ]
+        , [ 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/styles'      , 'styles.xml'       ]
+        , [ 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/settings'    , 'settings.xml'     ]
+        , [ 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/webSettings' , 'webSettings.xml'  ]
+        , [ 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/fontTable'   , 'fontTable.xml'    ]
+        , [ 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/theme'       , 'theme/theme1.xml' ]
+        ]
     return relationshiplist
 
 def wordrelationships(relationshiplist):
     '''Generate a Word relationships file'''
     # Default list of relationships
     # FIXME: using string hack instead of making element
-    #relationships = makeelement('Relationships',nsprefix='pr')
-    relationships = etree.fromstring(
-    '''<Relationships xmlns="http://schemas.openxmlformats.org/package/2006/relationships">
-        </Relationships>'''
-    )
+    #relationships = makeelement('Relationships', nsprefix='pr')
+    relationships = etree.fromstring('<Relationships xmlns="http://schemas.op'
+        'enxmlformats.org/package/2006/relationships"></Relationships>')
     count = 0
     for relationship in relationshiplist:
         # Relationship IDs (rId) start at 1.
-        relationships.append(makeelement('Relationship',attributes={'Id':'rId'+str(count+1),
-        'Type':relationship[0],'Target':relationship[1]},nsprefix=None))
+        relationships.append(makeelement('Relationship', attributes={'Id':'rId'+str(count+1),
+        'Type':relationship[0], 'Target':relationship[1]}, nsprefix=None))
         count += 1
     return relationships
 
-def savedocx(document,coreprops,appprops,contenttypes,websettings,wordrelationships,output):
+def savedocx(document, coreprops, appprops, contenttypes, websettings, wordrelationships, output):
     '''Save a modified document'''
     assert os.path.isdir(template_dir)
-    docxfile = zipfile.ZipFile(output,mode='w',compression=zipfile.ZIP_DEFLATED)
-
+    docxfile = zipfile.ZipFile(output, mode='w', compression=zipfile.ZIP_DEFLATED)
+    
     # Move to the template data path
     prev_dir = os.path.abspath('.') # save previous working dir
     os.chdir(template_dir)
-
+    
     # Serialize our trees into out zip file
     treesandfiles = {document:'word/document.xml',
                      coreprops:'docProps/core.xml',
@@ -872,15 +868,15 @@ def savedocx(document,coreprops,appprops,contenttypes,websettings,wordrelationsh
     for tree in treesandfiles:
         log.info('Saving: '+treesandfiles[tree]    )
         treestring = etree.tostring(tree, pretty_print=True)
-        docxfile.writestr(treesandfiles[tree],treestring)
-
+        docxfile.writestr(treesandfiles[tree], treestring)
+    
     # Add & compress support files
     files_to_ignore = ['.DS_Store'] # nuisance from some os's
-    for dirpath,dirnames,filenames in os.walk('.'):
+    for dirpath, dirnames, filenames in os.walk('.'):
         for filename in filenames:
             if filename in files_to_ignore:
                 continue
-            templatefile = join(dirpath,filename)
+            templatefile = join(dirpath, filename)
             archivename = templatefile[2:]
             log.info('Saving: %s', archivename)
             docxfile.write(templatefile, archivename)
diff --git a/example-makedocument.py b/example-makedocument.py
index bb8e946..a2adf97 100755
--- a/example-makedocument.py
+++ b/example-makedocument.py
@@ -1,79 +1,113 @@
-#!/usr/bin/env python2.6
-'''
-This file makes an docx (Office 2007) file from scratch, showing off most of python-docx's features.
+#!/usr/bin/env python
 
-If you need to make documents from scratch, use this file as a basis for your work.
+"""
+This file makes a .docx (Word 2007) file from scratch, showing off most of the
+features of python-docx.
+
+If you need to make documents from scratch, you can use this file as a basis
+for your work.
 
 Part of Python's docx module - http://github.com/mikemaccana/python-docx
 See LICENSE for licensing information.
-'''
+"""
+
 from docx import *
 
-if __name__ == '__main__':        
-    # Default set of relationshipships - these are the minimum components of a document
+if __name__ == '__main__':
+    # Default set of relationshipships - the minimum components of a document
     relationships = relationshiplist()
 
     # Make a new document tree - this is the main part of a Word document
     document = newdocument()
-    
-    # This xpath location is where most interesting content lives 
-    docbody = document.xpath('/w:document/w:body', namespaces=nsprefixes)[0]
-    
+
+    # This xpath location is where most interesting content lives
+    body = document.xpath('/w:document/w:body', namespaces=nsprefixes)[0]
+
     # Append two headings and a paragraph
-    docbody.append(heading('''Welcome to Python's docx module''',1)  )   
-    docbody.append(heading('Make and edit docx in 200 lines of pure Python',2))
-    docbody.append(paragraph('The module was created when I was looking for a Python support for MS Word .doc files on PyPI and Stackoverflow. Unfortunately, the only solutions I could find used:'))
+    body.append(heading("Welcome to Python's docx module", 1))
+    body.append(heading('Make and edit docx in 200 lines of pure Python', 2))
+    body.append(paragraph('The module was created when I was looking for a '
+        'Python support for MS Word .doc files on PyPI and Stackoverflow. '
+        'Unfortunately, the only solutions I could find used:'))
 
     # Add a numbered list
-    for point in ['''COM automation''','''.net or Java''','''Automating OpenOffice or MS Office''']:
-        docbody.append(paragraph(point,style='ListNumber'))
-    docbody.append(paragraph('''For those of us who prefer something simpler, I made docx.''')) 
-    
-    docbody.append(heading('Making documents',2))
-    docbody.append(paragraph('''The docx module has the following features:'''))
+    points = [ 'COM automation'
+             , '.net or Java'
+             , 'Automating OpenOffice or MS Office'
+             ]
+    for point in points:
+        body.append(paragraph(point, style='ListNumber'))
+    body.append(paragraph('For those of us who prefer something simpler, I '
+                          'made docx.'))
+    body.append(heading('Making documents', 2))
+    body.append(paragraph('The docx module has the following features:'))
 
     # Add some bullets
-    for point in ['Paragraphs','Bullets','Numbered lists','Multiple levels of headings','Tables','Document Properties']:
-        docbody.append(paragraph(point,style='ListBullet'))
+    points = ['Paragraphs', 'Bullets', 'Numbered lists',
+              'Multiple levels of headings', 'Tables', 'Document Properties']
+    for point in points:
+        body.append(paragraph(point, style='ListBullet'))
 
-    docbody.append(paragraph('Tables are just lists of lists, like this:'))
+    body.append(paragraph('Tables are just lists of lists, like this:'))
     # Append a table
-    docbody.append(table([['A1','A2','A3'],['B1','B2','B3'],['C1','C2','C3']]))
+    tbl_rows = [ ['A1', 'A2', 'A3']
+               , ['B1', 'B2', 'B3']
+               , ['C1', 'C2', 'C3']
+               ]
+    body.append(table(tbl_rows))
+
+    body.append(heading('Editing documents', 2))
+    body.append(paragraph('Thanks to the awesomeness of the lxml module, '
+                          'we can:'))
+    points = [ 'Search and replace'
+             , 'Extract plain text of document'
+             , 'Add and delete items anywhere within the document'
+             ]
+    for point in points:
+        body.append(paragraph(point, style='ListBullet'))
 
-    docbody.append(heading('Editing documents',2))
-    docbody.append(paragraph('Thanks to the awesomeness of the lxml module, we can:'))
-    for point in ['Search and replace','Extract plain text of document','Add and delete items anywhere within the document']:
-        docbody.append(paragraph(point,style='ListBullet'))
-        
     # Add an image
-    relationships,picpara = picture(relationships,'image1.png','This is a test description')
-    docbody.append(picpara)
- 
+    relationships, picpara = picture(relationships, 'image1.png',
+                                     'This is a test description')
+    body.append(picpara)
+
     # Search and replace
     print 'Searching for something in a paragraph ...',
-    if search(docbody, 'the awesomeness'): print 'found it!'
-    else: print 'nope.'
-    
+    if search(body, 'the awesomeness'):
+        print 'found it!'
+    else:
+        print 'nope.'
+
     print 'Searching for something in a heading ...',
-    if search(docbody, '200 lines'): print 'found it!'
-    else: print 'nope.'
-    
+    if search(body, '200 lines'):
+        print 'found it!'
+    else:
+        print 'nope.'
+
     print 'Replacing ...',
-    docbody = replace(docbody,'the awesomeness','the goshdarned awesomeness') 
+    body = replace(body, 'the awesomeness', 'the goshdarned awesomeness')
     print 'done.'
 
     # Add a pagebreak
-    docbody.append(pagebreak(type='page', orient='portrait'))
+    body.append(pagebreak(type='page', orient='portrait'))
 
-    docbody.append(heading('Ideas? Questions? Want to contribute?',2))
-    docbody.append(paragraph('''Email <python.docx@librelist.com>'''))
+    body.append(heading('Ideas? Questions? Want to contribute?', 2))
+    body.append(paragraph('Email <python.docx@librelist.com>'))
 
     # Create our properties, contenttypes, and other support files
-    coreprops = coreproperties(title='Python docx demo',subject='A practical example of making docx from Python',creator='Mike MacCana',keywords=['python','Office Open XML','Word'])
+    title    = 'Python docx demo'
+    subject  = 'A practical example of making docx from Python'
+    creator  = 'Mike MacCana'
+    keywords = ['python', 'Office Open XML', 'Word']
+
+    coreprops = coreproperties(title=title, subject=subject, creator=creator,
+                               keywords=keywords)
     appprops = appproperties()
     contenttypes = contenttypes()
     websettings = websettings()
     wordrelationships = wordrelationships(relationships)
-    
+
     # Save our document
-    savedocx(document,coreprops,appprops,contenttypes,websettings,wordrelationships,'Welcome to the Python docx module.docx')
\ No newline at end of file
+    savedocx(document, coreprops, appprops, contenttypes, websettings,
+             wordrelationships, 'Welcome to the Python docx module.docx')
+

From 543d3053ddbc525327cb7deead308494673663eb Mon Sep 17 00:00:00 2001
From: Steve Canny <scanny@cisco.com>
Date: Thu, 7 Mar 2013 17:44:28 -0800
Subject: [PATCH 03/25] reformat to PEP8 standards

* Add Makefile for common operations
* Prepare 0.2.0 release
---
 .gitignore | 234 +----------------------
 Makefile   |  28 +++
 docx.py    | 532 +++++++++++++++++++++++++++++------------------------
 setup.py   |   4 +-
 4 files changed, 328 insertions(+), 470 deletions(-)
 create mode 100644 Makefile

diff --git a/.gitignore b/.gitignore
index 352fe3b..a67f55a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,236 +3,6 @@
 *.docx
 *.kpf
 build
-problems
+dist
 template/word/media
-bin/activate
-bin/activate_this.py
-bin/easy_install
-bin/easy_install-2.6
-bin/get_env_details
-bin/pilconvert.py
-bin/pildriver.py
-bin/pilfile.py
-bin/pilfont.py
-bin/pilprint.py
-bin/pip
-bin/postactivate
-bin/postdeactivate
-bin/preactivate
-bin/predeactivate
-bin/python
-bin/python2.6
-include/python2.6
-lib/python2.6/UserDict.py
-lib/python2.6/UserDict.pyo
-lib/python2.6/_abcoll.py
-lib/python2.6/_abcoll.pyo
-lib/python2.6/abc.py
-lib/python2.6/abc.pyo
-lib/python2.6/codecs.py
-lib/python2.6/codecs.pyo
-lib/python2.6/config
-lib/python2.6/copy_reg.py
-lib/python2.6/copy_reg.pyo
-lib/python2.6/distutils/__init__.py
-lib/python2.6/distutils/distutils.cfg
-lib/python2.6/encodings
-lib/python2.6/fnmatch.py
-lib/python2.6/fnmatch.pyo
-lib/python2.6/genericpath.py
-lib/python2.6/genericpath.pyo
-lib/python2.6/lib-dynload
-lib/python2.6/linecache.py
-lib/python2.6/linecache.pyo
-lib/python2.6/locale.py
-lib/python2.6/locale.pyo
-lib/python2.6/ntpath.py
-lib/python2.6/ntpath.pyo
-lib/python2.6/orig-prefix.txt
-lib/python2.6/os.py
-lib/python2.6/os.pyo
-lib/python2.6/posixpath.py
-lib/python2.6/posixpath.pyo
-lib/python2.6/re.py
-lib/python2.6/re.pyo
-lib/python2.6/site-packages/PIL.pth
-lib/python2.6/site-packages/PIL/ArgImagePlugin.py
-lib/python2.6/site-packages/PIL/BdfFontFile.py
-lib/python2.6/site-packages/PIL/BmpImagePlugin.py
-lib/python2.6/site-packages/PIL/BufrStubImagePlugin.py
-lib/python2.6/site-packages/PIL/ContainerIO.py
-lib/python2.6/site-packages/PIL/CurImagePlugin.py
-lib/python2.6/site-packages/PIL/DcxImagePlugin.py
-lib/python2.6/site-packages/PIL/EpsImagePlugin.py
-lib/python2.6/site-packages/PIL/ExifTags.py
-lib/python2.6/site-packages/PIL/FitsStubImagePlugin.py
-lib/python2.6/site-packages/PIL/FliImagePlugin.py
-lib/python2.6/site-packages/PIL/FontFile.py
-lib/python2.6/site-packages/PIL/FpxImagePlugin.py
-lib/python2.6/site-packages/PIL/GbrImagePlugin.py
-lib/python2.6/site-packages/PIL/GdImageFile.py
-lib/python2.6/site-packages/PIL/GifImagePlugin.py
-lib/python2.6/site-packages/PIL/GimpGradientFile.py
-lib/python2.6/site-packages/PIL/GimpPaletteFile.py
-lib/python2.6/site-packages/PIL/GribStubImagePlugin.py
-lib/python2.6/site-packages/PIL/Hdf5StubImagePlugin.py
-lib/python2.6/site-packages/PIL/IcnsImagePlugin.py
-lib/python2.6/site-packages/PIL/IcoImagePlugin.py
-lib/python2.6/site-packages/PIL/ImImagePlugin.py
-lib/python2.6/site-packages/PIL/Image.py
-lib/python2.6/site-packages/PIL/ImageChops.py
-lib/python2.6/site-packages/PIL/ImageCms.py
-lib/python2.6/site-packages/PIL/ImageColor.py
-lib/python2.6/site-packages/PIL/ImageDraw.py
-lib/python2.6/site-packages/PIL/ImageDraw2.py
-lib/python2.6/site-packages/PIL/ImageEnhance.py
-lib/python2.6/site-packages/PIL/ImageFile.py
-lib/python2.6/site-packages/PIL/ImageFileIO.py
-lib/python2.6/site-packages/PIL/ImageFilter.py
-lib/python2.6/site-packages/PIL/ImageFont.py
-lib/python2.6/site-packages/PIL/ImageGL.py
-lib/python2.6/site-packages/PIL/ImageGrab.py
-lib/python2.6/site-packages/PIL/ImageMath.py
-lib/python2.6/site-packages/PIL/ImageMode.py
-lib/python2.6/site-packages/PIL/ImageOps.py
-lib/python2.6/site-packages/PIL/ImagePalette.py
-lib/python2.6/site-packages/PIL/ImagePath.py
-lib/python2.6/site-packages/PIL/ImageQt.py
-lib/python2.6/site-packages/PIL/ImageSequence.py
-lib/python2.6/site-packages/PIL/ImageShow.py
-lib/python2.6/site-packages/PIL/ImageStat.py
-lib/python2.6/site-packages/PIL/ImageTk.py
-lib/python2.6/site-packages/PIL/ImageTransform.py
-lib/python2.6/site-packages/PIL/ImageWin.py
-lib/python2.6/site-packages/PIL/ImtImagePlugin.py
-lib/python2.6/site-packages/PIL/IptcImagePlugin.py
-lib/python2.6/site-packages/PIL/JpegImagePlugin.py
-lib/python2.6/site-packages/PIL/McIdasImagePlugin.py
-lib/python2.6/site-packages/PIL/MicImagePlugin.py
-lib/python2.6/site-packages/PIL/MpegImagePlugin.py
-lib/python2.6/site-packages/PIL/MspImagePlugin.py
-lib/python2.6/site-packages/PIL/OleFileIO.py
-lib/python2.6/site-packages/PIL/PIL-1.1.7-py2.6.egg-info/PKG-INFO
-lib/python2.6/site-packages/PIL/PIL-1.1.7-py2.6.egg-info/SOURCES.txt
-lib/python2.6/site-packages/PIL/PIL-1.1.7-py2.6.egg-info/dependency_links.txt
-lib/python2.6/site-packages/PIL/PIL-1.1.7-py2.6.egg-info/installed-files.txt
-lib/python2.6/site-packages/PIL/PIL-1.1.7-py2.6.egg-info/top_level.txt
-lib/python2.6/site-packages/PIL/PSDraw.py
-lib/python2.6/site-packages/PIL/PaletteFile.py
-lib/python2.6/site-packages/PIL/PalmImagePlugin.py
-lib/python2.6/site-packages/PIL/PcdImagePlugin.py
-lib/python2.6/site-packages/PIL/PcfFontFile.py
-lib/python2.6/site-packages/PIL/PcxImagePlugin.py
-lib/python2.6/site-packages/PIL/PdfImagePlugin.py
-lib/python2.6/site-packages/PIL/PixarImagePlugin.py
-lib/python2.6/site-packages/PIL/PngImagePlugin.py
-lib/python2.6/site-packages/PIL/PpmImagePlugin.py
-lib/python2.6/site-packages/PIL/PsdImagePlugin.py
-lib/python2.6/site-packages/PIL/SgiImagePlugin.py
-lib/python2.6/site-packages/PIL/SpiderImagePlugin.py
-lib/python2.6/site-packages/PIL/SunImagePlugin.py
-lib/python2.6/site-packages/PIL/TarIO.py
-lib/python2.6/site-packages/PIL/TgaImagePlugin.py
-lib/python2.6/site-packages/PIL/TiffImagePlugin.py
-lib/python2.6/site-packages/PIL/TiffTags.py
-lib/python2.6/site-packages/PIL/WalImageFile.py
-lib/python2.6/site-packages/PIL/WmfImagePlugin.py
-lib/python2.6/site-packages/PIL/XVThumbImagePlugin.py
-lib/python2.6/site-packages/PIL/XbmImagePlugin.py
-lib/python2.6/site-packages/PIL/XpmImagePlugin.py
-lib/python2.6/site-packages/PIL/__init__.py
-lib/python2.6/site-packages/PIL/_imaging.so
-lib/python2.6/site-packages/PIL/_imagingmath.so
-lib/python2.6/site-packages/PIL/_imagingtk.so
-lib/python2.6/site-packages/easy-install.pth
-lib/python2.6/site-packages/lxml-2.3beta1-py2.6.egg-info/PKG-INFO
-lib/python2.6/site-packages/lxml-2.3beta1-py2.6.egg-info/SOURCES.txt
-lib/python2.6/site-packages/lxml-2.3beta1-py2.6.egg-info/dependency_links.txt
-lib/python2.6/site-packages/lxml-2.3beta1-py2.6.egg-info/installed-files.txt
-lib/python2.6/site-packages/lxml-2.3beta1-py2.6.egg-info/not-zip-safe
-lib/python2.6/site-packages/lxml-2.3beta1-py2.6.egg-info/top_level.txt
-lib/python2.6/site-packages/lxml/ElementInclude.py
-lib/python2.6/site-packages/lxml/__init__.py
-lib/python2.6/site-packages/lxml/_elementpath.py
-lib/python2.6/site-packages/lxml/builder.py
-lib/python2.6/site-packages/lxml/cssselect.py
-lib/python2.6/site-packages/lxml/doctestcompare.py
-lib/python2.6/site-packages/lxml/etree.so
-lib/python2.6/site-packages/lxml/html/ElementSoup.py
-lib/python2.6/site-packages/lxml/html/__init__.py
-lib/python2.6/site-packages/lxml/html/_dictmixin.py
-lib/python2.6/site-packages/lxml/html/_diffcommand.py
-lib/python2.6/site-packages/lxml/html/_html5builder.py
-lib/python2.6/site-packages/lxml/html/_setmixin.py
-lib/python2.6/site-packages/lxml/html/builder.py
-lib/python2.6/site-packages/lxml/html/clean.py
-lib/python2.6/site-packages/lxml/html/defs.py
-lib/python2.6/site-packages/lxml/html/diff.py
-lib/python2.6/site-packages/lxml/html/formfill.py
-lib/python2.6/site-packages/lxml/html/html5parser.py
-lib/python2.6/site-packages/lxml/html/soupparser.py
-lib/python2.6/site-packages/lxml/html/usedoctest.py
-lib/python2.6/site-packages/lxml/isoschematron/__init__.py
-lib/python2.6/site-packages/lxml/isoschematron/resources/rng/iso-schematron.rng
-lib/python2.6/site-packages/lxml/isoschematron/resources/xsl/RNG2Schtrn.xsl
-lib/python2.6/site-packages/lxml/isoschematron/resources/xsl/XSD2Schtrn.xsl
-lib/python2.6/site-packages/lxml/isoschematron/resources/xsl/iso-schematron-xslt1/iso_abstract_expand.xsl
-lib/python2.6/site-packages/lxml/isoschematron/resources/xsl/iso-schematron-xslt1/iso_dsdl_include.xsl
-lib/python2.6/site-packages/lxml/isoschematron/resources/xsl/iso-schematron-xslt1/iso_schematron_message.xsl
-lib/python2.6/site-packages/lxml/isoschematron/resources/xsl/iso-schematron-xslt1/iso_schematron_skeleton_for_xslt1.xsl
-lib/python2.6/site-packages/lxml/isoschematron/resources/xsl/iso-schematron-xslt1/iso_svrl_for_xslt1.xsl
-lib/python2.6/site-packages/lxml/isoschematron/resources/xsl/iso-schematron-xslt1/readme.txt
-lib/python2.6/site-packages/lxml/objectify.so
-lib/python2.6/site-packages/lxml/pyclasslookup.py
-lib/python2.6/site-packages/lxml/sax.py
-lib/python2.6/site-packages/lxml/usedoctest.py
-lib/python2.6/site-packages/pip-0.7.2-py2.6.egg/EGG-INFO/PKG-INFO
-lib/python2.6/site-packages/pip-0.7.2-py2.6.egg/EGG-INFO/SOURCES.txt
-lib/python2.6/site-packages/pip-0.7.2-py2.6.egg/EGG-INFO/dependency_links.txt
-lib/python2.6/site-packages/pip-0.7.2-py2.6.egg/EGG-INFO/entry_points.txt
-lib/python2.6/site-packages/pip-0.7.2-py2.6.egg/EGG-INFO/not-zip-safe
-lib/python2.6/site-packages/pip-0.7.2-py2.6.egg/EGG-INFO/top_level.txt
-lib/python2.6/site-packages/pip-0.7.2-py2.6.egg/pip/__init__.py
-lib/python2.6/site-packages/pip-0.7.2-py2.6.egg/pip/backwardcompat.py
-lib/python2.6/site-packages/pip-0.7.2-py2.6.egg/pip/basecommand.py
-lib/python2.6/site-packages/pip-0.7.2-py2.6.egg/pip/baseparser.py
-lib/python2.6/site-packages/pip-0.7.2-py2.6.egg/pip/commands/__init__.py
-lib/python2.6/site-packages/pip-0.7.2-py2.6.egg/pip/commands/bundle.py
-lib/python2.6/site-packages/pip-0.7.2-py2.6.egg/pip/commands/completion.py
-lib/python2.6/site-packages/pip-0.7.2-py2.6.egg/pip/commands/freeze.py
-lib/python2.6/site-packages/pip-0.7.2-py2.6.egg/pip/commands/help.py
-lib/python2.6/site-packages/pip-0.7.2-py2.6.egg/pip/commands/install.py
-lib/python2.6/site-packages/pip-0.7.2-py2.6.egg/pip/commands/search.py
-lib/python2.6/site-packages/pip-0.7.2-py2.6.egg/pip/commands/uninstall.py
-lib/python2.6/site-packages/pip-0.7.2-py2.6.egg/pip/commands/unzip.py
-lib/python2.6/site-packages/pip-0.7.2-py2.6.egg/pip/commands/zip.py
-lib/python2.6/site-packages/pip-0.7.2-py2.6.egg/pip/exceptions.py
-lib/python2.6/site-packages/pip-0.7.2-py2.6.egg/pip/index.py
-lib/python2.6/site-packages/pip-0.7.2-py2.6.egg/pip/locations.py
-lib/python2.6/site-packages/pip-0.7.2-py2.6.egg/pip/log.py
-lib/python2.6/site-packages/pip-0.7.2-py2.6.egg/pip/req.py
-lib/python2.6/site-packages/pip-0.7.2-py2.6.egg/pip/runner.py
-lib/python2.6/site-packages/pip-0.7.2-py2.6.egg/pip/util.py
-lib/python2.6/site-packages/pip-0.7.2-py2.6.egg/pip/vcs/__init__.py
-lib/python2.6/site-packages/pip-0.7.2-py2.6.egg/pip/vcs/bazaar.py
-lib/python2.6/site-packages/pip-0.7.2-py2.6.egg/pip/vcs/git.py
-lib/python2.6/site-packages/pip-0.7.2-py2.6.egg/pip/vcs/mercurial.py
-lib/python2.6/site-packages/pip-0.7.2-py2.6.egg/pip/vcs/subversion.py
-lib/python2.6/site-packages/pip-0.7.2-py2.6.egg/pip/venv.py
-lib/python2.6/site-packages/setuptools-0.6c11-py2.6.egg
-lib/python2.6/site-packages/setuptools.pth
-lib/python2.6/site.py
-lib/python2.6/sre.py
-lib/python2.6/sre.pyo
-lib/python2.6/sre_compile.py
-lib/python2.6/sre_compile.pyo
-lib/python2.6/sre_constants.py
-lib/python2.6/sre_constants.pyo
-lib/python2.6/sre_parse.py
-lib/python2.6/sre_parse.pyo
-lib/python2.6/stat.py
-lib/python2.6/stat.pyo
-lib/python2.6/types.py
-lib/python2.6/types.pyo
-lib/python2.6/warnings.py
-lib/python2.6/warnings.pyo
\ No newline at end of file
+MANIFEST
diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..52d1c96
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,28 @@
+PYTHON = $(shell test -x bin/python && echo bin/python || echo `which python`)
+SETUP  = $(PYTHON) ./setup.py
+
+.PHONY: clean help coverage register sdist upload
+
+help:
+	@echo "Please use \`make <target>' where <target> is one or more of"
+	@echo "  clean     delete intermediate work product and start fresh"
+	@echo "  coverage  run nosetests with coverage"
+	@echo "  register  update metadata (README.rst) on PyPI"
+	@echo "  sdist     generate a source distribution into dist/"
+	@echo "  upload    upload distribution tarball to PyPI"
+
+clean:
+	find . -type f -name \*.pyc -exec rm {} \;
+	rm -rf dist .coverage .DS_Store MANIFEST
+
+coverage:
+	nosetests --with-coverage --cover-package=docx --cover-erase
+
+register:
+	$(SETUP) register
+
+sdist:
+	$(SETUP) sdist
+
+upload:
+	$(SETUP) sdist upload
diff --git a/docx.py b/docx.py
index b573b49..3ab37bb 100755
--- a/docx.py
+++ b/docx.py
@@ -1,11 +1,12 @@
 #!/usr/bin/env python2.6
 # -*- coding: utf-8 -*-
-'''
-Open and modify Microsoft Word 2007 docx files (called 'OpenXML' and 'Office OpenXML' by Microsoft)
+"""
+Open and modify Microsoft Word 2007 docx files (called 'OpenXML' and
+'Office OpenXML' by Microsoft)
 
 Part of Python's docx module - http://github.com/mikemaccana/python-docx
 See LICENSE for licensing information.
-'''
+"""
 
 import logging
 from lxml import etree
@@ -24,42 +25,42 @@
 
 # Record template directory's location which is just 'template' for a docx
 # developer or 'site-packages/docx-template' if you have installed docx
-template_dir = join(os.path.dirname(__file__), 'docx-template') # installed
+template_dir = join(os.path.dirname(__file__), 'docx-template')  # installed
 if not os.path.isdir(template_dir):
-    template_dir = join(os.path.dirname(__file__), 'template') # dev
+    template_dir = join(os.path.dirname(__file__), 'template')  # dev
 
 # All Word prefixes / namespace matches used in document.xml & core.xml.
 # LXML doesn't actually use prefixes (just the real namespace) , but these
 # make it easier to copy Word output more easily.
-nsprefixes =\
-    { 'mo'  : 'http://schemas.microsoft.com/office/mac/office/2008/main'
-    , 'o'   : 'urn:schemas-microsoft-com:office:office'
-    , 've'  : 'http://schemas.openxmlformats.org/markup-compatibility/2006'
-      # Text Content
-    , 'w'   : 'http://schemas.openxmlformats.org/wordprocessingml/2006/main'
-    , 'w10' : 'urn:schemas-microsoft-com:office:word'
-    , 'wne' : 'http://schemas.microsoft.com/office/word/2006/wordml'
-      # Drawing
-    , 'a'   : 'http://schemas.openxmlformats.org/drawingml/2006/main'
-    , 'm'   : 'http://schemas.openxmlformats.org/officeDocument/2006/math'
-    , 'mv'  : 'urn:schemas-microsoft-com:mac:vml'
-    , 'pic' : 'http://schemas.openxmlformats.org/drawingml/2006/picture'
-    , 'v'   : 'urn:schemas-microsoft-com:vml'
-    , 'wp'  : 'http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing'
-      # Properties (core and extended)
-    , 'cp'  : 'http://schemas.openxmlformats.org/package/2006/metadata/core-properties'
-    , 'dc'  : 'http://purl.org/dc/elements/1.1/'
-    , 'ep'  : 'http://schemas.openxmlformats.org/officeDocument/2006/extended-properties'
-    , 'xsi' : 'http://www.w3.org/2001/XMLSchema-instance'
-      # Content Types (we're just making up our own namespaces here to save time)
-    , 'ct'  : 'http://schemas.openxmlformats.org/package/2006/content-types'
-      # Package Relationships (we're just making up our own namespaces here to save time)
-    , 'r'   : 'http://schemas.openxmlformats.org/officeDocument/2006/relationships'
-    , 'pr'  : 'http://schemas.openxmlformats.org/package/2006/relationships'
-      # Dublin Core document properties
-    , 'dcmitype' :'http://purl.org/dc/dcmitype/'
-    , 'dcterms'  :'http://purl.org/dc/terms/'
-    }
+nsprefixes = {
+    'mo': 'http://schemas.microsoft.com/office/mac/office/2008/main',
+    'o':  'urn:schemas-microsoft-com:office:office',
+    've': 'http://schemas.openxmlformats.org/markup-compatibility/2006',
+    # Text Content
+    'w':   'http://schemas.openxmlformats.org/wordprocessingml/2006/main',
+    'w10': 'urn:schemas-microsoft-com:office:word',
+    'wne': 'http://schemas.microsoft.com/office/word/2006/wordml',
+    # Drawing
+    'a':   'http://schemas.openxmlformats.org/drawingml/2006/main',
+    'm':   'http://schemas.openxmlformats.org/officeDocument/2006/math',
+    'mv':  'urn:schemas-microsoft-com:mac:vml',
+    'pic': 'http://schemas.openxmlformats.org/drawingml/2006/picture',
+    'v':   'urn:schemas-microsoft-com:vml',
+    'wp':  'http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing',
+    # Properties (core and extended)
+    'cp':  'http://schemas.openxmlformats.org/package/2006/metadata/core-properties',
+    'dc':  'http://purl.org/dc/elements/1.1/',
+    'ep':  'http://schemas.openxmlformats.org/officeDocument/2006/extended-properties',
+    'xsi': 'http://www.w3.org/2001/XMLSchema-instance',
+    # Content Types
+    'ct':  'http://schemas.openxmlformats.org/package/2006/content-types',
+    # Package Relationships
+    'r':   'http://schemas.openxmlformats.org/officeDocument/2006/relationships',
+    'pr':  'http://schemas.openxmlformats.org/package/2006/relationships',
+    # Dublin Core document properties
+    'dcmitype': 'http://purl.org/dc/dcmitype/',
+    'dcterms':  'http://purl.org/dc/terms/'}
+
 
 def opendocx(file):
     '''Open a docx file, return a document XML tree'''
@@ -68,11 +69,13 @@ def opendocx(file):
     document = etree.fromstring(xmlcontent)
     return document
 
+
 def newdocument():
     document = makeelement('document')
     document.append(makeelement('body'))
     return document
 
+
 def makeelement(tagname, tagtext=None, nsprefix='w', attributes=None, attrnsprefix=None):
     '''Create an element & return it'''
     # Deal with list of nsprefix by making namespacemap
@@ -81,7 +84,8 @@ def makeelement(tagname, tagtext=None, nsprefix='w', attributes=None, attrnspref
         namespacemap = {}
         for prefix in nsprefix:
             namespacemap[prefix] = nsprefixes[prefix]
-        nsprefix = nsprefix[0] # FIXME: rest of code below expects a single prefix
+        # FIXME: rest of code below expects a single prefix
+        nsprefix = nsprefix[0]
     if nsprefix:
         namespace = '{'+nsprefixes[nsprefix]+'}'
     else:
@@ -100,13 +104,14 @@ def makeelement(tagname, tagtext=None, nsprefix='w', attributes=None, attrnspref
                 attributenamespace = ''
         else:
             attributenamespace = '{'+nsprefixes[attrnsprefix]+'}'
-            
+
         for tagattribute in attributes:
             newelement.set(attributenamespace+tagattribute, attributes[tagattribute])
     if tagtext:
         newelement.text = tagtext
     return newelement
 
+
 def pagebreak(type='page', orient='portrait'):
     '''Insert a break, default 'page'.
     See http://openxmldeveloper.org/forums/thread/4075.aspx
@@ -114,49 +119,52 @@ def pagebreak(type='page', orient='portrait'):
     # Need to enumerate different types of page breaks.
     validtypes = ['page', 'section']
     if type not in validtypes:
-        raise ValueError('Page break style "%s" not implemented. Valid styles: %s.' % (type, validtypes))
+        tmpl = 'Page break style "%s" not implemented. Valid styles: %s.'
+        raise ValueError(tmpl % (type, validtypes))
     pagebreak = makeelement('p')
     if type == 'page':
         run = makeelement('r')
-        br = makeelement('br', attributes={'type':type})
+        br = makeelement('br', attributes={'type': type})
         run.append(br)
         pagebreak.append(run)
     elif type == 'section':
         pPr = makeelement('pPr')
         sectPr = makeelement('sectPr')
         if orient == 'portrait':
-            pgSz = makeelement('pgSz', attributes={'w':'12240', 'h':'15840'})
+            pgSz = makeelement('pgSz', attributes={'w': '12240', 'h': '15840'})
         elif orient == 'landscape':
-            pgSz = makeelement('pgSz', attributes={'h':'12240', 'w':'15840', 'orient':'landscape'})
+            pgSz = makeelement('pgSz', attributes={'h': '12240', 'w': '15840',
+                                                   'orient': 'landscape'})
         sectPr.append(pgSz)
         pPr.append(sectPr)
         pagebreak.append(pPr)
     return pagebreak
 
+
 def paragraph(paratext, style='BodyText', breakbefore=False, jc='left'):
     '''Make a new paragraph element, containing a run, and some text.
     Return the paragraph element.
-    
+
     @param string jc: Paragraph alignment, possible values:
                       left, center, right, both (justified), ...
                       see http://www.schemacentral.com/sc/ooxml/t-w_ST_Jc.html
                       for a full list
-    
+
     If paratext is a list, spawn multiple run/text elements.
     Support text styles (paratext must then be a list of lists in the form
     <text> / <style>. Stile is a string containing a combination od 'bui' chars
-    
+
     example
     paratext =\
         [ ('some bold text', 'b')
         , ('some normal text', '')
         , ('some italic underlined text', 'iu')
         ]
-    
+
     '''
     # Make our elements
     paragraph = makeelement('p')
-    
+
     if isinstance(paratext, list):
         text = []
         for pt in paratext:
@@ -167,11 +175,11 @@ def paragraph(paratext, style='BodyText', breakbefore=False, jc='left'):
     else:
         text = [[makeelement('t', tagtext=paratext), ''], ]
     pPr = makeelement('pPr')
-    pStyle = makeelement('pStyle', attributes={'val':style})
-    pJc = makeelement('jc', attributes={'val':jc})
+    pStyle = makeelement('pStyle', attributes={'val': style})
+    pJc = makeelement('jc', attributes={'val': jc})
     pPr.append(pStyle)
     pPr.append(pJc)
-    
+
     # Add the text the run, and the run to the paragraph
     paragraph.append(pPr)
     for t in text:
@@ -182,7 +190,7 @@ def paragraph(paratext, style='BodyText', breakbefore=False, jc='left'):
             b = makeelement('b')
             rPr.append(b)
         if t[1].find('u') > -1:
-            u = makeelement('u', attributes={'val':'single'})
+            u = makeelement('u', attributes={'val': 'single'})
             rPr.append(u)
         if t[1].find('i') > -1:
             i = makeelement('i')
@@ -198,43 +206,55 @@ def paragraph(paratext, style='BodyText', breakbefore=False, jc='left'):
     # Return the combined paragraph
     return paragraph
 
+
 def contenttypes():
-    # FIXME - doesn't quite work...read from string as temp hack...
-    #types = makeelement('Types', nsprefix='ct')
-    types = etree.fromstring('<Types xmlns="http://schemas.openxmlformats.org/package/2006/content-types"></Types>')
-    parts =\
-        { '/word/theme/theme1.xml' : 'application/vnd.openxmlformats-officedocument.theme+xml'
-        , '/word/fontTable.xml'    : 'application/vnd.openxmlformats-officedocument.wordprocessingml.fontTable+xml'
-        , '/docProps/core.xml'     : 'application/vnd.openxmlformats-package.core-properties+xml'
-        , '/docProps/app.xml'      : 'application/vnd.openxmlformats-officedocument.extended-properties+xml'
-        , '/word/document.xml'     : 'application/vnd.openxmlformats-officedocument.wordprocessingml.document.main+xml'
-        , '/word/settings.xml'     : 'application/vnd.openxmlformats-officedocument.wordprocessingml.settings+xml'
-        , '/word/numbering.xml'    : 'application/vnd.openxmlformats-officedocument.wordprocessingml.numbering+xml'
-        , '/word/styles.xml'       : 'application/vnd.openxmlformats-officedocument.wordprocessingml.styles+xml'
-        , '/word/webSettings.xml'  : 'application/vnd.openxmlformats-officedocument.wordprocessingml.webSettings+xml'
-        }
+    types = etree.fromstring(
+        '<Types xmlns="http://schemas.openxmlformats.org/package/2006/conten'
+        't-types"></Types>')
+    parts = {
+        '/word/theme/theme1.xml': 'application/vnd.openxmlformats-officedocu'
+                                  'ment.theme+xml',
+        '/word/fontTable.xml':    'application/vnd.openxmlformats-officedocu'
+                                  'ment.wordprocessingml.fontTable+xml',
+        '/docProps/core.xml':     'application/vnd.openxmlformats-package.co'
+                                  're-properties+xml',
+        '/docProps/app.xml':      'application/vnd.openxmlformats-officedocu'
+                                  'ment.extended-properties+xml',
+        '/word/document.xml':     'application/vnd.openxmlformats-officedocu'
+                                  'ment.wordprocessingml.document.main+xml',
+        '/word/settings.xml':     'application/vnd.openxmlformats-officedocu'
+                                  'ment.wordprocessingml.settings+xml',
+        '/word/numbering.xml':    'application/vnd.openxmlformats-officedocu'
+                                  'ment.wordprocessingml.numbering+xml',
+        '/word/styles.xml':       'application/vnd.openxmlformats-officedocu'
+                                  'ment.wordprocessingml.styles+xml',
+        '/word/webSettings.xml':  'application/vnd.openxmlformats-officedocu'
+                                  'ment.wordprocessingml.webSettings+xml'}
     for part in parts:
-        types.append(makeelement('Override', nsprefix=None, attributes={'PartName':part, 'ContentType':parts[part]}))
+        types.append(makeelement('Override', nsprefix=None,
+                                 attributes={'PartName': part,
+                                             'ContentType': parts[part]}))
     # Add support for filetypes
-    filetypes =\
-        { 'gif'  : 'image/gif'
-        , 'jpeg' : 'image/jpeg'
-        , 'jpg'  : 'image/jpeg'
-        , 'png'  : 'image/png'
-        , 'rels' : 'application/vnd.openxmlformats-package.relationships+xml'
-        , 'xml'  : 'application/xml'
-        }
+    filetypes = {'gif':  'image/gif',
+                 'jpeg': 'image/jpeg',
+                 'jpg':  'image/jpeg',
+                 'png':  'image/png',
+                 'rels': 'application/vnd.openxmlformats-package.relationships+xml',
+                 'xml':  'application/xml'}
     for extension in filetypes:
-        types.append(makeelement('Default', nsprefix=None, attributes={'Extension':extension, 'ContentType':filetypes[extension]}))
+        types.append(makeelement('Default', nsprefix=None,
+                                 attributes={'Extension': extension,
+                                             'ContentType': filetypes[extension]}))
     return types
 
+
 def heading(headingtext, headinglevel, lang='en'):
     '''Make a new heading, return the heading element'''
     lmap = {'en': 'Heading', 'it': 'Titolo'}
     # Make our elements
     paragraph = makeelement('p')
     pr = makeelement('pPr')
-    pStyle = makeelement('pStyle', attributes={'val':lmap[lang]+str(headinglevel)})
+    pStyle = makeelement('pStyle', attributes={'val': lmap[lang]+str(headinglevel)})
     run = makeelement('r')
     text = makeelement('t', tagtext=headingtext)
     # Add the text the run, and the run to the paragraph
@@ -245,46 +265,52 @@ def heading(headingtext, headinglevel, lang='en'):
     # Return the combined paragraph
     return paragraph
 
+
 def table(contents, heading=True, colw=None, cwunit='dxa', tblw=0, twunit='auto', borders={}, celstyle=None):
-    '''Get a list of lists, return a table
-    
-        @param list contents: A list of lists describing contents
-                              Every item in the list can be a string or a valid
-                              XML element itself. It can also be a list. In that case
-                              all the listed elements will be merged into the cell.
-        @param bool heading: Tells whether first line should be threated as heading
-                             or not
-        @param list colw: A list of interger. The list must have same element
-                          count of content lines. Specify column Widths in
-                          wunitS
-        @param string cwunit: Unit user for column width:
-                                'pct': fifties of a percent
-                                'dxa': twenties of a point
-                                'nil': no width
-                                'auto': automagically determined
-        @param int tblw: Table width
-        @param int twunit: Unit used for table width. Same as cwunit
-        @param dict borders: Dictionary defining table border. Supported keys are:
-                             'top', 'left', 'bottom', 'right', 'insideH', 'insideV', 'all'
-                             When specified, the 'all' key has precedence over others.
-                             Each key must define a dict of border attributes:
-                             color: The color of the border, in hex or 'auto'
-                             space: The space, measured in points
-                             sz: The size of the border, in eights of a point
-                             val: The style of the border, see http://www.schemacentral.com/sc/ooxml/t-w_ST_Border.htm
-        @param list celstyle: Specify the style for each colum, list of dicts.
-                              supported keys:
-                              'align': specify the alignment, see paragraph documentation.
-    
-        @return lxml.etree: Generated XML etree element
-    '''
+    """
+    Return a table element based on specified parameters
+
+    @param list contents: A list of lists describing contents. Every item in
+                          the list can be a string or a valid XML element
+                          itself. It can also be a list. In that case all the
+                          listed elements will be merged into the cell.
+    @param bool heading:  Tells whether first line should be treated as
+                          heading or not
+    @param list colw:     list of integer column widths specified in wunitS.
+    @param str  cwunit:   Unit used for column width:
+                            'pct'  : fiftieths of a percent
+                            'dxa'  : twentieths of a point
+                            'nil'  : no width
+                            'auto' : automagically determined
+    @param int  tblw:     Table width
+    @param int  twunit:   Unit used for table width. Same possible values as
+                          cwunit.
+    @param dict borders:  Dictionary defining table border. Supported keys
+                          are: 'top', 'left', 'bottom', 'right',
+                          'insideH', 'insideV', 'all'.
+                          When specified, the 'all' key has precedence over
+                          others. Each key must define a dict of border
+                          attributes:
+                            color : The color of the border, in hex or
+                                    'auto'
+                            space : The space, measured in points
+                            sz    : The size of the border, in eighths of
+                                    a point
+                            val   : The style of the border, see
+                http://www.schemacentral.com/sc/ooxml/t-w_ST_Border.htm
+    @param list celstyle: Specify the style for each colum, list of dicts.
+                          supported keys:
+                          'align' : specify the alignment, see paragraph
+                                    documentation.
+    @return lxml.etree:   Generated XML etree element
+    """
     table = makeelement('tbl')
     columns = len(contents[0])
     # Table properties
     tableprops = makeelement('tblPr')
-    tablestyle = makeelement('tblStyle', attributes={'val':''})
+    tablestyle = makeelement('tblStyle', attributes={'val': ''})
     tableprops.append(tablestyle)
-    tablewidth = makeelement('tblW', attributes={'w':str(tblw), 'type':str(twunit)})
+    tablewidth = makeelement('tblW', attributes={'w': str(tblw), 'type': str(twunit)})
     tableprops.append(tablewidth)
     if len(borders.keys()):
         tableborders = makeelement('tblBorders')
@@ -297,18 +323,18 @@ def table(contents, heading=True, colw=None, cwunit='dxa', tblw=0, twunit='auto'
                 borderelem = makeelement(b, attributes=attrs)
                 tableborders.append(borderelem)
         tableprops.append(tableborders)
-    tablelook = makeelement('tblLook', attributes={'val':'0400'})
+    tablelook = makeelement('tblLook', attributes={'val': '0400'})
     tableprops.append(tablelook)
     table.append(tableprops)
     # Table Grid
     tablegrid = makeelement('tblGrid')
     for i in range(columns):
-        tablegrid.append(makeelement('gridCol', attributes={'w':str(colw[i]) if colw else '2390'}))
+        tablegrid.append(makeelement('gridCol', attributes={'w': str(colw[i]) if colw else '2390'}))
     table.append(tablegrid)
     # Heading Row
     row = makeelement('tr')
     rowprops = makeelement('trPr')
-    cnfStyle = makeelement('cnfStyle', attributes={'val':'000000100000'})
+    cnfStyle = makeelement('cnfStyle', attributes={'val': '000000100000'})
     rowprops.append(cnfStyle)
     row.append(rowprops)
     if heading:
@@ -318,11 +344,15 @@ def table(contents, heading=True, colw=None, cwunit='dxa', tblw=0, twunit='auto'
             # Cell properties
             cellprops = makeelement('tcPr')
             if colw:
-                wattr = {'w':str(colw[i]), 'type':cwunit}
+                wattr = {'w': str(colw[i]), 'type': cwunit}
             else:
-                wattr = {'w':'0', 'type':'auto'}
+                wattr = {'w': '0', 'type': 'auto'}
             cellwidth = makeelement('tcW', attributes=wattr)
-            cellstyle = makeelement('shd', attributes={'val':'clear', 'color':'auto', 'fill':'FFFFFF', 'themeFill':'text2', 'themeFillTint':'99'})
+            cellstyle = makeelement('shd', attributes={'val': 'clear',
+                                                       'color': 'auto',
+                                                       'fill': 'FFFFFF',
+                                                       'themeFill': 'text2',
+                                                       'themeFillTint': '99'})
             cellprops.append(cellwidth)
             cellprops.append(cellstyle)
             cell.append(cellprops)
@@ -346,9 +376,9 @@ def table(contents, heading=True, colw=None, cwunit='dxa', tblw=0, twunit='auto'
             # Properties
             cellprops = makeelement('tcPr')
             if colw:
-                wattr = {'w':str(colw[i]), 'type':cwunit}
+                wattr = {'w': str(colw[i]), 'type': cwunit}
             else:
-                wattr = {'w':'0', 'type':'auto'}
+                wattr = {'w': '0', 'type': 'auto'}
             cellwidth = makeelement('tcW', attributes=wattr)
             cellprops.append(cellwidth)
             cell.append(cellprops)
@@ -369,6 +399,7 @@ def table(contents, heading=True, colw=None, cwunit='dxa', tblw=0, twunit='auto'
         table.append(row)
     return table
 
+
 def picture(relationshiplist, picname, picdescription, pixelwidth=None, pixelheight=None, nochangeaspect=True, nochangearrowheads=True):
     '''Take a relationshiplist, picture file name, and return a paragraph containing the image
     and an updated relationshiplist'''
@@ -380,79 +411,86 @@ def picture(relationshiplist, picname, picdescription, pixelwidth=None, pixelhei
     if not os.path.isdir(media_dir):
         os.mkdir(media_dir)
     shutil.copyfile(picname, join(media_dir, picname))
-    
+
     # Check if the user has specified a size
     if not pixelwidth or not pixelheight:
         # If not, get info from the picture itself
         pixelwidth, pixelheight = Image.open(picname).size[0:2]
-    
+
     # OpenXML measures on-screen objects in English Metric Units
     # 1cm = 36000 EMUs
     emuperpixel = 12667
     width = str(pixelwidth * emuperpixel)
     height = str(pixelheight * emuperpixel)
-    
+
     # Set relationship ID to the first available
     picid = '2'
     picrelid = 'rId'+str(len(relationshiplist)+1)
     relationshiplist.append([
         'http://schemas.openxmlformats.org/officeDocument/2006/relationships/image',
         'media/'+picname])
-    
+
     # There are 3 main elements inside a picture
     # 1. The Blipfill - specifies how the image fills the picture area (stretch, tile, etc.)
     blipfill = makeelement('blipFill', nsprefix='pic')
-    blipfill.append(makeelement('blip', nsprefix='a', attrnsprefix='r', attributes={'embed':picrelid}))
+    blipfill.append(makeelement('blip', nsprefix='a', attrnsprefix='r',
+                    attributes={'embed': picrelid}))
     stretch = makeelement('stretch', nsprefix='a')
     stretch.append(makeelement('fillRect', nsprefix='a'))
     blipfill.append(makeelement('srcRect', nsprefix='a'))
     blipfill.append(stretch)
-    
+
     # 2. The non visual picture properties
     nvpicpr = makeelement('nvPicPr', nsprefix='pic')
     cnvpr = makeelement('cNvPr', nsprefix='pic',
-                        attributes={'id':'0', 'name':'Picture 1', 'descr':picname})
+                        attributes={'id': '0', 'name': 'Picture 1', 'descr': picname})
     nvpicpr.append(cnvpr)
     cnvpicpr = makeelement('cNvPicPr', nsprefix='pic')
     cnvpicpr.append(makeelement('picLocks', nsprefix='a',
-                    attributes={'noChangeAspect':str(int(nochangeaspect)),
-                    'noChangeArrowheads':str(int(nochangearrowheads))}))
+                    attributes={'noChangeAspect': str(int(nochangeaspect)),
+                                'noChangeArrowheads': str(int(nochangearrowheads))}))
     nvpicpr.append(cnvpicpr)
-    
+
     # 3. The Shape properties
-    sppr = makeelement('spPr', nsprefix='pic', attributes={'bwMode':'auto'})
+    sppr = makeelement('spPr', nsprefix='pic', attributes={'bwMode': 'auto'})
     xfrm = makeelement('xfrm', nsprefix='a')
-    xfrm.append(makeelement('off', nsprefix='a', attributes={'x':'0', 'y':'0'}))
-    xfrm.append(makeelement('ext', nsprefix='a', attributes={'cx':width, 'cy':height}))
-    prstgeom = makeelement('prstGeom', nsprefix='a', attributes={'prst':'rect'})
+    xfrm.append(makeelement('off', nsprefix='a', attributes={'x': '0', 'y': '0'}))
+    xfrm.append(makeelement('ext', nsprefix='a', attributes={'cx': width, 'cy': height}))
+    prstgeom = makeelement('prstGeom', nsprefix='a', attributes={'prst': 'rect'})
     prstgeom.append(makeelement('avLst', nsprefix='a'))
     sppr.append(xfrm)
     sppr.append(prstgeom)
-    
+
     # Add our 3 parts to the picture element
     pic = makeelement('pic', nsprefix='pic')
     pic.append(nvpicpr)
     pic.append(blipfill)
     pic.append(sppr)
-    
+
     # Now make the supporting elements
     # The following sequence is just: make element, then add its children
     graphicdata = makeelement('graphicData', nsprefix='a',
-        attributes={'uri':'http://schemas.openxmlformats.org/drawingml/2006/picture'})
+                              attributes={'uri': 'http://schemas.openxmlforma'
+                                                 'ts.org/drawingml/2006/picture'})
     graphicdata.append(pic)
     graphic = makeelement('graphic', nsprefix='a')
     graphic.append(graphicdata)
-    
-    framelocks = makeelement('graphicFrameLocks', nsprefix='a', attributes={'noChangeAspect':'1'})
+
+    framelocks = makeelement('graphicFrameLocks', nsprefix='a',
+                             attributes={'noChangeAspect': '1'})
     framepr = makeelement('cNvGraphicFramePr', nsprefix='wp')
     framepr.append(framelocks)
     docpr = makeelement('docPr', nsprefix='wp',
-        attributes={'id':picid, 'name':'Picture 1', 'descr':picdescription})
+                        attributes={'id': picid, 'name': 'Picture 1',
+                                    'descr': picdescription})
     effectextent = makeelement('effectExtent', nsprefix='wp',
-        attributes={'l':'25400', 't':'0', 'r':'0', 'b':'0'})
-    extent = makeelement('extent', nsprefix='wp', attributes={'cx':width, 'cy':height})
-    inline = makeelement('inline',
-        attributes={'distT':"0", 'distB':"0", 'distL':"0", 'distR':"0"}, nsprefix='wp')
+                               attributes={'l': '25400', 't': '0', 'r': '0',
+                                           'b': '0'})
+    extent = makeelement('extent', nsprefix='wp',
+                         attributes={'cx': width, 'cy': height})
+    inline = makeelement('inline', attributes={'distT': "0", 'distB': "0",
+                                               'distL': "0", 'distR': "0"},
+                         nsprefix='wp')
     inline.append(extent)
     inline.append(effectextent)
     inline.append(docpr)
@@ -466,35 +504,38 @@ def picture(relationshiplist, picname, picdescription, pixelwidth=None, pixelhei
     paragraph.append(run)
     return relationshiplist, paragraph
 
+
 def search(document, search):
     '''Search a document for a regex, return success / fail result'''
     result = False
     searchre = re.compile(search)
     for element in document.iter():
-        if element.tag == '{%s}t' % nsprefixes['w']: # t (text) elements
+        if element.tag == '{%s}t' % nsprefixes['w']:  # t (text) elements
             if element.text:
                 if searchre.search(element.text):
                     result = True
     return result
 
+
 def replace(document, search, replace):
     '''Replace all occurences of string with a different string, return updated document'''
     newdocument = document
     searchre = re.compile(search)
     for element in newdocument.iter():
-        if element.tag == '{%s}t' % nsprefixes['w']: # t (text) elements
+        if element.tag == '{%s}t' % nsprefixes['w']:  # t (text) elements
             if element.text:
                 if searchre.search(element.text):
                     element.text = re.sub(search, replace, element.text)
     return newdocument
 
+
 def clean(document):
     """ Perform misc cleaning operations on documents.
         Returns cleaned document.
     """
-    
+
     newdocument = document
-    
+
     # Clean empty text and r tags
     for t in ('t', 'r'):
         rmlist = []
@@ -504,33 +545,35 @@ def clean(document):
                     rmlist.append(element)
         for element in rmlist:
             element.getparent().remove(element)
-    
+
     return newdocument
 
+
 def findTypeParent(element, tag):
     """ Finds fist parent of element of the given type
-    
+
     @param object element: etree element
     @param string the tag parent to search for
-    
+
     @return object element: the found parent or None when not found
     """
-    
+
     p = element
     while True:
         p = p.getparent()
         if p.tag == tag:
             return p
-    
+
     # Not found
     return None
 
+
 def AdvSearch(document, search, bs=3):
     '''Return set of all regex matches
-    
+
     This is an advanced version of python-docx.search() that takes into
     account blocks of <bs> elements at a time.
-    
+
     What it does:
     It searches the entire document body for text blocks.
     Since the text to search could be spawned across multiple text blocks,
@@ -538,43 +581,43 @@ def AdvSearch(document, search, bs=3):
     The smaller matching group of blocks (up to bs) is then adopted.
     If the matching group has more than one block, blocks other than first
     are cleared and all the replacement text is put on first block.
-    
+
     Examples:
     original text blocks : [ 'Hel', 'lo,', ' world!' ]
     search : 'Hello,'
     output blocks : [ 'Hello,' ]
-    
+
     original text blocks : [ 'Hel', 'lo', ' __', 'name', '__!' ]
     search : '(__[a-z]+__)'
     output blocks : [ '__name__' ]
-    
+
     @param instance  document: The original document
     @param str       search: The text to search for (regexp)
                           append, or a list of etree elements
     @param int       bs: See above
-    
+
     @return set      All occurences of search string
-    
+
     '''
-    
+
     # Compile the search regexp
     searchre = re.compile(search)
-    
+
     matches = []
-    
+
     # Will match against searchels. Searchels is a list that contains last
     # n text elements found in the document. 1 < n < bs
     searchels = []
-    
+
     for element in document.iter():
-        if element.tag == '{%s}t' % nsprefixes['w']: # t (text) elements
+        if element.tag == '{%s}t' % nsprefixes['w']:  # t (text) elements
             if element.text:
                 # Add this element to searchels
                 searchels.append(element)
                 if len(searchels) > bs:
                     # Is searchels is too long, remove first elements
                     searchels.pop(0)
-    
+
                 # Search all combinations, of searchels, starting from
                 # smaller up to bigger ones
                 # l = search lenght
@@ -592,23 +635,24 @@ def AdvSearch(document, search, bs=3):
                             txtsearch = ''
                             for k in e:
                                 txtsearch += searchels[k].text
-    
+
                             # Searcs for the text in the whole txtsearch
                             match = searchre.search(txtsearch)
                             if match:
                                 matches.append(match.group())
                                 found = True
-    
     return set(matches)
 
+
 def advReplace(document, search, replace, bs=3):
     """
-    Replace all occurences of string with a different string, return updated document
-    
+    Replace all occurences of string with a different string, return updated
+    document
+
     This is a modified version of python-docx.replace() that takes into
     account blocks of <bs> elements at a time. The replace element can also
     be a string or an xml etree element.
-    
+
     What it does:
     It searches the entire document body for text blocks.
     Then scan thos text blocks for replace.
@@ -617,50 +661,50 @@ def advReplace(document, search, replace, bs=3):
     The smaller matching group of blocks (up to bs) is then adopted.
     If the matching group has more than one block, blocks other than first
     are cleared and all the replacement text is put on first block.
-    
+
     Examples:
     original text blocks : [ 'Hel', 'lo,', ' world!' ]
     search / replace: 'Hello,' / 'Hi!'
     output blocks : [ 'Hi!', '', ' world!' ]
-    
+
     original text blocks : [ 'Hel', 'lo,', ' world!' ]
     search / replace: 'Hello, world' / 'Hi!'
     output blocks : [ 'Hi!!', '', '' ]
-    
+
     original text blocks : [ 'Hel', 'lo,', ' world!' ]
     search / replace: 'Hel' / 'Hal'
     output blocks : [ 'Hal', 'lo,', ' world!' ]
-    
+
     @param instance  document: The original document
     @param str       search: The text to search for (regexp)
-    @param mixed replace: The replacement text or lxml.etree element to
-                          append, or a list of etree elements
+    @param mixed     replace: The replacement text or lxml.etree element to
+                         append, or a list of etree elements
     @param int       bs: See above
-    
+
     @return instance The document with replacement applied
-    
+
     """
     # Enables debug output
     DEBUG = False
-    
+
     newdocument = document
-    
+
     # Compile the search regexp
     searchre = re.compile(search)
-    
+
     # Will match against searchels. Searchels is a list that contains last
     # n text elements found in the document. 1 < n < bs
     searchels = []
-    
+
     for element in newdocument.iter():
-        if element.tag == '{%s}t' % nsprefixes['w']: # t (text) elements
+        if element.tag == '{%s}t' % nsprefixes['w']:  # t (text) elements
             if element.text:
                 # Add this element to searchels
                 searchels.append(element)
                 if len(searchels) > bs:
                     # Is searchels is too long, remove first elements
                     searchels.pop(0)
-    
+
                 # Search all combinations, of searchels, starting from
                 # smaller up to bigger ones
                 # l = search lenght
@@ -680,28 +724,28 @@ def advReplace(document, search, replace, bs=3):
                             txtsearch = ''
                             for k in e:
                                 txtsearch += searchels[k].text
-    
+
                             # Searcs for the text in the whole txtsearch
                             match = searchre.search(txtsearch)
                             if match:
                                 found = True
-    
+
                                 # I've found something :)
                                 if DEBUG:
                                     log.debug("Found element!")
                                     log.debug("Search regexp: %s", searchre.pattern)
                                     log.debug("Requested replacement: %s", replace)
                                     log.debug("Matched text: %s", txtsearch)
-                                    log.debug( "Matched text (splitted): %s", map(lambda i:i.text, searchels))
+                                    log.debug("Matched text (splitted): %s", map(lambda i: i.text, searchels))
                                     log.debug("Matched at position: %s", match.start())
-                                    log.debug( "matched in elements: %s", e)
+                                    log.debug("matched in elements: %s", e)
                                     if isinstance(replace, etree._Element):
                                         log.debug("Will replace with XML CODE")
-                                    elif isinstance(replace (list, tuple)):
+                                    elif isinstance(replace(list, tuple)):
                                         log.debug("Will replace with LIST OF ELEMENTS")
                                     else:
                                         log.debug("Will replace with:", re.sub(search, replace, txtsearch))
-    
+
                                 curlen = 0
                                 replaced = False
                                 for i in e:
@@ -711,7 +755,7 @@ def advReplace(document, search, replace, bs=3):
                                         # whole replaced text
                                         if isinstance(replace, etree._Element):
                                             # Convert to a list and process it later
-                                            replace = [ replace, ]
+                                            replace = [replace]
                                         if isinstance(replace, (list, tuple)):
                                             # I'm replacing with a list of etree elements
                                             # clear the text in the tag and append the element after the
@@ -733,9 +777,10 @@ def advReplace(document, search, replace, bs=3):
                                         searchels[i].text = ''
     return newdocument
 
+
 def getdocumenttext(document):
     '''Return the raw text of a document, as a list of paragraphs.'''
-    paratextlist=[]
+    paratextlist = []
     # Compile a list of all paragraph (p) elements
     paralist = []
     for element in document.iter():
@@ -745,7 +790,7 @@ def getdocumenttext(document):
     # Since a single sentence might be spread over multiple text elements, iterate through each
     # paragraph, appending all text (t) children to that paragraphs text.
     for para in paralist:
-        paratext=u''
+        paratext = u''
         # Loop through each paragraph
         for element in para.iter():
             # Find t (text) elements
@@ -759,6 +804,7 @@ def getdocumenttext(document):
             paratextlist.append(paratext)
     return paratextlist
 
+
 def coreproperties(title, subject, creator, keywords, lastmodifiedby=None):
     '''Create core properties (common document properties referred to in the 'Dublin Core' specification).
     See appproperties() for other stuff.'''
@@ -783,39 +829,40 @@ def coreproperties(title, subject, creator, keywords, lastmodifiedby=None):
         pass
     return coreprops
 
+
 def appproperties():
     """
     Create app-specific properties. See docproperties() for more common
     document properties.
-    
+
     """
     appprops = makeelement('Properties', nsprefix='ep')
     appprops = etree.fromstring(
-        '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>'
-        '<Properties xmlns="http://schemas.openxmlformats.org/officeDocument/'
-        '2006/extended-properties" xmlns:vt="http://schemas.openxmlformats.or'
-        'g/officeDocument/2006/docPropsVTypes"></Properties>')
+        '<?xml version="1.0" encoding="UTF-8" standalone="yes"?><Properties x'
+        'mlns="http://schemas.openxmlformats.org/officeDocument/2006/extended'
+        '-properties" xmlns:vt="http://schemas.openxmlformats.org/officeDocum'
+        'ent/2006/docPropsVTypes"></Properties>')
     props =\
-        { 'Template'             : 'Normal.dotm'
-        , 'TotalTime'            : '6'
-        , 'Pages'                : '1'
-        , 'Words'                : '83'
-        , 'Characters'           : '475'
-        , 'Application'          : 'Microsoft Word 12.0.0'
-        , 'DocSecurity'          : '0'
-        , 'Lines'                : '12'
-        , 'Paragraphs'           : '8'
-        , 'ScaleCrop'            : 'false'
-        , 'LinksUpToDate'        : 'false'
-        , 'CharactersWithSpaces' : '583'
-        , 'SharedDoc'            : 'false'
-        , 'HyperlinksChanged'    : 'false'
-        , 'AppVersion'           : '12.0000'
-        }
+        {'Template':             'Normal.dotm',
+         'TotalTime':            '6',
+         'Pages':                '1',
+         'Words':                '83',
+         'Characters':           '475',
+         'Application':          'Microsoft Word 12.0.0',
+         'DocSecurity':          '0',
+         'Lines':                '12',
+         'Paragraphs':           '8',
+         'ScaleCrop':            'false',
+         'LinksUpToDate':        'false',
+         'CharactersWithSpaces': '583',
+         'SharedDoc':            'false',
+         'HyperlinksChanged':    'false',
+         'AppVersion':           '12.0000'}
     for prop in props:
         appprops.append(makeelement(prop, tagtext=props[prop], nsprefix=None))
     return appprops
 
+
 def websettings():
     '''Generate websettings'''
     web = makeelement('webSettings')
@@ -823,55 +870,68 @@ def websettings():
     web.append(makeelement('doNotSaveAsSingleFile'))
     return web
 
+
 def relationshiplist():
     relationshiplist =\
-        [ [ 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/numbering'   , 'numbering.xml'    ]
-        , [ 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/styles'      , 'styles.xml'       ]
-        , [ 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/settings'    , 'settings.xml'     ]
-        , [ 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/webSettings' , 'webSettings.xml'  ]
-        , [ 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/fontTable'   , 'fontTable.xml'    ]
-        , [ 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/theme'       , 'theme/theme1.xml' ]
-        ]
+        [['http://schemas.openxmlformats.org/officeDocument/2006/'
+          'relationships/numbering', 'numbering.xml'],
+         ['http://schemas.openxmlformats.org/officeDocument/2006/'
+          'relationships/styles', 'styles.xml'],
+         ['http://schemas.openxmlformats.org/officeDocument/2006/'
+          'relationships/settings', 'settings.xml'],
+         ['http://schemas.openxmlformats.org/officeDocument/2006/'
+          'relationships/webSettings', 'webSettings.xml'],
+         ['http://schemas.openxmlformats.org/officeDocument/2006/'
+          'relationships/fontTable', 'fontTable.xml'],
+         ['http://schemas.openxmlformats.org/officeDocument/2006/'
+          'relationships/theme', 'theme/theme1.xml']]
     return relationshiplist
 
+
 def wordrelationships(relationshiplist):
     '''Generate a Word relationships file'''
     # Default list of relationships
     # FIXME: using string hack instead of making element
     #relationships = makeelement('Relationships', nsprefix='pr')
-    relationships = etree.fromstring('<Relationships xmlns="http://schemas.op'
-        'enxmlformats.org/package/2006/relationships"></Relationships>')
+    relationships = etree.fromstring(
+        '<Relationships xmlns="http://schemas.openxmlformats.org/package/2006'
+        '/relationships"></Relationships>')
     count = 0
     for relationship in relationshiplist:
         # Relationship IDs (rId) start at 1.
-        relationships.append(makeelement('Relationship', attributes={'Id':'rId'+str(count+1),
-        'Type':relationship[0], 'Target':relationship[1]}, nsprefix=None))
+        rel_elm = makeelement('Relationship', nsprefix=None,
+                              attributes={'Id':     'rId'+str(count+1),
+                                          'Type':   relationship[0],
+                                          'Target': relationship[1]}
+                              )
+        relationships.append(rel_elm)
         count += 1
     return relationships
 
+
 def savedocx(document, coreprops, appprops, contenttypes, websettings, wordrelationships, output):
     '''Save a modified document'''
     assert os.path.isdir(template_dir)
     docxfile = zipfile.ZipFile(output, mode='w', compression=zipfile.ZIP_DEFLATED)
-    
+
     # Move to the template data path
-    prev_dir = os.path.abspath('.') # save previous working dir
+    prev_dir = os.path.abspath('.')  # save previous working dir
     os.chdir(template_dir)
-    
+
     # Serialize our trees into out zip file
-    treesandfiles = {document:'word/document.xml',
-                     coreprops:'docProps/core.xml',
-                     appprops:'docProps/app.xml',
-                     contenttypes:'[Content_Types].xml',
-                     websettings:'word/webSettings.xml',
-                     wordrelationships:'word/_rels/document.xml.rels'}
+    treesandfiles = {document:     'word/document.xml',
+                     coreprops:    'docProps/core.xml',
+                     appprops:     'docProps/app.xml',
+                     contenttypes: '[Content_Types].xml',
+                     websettings:  'word/webSettings.xml',
+                     wordrelationships: 'word/_rels/document.xml.rels'}
     for tree in treesandfiles:
-        log.info('Saving: '+treesandfiles[tree]    )
+        log.info('Saving: %s' % treesandfiles[tree])
         treestring = etree.tostring(tree, pretty_print=True)
         docxfile.writestr(treesandfiles[tree], treestring)
-    
+
     # Add & compress support files
-    files_to_ignore = ['.DS_Store'] # nuisance from some os's
+    files_to_ignore = ['.DS_Store']  # nuisance from some os's
     for dirpath, dirnames, filenames in os.walk('.'):
         for filename in filenames:
             if filename in files_to_ignore:
@@ -882,7 +942,5 @@ def savedocx(document, coreprops, appprops, contenttypes, websettings, wordrelat
             docxfile.write(templatefile, archivename)
     log.info('Saved new file to: %r', output)
     docxfile.close()
-    os.chdir(prev_dir) # restore previous working dir
+    os.chdir(prev_dir)  # restore previous working dir
     return
-
-
diff --git a/setup.py b/setup.py
index 6be3732..c5a75fe 100644
--- a/setup.py
+++ b/setup.py
@@ -9,11 +9,13 @@
     scheme['data'] = scheme['purelib']
 
 setup(name='docx',
-      version='0.0.2',
+      version='0.2.0',
       requires=['lxml'],
       description='The docx module creates, reads and writes Microsoft Office Word 2007 docx files',
       author='Mike MacCana',
       author_email='python.docx@librelist.com',
+      maintainer='Steve Canny',
+      maintainer_email='python.docx@librelist.com',
       url='http://github.com/mikemaccana/python-docx',
       py_modules=['docx'],
       data_files=[

From 650d586779391b489596df6024f413bd754ae6a6 Mon Sep 17 00:00:00 2001
From: Steve Canny <scanny@cisco.com>
Date: Tue, 16 Jul 2013 22:32:20 -0700
Subject: [PATCH 04/25] PEP8 example-extracttext.py

---
 example-extracttext.py | 39 +++++++++++++++++++++++----------------
 1 file changed, 23 insertions(+), 16 deletions(-)

diff --git a/example-extracttext.py b/example-extracttext.py
index 1006a8d..bd66157 100755
--- a/example-extracttext.py
+++ b/example-extracttext.py
@@ -1,30 +1,37 @@
-#!/usr/bin/env python2.6
-'''
+#!/usr/bin/env python
+"""
 This file opens a docx (Office 2007) file and dumps the text.
 
-If you need to extract text from documents, use this file as a basis for your work.
+If you need to extract text from documents, use this file as a basis for your
+work.
 
 Part of Python's docx module - http://github.com/mikemaccana/python-docx
 See LICENSE for licensing information.
-'''
-from docx import *
+"""
+
 import sys
-if __name__ == '__main__':        
+
+from docx import opendocx, getdocumenttext
+
+if __name__ == '__main__':
     try:
         document = opendocx(sys.argv[1])
-        newfile = open(sys.argv[2],'w')        
+        newfile = open(sys.argv[2], 'w')
     except:
-        print('Please supply an input and output file. For example:')    
-        print('''  example-extracttext.py 'My Office 2007 document.docx' 'outputfile.txt' ''')    
+        print(
+            "Please supply an input and output file. For example:\n"
+            "  example-extracttext.py 'My Office 2007 document.docx' 'outp"
+            "utfile.txt'"
+        )
         exit()
-    ## Fetch all the text out of the document we just created        
-    paratextlist = getdocumenttext(document)    
 
-    # Make explicit unicode version    
+    # Fetch all the text out of the document we just created
+    paratextlist = getdocumenttext(document)
+
+    # Make explicit unicode version
     newparatextlist = []
     for paratext in paratextlist:
-        newparatextlist.append(paratext.encode("utf-8"))                  
-    
-    ## Print our documnts test with two newlines under each paragraph
+        newparatextlist.append(paratext.encode("utf-8"))
+
+    # Print out text of document with two newlines under each paragraph
     newfile.write('\n\n'.join(newparatextlist))
-    #print '\n\n'.join(newparatextlist)
\ No newline at end of file

From 9d73eaa683ff8a8645cbc35c8b0e64e9eb8f3ad8 Mon Sep 17 00:00:00 2001
From: Steve Canny <scanny@cisco.com>
Date: Tue, 16 Jul 2013 22:32:49 -0700
Subject: [PATCH 05/25] clean-up .gitignore, add _scratch directory

---
 .gitignore | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index a67f55a..4db1766 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,7 @@
 .coverage
-*.pyc
-*.docx
-*.kpf
-build
 dist
-template/word/media
+*.docx
 MANIFEST
+*.pyc
+_scratch
+template/word/media

From df08b86882b6b9ebf5d0586b55238401dc1db9c5 Mon Sep 17 00:00:00 2001
From: Steve Canny <scanny@cisco.com>
Date: Tue, 16 Jul 2013 22:33:19 -0700
Subject: [PATCH 06/25] correct EMU/px value used in picture()

---
 docx.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docx.py b/docx.py
index 3ab37bb..2b4005b 100755
--- a/docx.py
+++ b/docx.py
@@ -419,7 +419,7 @@ def picture(relationshiplist, picname, picdescription, pixelwidth=None, pixelhei
 
     # OpenXML measures on-screen objects in English Metric Units
     # 1cm = 36000 EMUs
-    emuperpixel = 12667
+    emuperpixel = 12700
     width = str(pixelwidth * emuperpixel)
     height = str(pixelheight * emuperpixel)
 

From 2a93960fbd9aeefc7117015e6125e685e83761ee Mon Sep 17 00:00:00 2001
From: Brian Lange <thebrianlange@gmail.com>
Date: Tue, 23 Jul 2013 11:58:24 -0500
Subject: [PATCH 07/25] Switch setup.py to setuptools

Add install_requires so that setuptools does smart dependency management, and use a try-except fallback if the user doesn't have setuptools installed.

Use try-except fallback for setuptools/distutils
---
 README.markdown | 9 +++++++++
 setup.py        | 7 +++++--
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/README.markdown b/README.markdown
index cbccf12..11db896 100644
--- a/README.markdown
+++ b/README.markdown
@@ -52,6 +52,15 @@ Thanks to the awesomeness of the lxml module, we can:
 
 Congratulations, you just made and then modified a Word document!
 
+Alternatively, if you have setuptools and pip, you can run `pip
+install docx` to install the package and its dependencies, and
+download
+[example-makedocument.py](https://raw.github.com/mikemaccana/python-docx/master/example-makedocument.py)
+and
+[example-extracttext.py](https://raw.github.com/mikemaccana/python-docx/master/example-extracttext.py)
+to test them out. Note that lxml requires that libxml2-dev and
+libxslt1-dev are installed.
+
 ## Extracting Text from a Document
 
 If you just want to extract the text from a Word file, run: 
diff --git a/setup.py b/setup.py
index c5a75fe..b1a655b 100644
--- a/setup.py
+++ b/setup.py
@@ -1,6 +1,9 @@
 #!/usr/bin/env python
 
-from distutils.core import setup
+try:
+    from setuptools import setup
+except ImportError:    
+    from distutils.core import setup
 from glob import glob
 
 # Make data go into site-packages (http://tinyurl.com/site-pkg)
@@ -10,7 +13,7 @@
 
 setup(name='docx',
       version='0.2.0',
-      requires=['lxml'],
+      install_requires=['lxml', 'PIL'],
       description='The docx module creates, reads and writes Microsoft Office Word 2007 docx files',
       author='Mike MacCana',
       author_email='python.docx@librelist.com',

From 7c83781657a680ad17a0339f5e3f49e82ed2b477 Mon Sep 17 00:00:00 2001
From: Steve Canny <scanny@cisco.com>
Date: Mon, 5 Aug 2013 21:37:49 -0700
Subject: [PATCH 08/25] add tox.ini

---
 .gitignore |  1 +
 tox.ini    | 21 +++++++++++++++++++++
 2 files changed, 22 insertions(+)
 create mode 100644 tox.ini

diff --git a/.gitignore b/.gitignore
index 4db1766..8e6a66f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ MANIFEST
 *.pyc
 _scratch
 template/word/media
+.tox
diff --git a/tox.ini b/tox.ini
new file mode 100644
index 0000000..c9c4e41
--- /dev/null
+++ b/tox.ini
@@ -0,0 +1,21 @@
+#
+# tox.ini
+#
+# Copyright (C) 2012, 2013 Steve Canny scanny@cisco.com
+#
+# This module is part of python-docx and is released under the MIT License:
+# http://www.opensource.org/licenses/mit-license.php
+#
+# Configuration for tox
+
+[tox]
+envlist = py26, py27
+
+[testenv]
+deps =
+    lxml
+    nose
+    Pillow
+
+commands =
+    nosetests

From 181ad3b9815dae96f9be5bd5fcff924c58b95d72 Mon Sep 17 00:00:00 2001
From: Steve Canny <scanny@cisco.com>
Date: Mon, 5 Aug 2013 21:45:14 -0700
Subject: [PATCH 09/25] convert README to restructuredText (.rst)

---
 README.markdown |  90 ----------------------------------------
 README.rst      | 108 ++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 108 insertions(+), 90 deletions(-)
 delete mode 100644 README.markdown
 create mode 100644 README.rst

diff --git a/README.markdown b/README.markdown
deleted file mode 100644
index 11db896..0000000
--- a/README.markdown
+++ /dev/null
@@ -1,90 +0,0 @@
-Python docx
-===========
-
-## Introduction
-
-The docx module creates, reads and writes Microsoft Office Word 2007 docx files.
-
-These are referred to as 'WordML', 'Office Open XML' and 'Open XML' by Microsoft.
-
-These documents can be opened in Microsoft Office 2007 / 2010, Microsoft Mac Office 2008, Google Docs, OpenOffice.org 3, and Apple iWork 08.
-
-They also [validate as well formed XML](http://validator.w3.org/check).
-
-The module was created when I was looking for a Python support for MS Word .doc files, but could only find various hacks involving COM automation, calling .net or Java, or automating OpenOffice or MS Office.
-
-The docx module has the following features:
-
-### Making documents
-
-Features for making documents include:
-
-- Paragraphs
-- Bullets
-- Numbered lists
-- Document properties (author, company, etc)
-- Multiple levels of headings
-- Tables
-- Section and page breaks
-- Images
-
-<div style="float: right"><img src="http://github.com/mikemaccana/python-docx/raw/master/screenshot.png"></div>
-
-### Editing documents
-
-Thanks to the awesomeness of the lxml module, we can:
-
-- Search and replace
-- Extract plain text of document
-- Add and delete items anywhere within the document
-- Change document properties
-- Run xpath queries against particular locations in the document - useful for retrieving data from user-completed templates.
-
-# Getting started
-
-## Making and Modifying Documents
-
-- Just [download python docx](http://github.com/mikemaccana/python-docx/tarball/master).
-- Use **pip** or **easy_install** to fetch the **lxml** and **PIL** modules. 
-- Then run: 
-
-<pre>example-makedocument.py</pre>
-
-Congratulations, you just made and then modified a Word document!
-
-Alternatively, if you have setuptools and pip, you can run `pip
-install docx` to install the package and its dependencies, and
-download
-[example-makedocument.py](https://raw.github.com/mikemaccana/python-docx/master/example-makedocument.py)
-and
-[example-extracttext.py](https://raw.github.com/mikemaccana/python-docx/master/example-extracttext.py)
-to test them out. Note that lxml requires that libxml2-dev and
-libxslt1-dev are installed.
-
-## Extracting Text from a Document
-
-If you just want to extract the text from a Word file, run: 
-
-    example-extracttext.py 'Some word file.docx' 'new file.txt' 
-
-### Ideas & To Do List
-
-- Further improvements to image handling
-- Document health checks
-- Egg
-- Markdown conversion support
-
-### We love forks, changes and pull requests!
-
-- Check out the [HACKING](HACKING.markdown) to add your own changes!
-- For this project on github
-- Send a pull request via github and we'll add your changes!
-
-### Want to talk? Need help?
-
-Email <python.docx@librelist.com>.
-
-### License
-
-Licensed under the [MIT license](http://www.opensource.org/licenses/mit-license.php)
-Short version: this code is copyrighted to me (Mike MacCana), I give you permission to do what you want with it except remove my name from the credits. See the LICENSE file for specific terms.
diff --git a/README.rst b/README.rst
new file mode 100644
index 0000000..2a4ffe3
--- /dev/null
+++ b/README.rst
@@ -0,0 +1,108 @@
+###########
+Python docx
+###########
+
+Introduction
+============
+
+The docx module creates, reads and writes Microsoft Office Word 2007 docx
+files.
+
+These are referred to as 'WordML', 'Office Open XML' and 'Open XML' by
+Microsoft.
+
+These documents can be opened in Microsoft Office 2007 / 2010, Microsoft Mac
+Office 2008, Google Docs, OpenOffice.org 3, and Apple iWork 08.
+
+They also `validate as well formed XML <http://validator.w3.org/check>`_.
+
+The module was created when I was looking for a Python support for MS Word
+.docx files, but could only find various hacks involving COM automation,
+calling .Net or Java, or automating OpenOffice or MS Office.
+
+The docx module has the following features:
+
+Making documents
+----------------
+
+Features for making documents include:
+
+- Paragraphs
+- Bullets
+- Numbered lists
+- Document properties (author, company, etc)
+- Multiple levels of headings
+- Tables
+- Section and page breaks
+- Images
+
+.. image:: http://github.com/mikemaccana/python-docx/raw/master/screenshot.png
+
+
+Editing documents
+-----------------
+
+Thanks to the awesomeness of the lxml module, we can:
+
+- Search and replace
+- Extract plain text of document
+- Add and delete items anywhere within the document
+- Change document properties
+- Run xpath queries against particular locations in the document - useful for
+  retrieving data from user-completed templates.
+
+
+Getting started
+===============
+
+Making and Modifying Documents
+------------------------------
+
+- Just `download python docx <http://github.com/mikemaccana/python-docx/tarball/master>`_.
+- Use **pip** or **easy_install** to fetch the **lxml** and **PIL** modules.
+- Then run::
+
+    example-makedocument.py
+
+
+Congratulations, you just made and then modified a Word document!
+
+
+Extracting Text from a Document
+-------------------------------
+
+If you just want to extract the text from a Word file, run::
+
+    example-extracttext.py 'Some word file.docx' 'new file.txt'
+
+
+Ideas & To Do List
+~~~~~~~~~~~~~~~~~~
+
+- Further improvements to image handling
+- Document health checks
+- Egg
+- Markdown conversion support
+
+
+We love forks, changes and pull requests!
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+- Check out the [HACKING](HACKING.markdown) to add your own changes!
+- For this project on github
+- Send a pull request via github and we'll add your changes!
+
+Want to talk? Need help?
+~~~~~~~~~~~~~~~~~~~~~~~~
+
+Email python.docx@librelist.com
+
+
+License
+~~~~~~~
+
+Licensed under the `MIT license <http://www.opensource.org/licenses/mit-license.php>`_
+
+Short version: this code is copyrighted to me (Mike MacCana), I give you
+permission to do what you want with it except remove my name from the credits.
+See the LICENSE file for specific terms.

From 00eb2b2fe1c6855a490eaec175294b91fec05b78 Mon Sep 17 00:00:00 2001
From: Steve Canny <scanny@cisco.com>
Date: Mon, 5 Aug 2013 21:46:26 -0700
Subject: [PATCH 10/25] add Makefile target to generate README.html

---
 .gitignore | 1 +
 Makefile   | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/.gitignore b/.gitignore
index 8e6a66f..7576830 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,7 @@ dist
 *.docx
 MANIFEST
 *.pyc
+README.html
 _scratch
 template/word/media
 .tox
diff --git a/Makefile b/Makefile
index 52d1c96..03b6080 100644
--- a/Makefile
+++ b/Makefile
@@ -7,6 +7,7 @@ help:
 	@echo "Please use \`make <target>' where <target> is one or more of"
 	@echo "  clean     delete intermediate work product and start fresh"
 	@echo "  coverage  run nosetests with coverage"
+	@echo "  readme    update README.html from README.rst"
 	@echo "  register  update metadata (README.rst) on PyPI"
 	@echo "  sdist     generate a source distribution into dist/"
 	@echo "  upload    upload distribution tarball to PyPI"
@@ -18,6 +19,10 @@ clean:
 coverage:
 	nosetests --with-coverage --cover-package=docx --cover-erase
 
+readme:
+	rst2html README.rst >README.html
+	open README.html
+
 register:
 	$(SETUP) register
 

From a7130f3b1ad215207842d861f3333c0a2d3be7a4 Mon Sep 17 00:00:00 2001
From: Steve Canny <scanny@cisco.com>
Date: Mon, 5 Aug 2013 21:51:01 -0700
Subject: [PATCH 11/25] update mailing list to googlegroups in README.rst

---
 README.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.rst b/README.rst
index 2a4ffe3..fefcc1c 100644
--- a/README.rst
+++ b/README.rst
@@ -95,7 +95,7 @@ We love forks, changes and pull requests!
 Want to talk? Need help?
 ~~~~~~~~~~~~~~~~~~~~~~~~
 
-Email python.docx@librelist.com
+Email python-docx@googlegroups.com
 
 
 License

From 25022b3ff0ded5bc1c68aac67de7ab66b662d722 Mon Sep 17 00:00:00 2001
From: Puneeth Chaganti <punchagan@muse-amuse.in>
Date: Wed, 7 Aug 2013 00:27:58 +0530
Subject: [PATCH 12/25] Add an example showing italic text.

The doc-string of `paragraph` does show this, but having an example helps users who don't look at the source.
---
 example-makedocument.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/example-makedocument.py b/example-makedocument.py
index a2adf97..dfc8c22 100755
--- a/example-makedocument.py
+++ b/example-makedocument.py
@@ -37,8 +37,8 @@
              ]
     for point in points:
         body.append(paragraph(point, style='ListNumber'))
-    body.append(paragraph('For those of us who prefer something simpler, I '
-                          'made docx.'))
+    body.append(paragraph([('For those of us who prefer something simpler, I '
+                          'made docx.', 'i')]))    
     body.append(heading('Making documents', 2))
     body.append(paragraph('The docx module has the following features:'))
 

From 411a3615cff41bb5fa75ab7ebb5f7243205664a9 Mon Sep 17 00:00:00 2001
From: Steve Canny <scanny@cisco.com>
Date: Mon, 9 Sep 2013 21:54:59 -0700
Subject: [PATCH 13/25] format: fix flake8 PEP8 warnings

---
 docx.py | 200 ++++++++++++++++++++++++++++++++++++--------------------
 1 file changed, 130 insertions(+), 70 deletions(-)

diff --git a/docx.py b/docx.py
index 2b4005b..80acd2b 100755
--- a/docx.py
+++ b/docx.py
@@ -46,16 +46,20 @@
     'mv':  'urn:schemas-microsoft-com:mac:vml',
     'pic': 'http://schemas.openxmlformats.org/drawingml/2006/picture',
     'v':   'urn:schemas-microsoft-com:vml',
-    'wp':  'http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing',
+    'wp':  ('http://schemas.openxmlformats.org/drawingml/2006/wordprocessing'
+            'Drawing'),
     # Properties (core and extended)
-    'cp':  'http://schemas.openxmlformats.org/package/2006/metadata/core-properties',
+    'cp':  ('http://schemas.openxmlformats.org/package/2006/metadata/core-pr'
+            'operties'),
     'dc':  'http://purl.org/dc/elements/1.1/',
-    'ep':  'http://schemas.openxmlformats.org/officeDocument/2006/extended-properties',
+    'ep':  ('http://schemas.openxmlformats.org/officeDocument/2006/extended-'
+            'properties'),
     'xsi': 'http://www.w3.org/2001/XMLSchema-instance',
     # Content Types
     'ct':  'http://schemas.openxmlformats.org/package/2006/content-types',
     # Package Relationships
-    'r':   'http://schemas.openxmlformats.org/officeDocument/2006/relationships',
+    'r':  ('http://schemas.openxmlformats.org/officeDocument/2006/relationsh'
+           'ips'),
     'pr':  'http://schemas.openxmlformats.org/package/2006/relationships',
     # Dublin Core document properties
     'dcmitype': 'http://purl.org/dc/dcmitype/',
@@ -76,7 +80,8 @@ def newdocument():
     return document
 
 
-def makeelement(tagname, tagtext=None, nsprefix='w', attributes=None, attrnsprefix=None):
+def makeelement(tagname, tagtext=None, nsprefix='w', attributes=None,
+                attrnsprefix=None):
     '''Create an element & return it'''
     # Deal with list of nsprefix by making namespacemap
     namespacemap = None
@@ -94,10 +99,11 @@ def makeelement(tagname, tagtext=None, nsprefix='w', attributes=None, attrnspref
     newelement = etree.Element(namespace+tagname, nsmap=namespacemap)
     # Add attributes with namespaces
     if attributes:
-        # If they haven't bothered setting attribute namespace, use an empty string
-        # (equivalent of no namespace)
+        # If they haven't bothered setting attribute namespace, use an empty
+        # string (equivalent of no namespace)
         if not attrnsprefix:
-            # Quick hack: it seems every element that has a 'w' nsprefix for its tag uses the same prefix for it's attributes
+            # Quick hack: it seems every element that has a 'w' nsprefix for
+            # its tag uses the same prefix for it's attributes
             if nsprefix == 'w':
                 attributenamespace = namespace
             else:
@@ -106,7 +112,8 @@ def makeelement(tagname, tagtext=None, nsprefix='w', attributes=None, attrnspref
             attributenamespace = '{'+nsprefixes[attrnsprefix]+'}'
 
         for tagattribute in attributes:
-            newelement.set(attributenamespace+tagattribute, attributes[tagattribute])
+            newelement.set(attributenamespace+tagattribute,
+                           attributes[tagattribute])
     if tagtext:
         newelement.text = tagtext
     return newelement
@@ -235,16 +242,21 @@ def contenttypes():
                                  attributes={'PartName': part,
                                              'ContentType': parts[part]}))
     # Add support for filetypes
-    filetypes = {'gif':  'image/gif',
-                 'jpeg': 'image/jpeg',
-                 'jpg':  'image/jpeg',
-                 'png':  'image/png',
-                 'rels': 'application/vnd.openxmlformats-package.relationships+xml',
-                 'xml':  'application/xml'}
+    filetypes = {
+        'gif':  'image/gif',
+        'jpeg': 'image/jpeg',
+        'jpg':  'image/jpeg',
+        'png':  'image/png',
+        'rels': 'application/vnd.openxmlformats-package.relationships+xml',
+        'xml':  'application/xml'
+    }
     for extension in filetypes:
-        types.append(makeelement('Default', nsprefix=None,
-                                 attributes={'Extension': extension,
-                                             'ContentType': filetypes[extension]}))
+        attrs = {
+            'Extension':   extension,
+            'ContentType': filetypes[extension]
+        }
+        default_elm = makeelement('Default', nsprefix=None, attributes=attrs)
+        types.append(default_elm)
     return types
 
 
@@ -254,7 +266,8 @@ def heading(headingtext, headinglevel, lang='en'):
     # Make our elements
     paragraph = makeelement('p')
     pr = makeelement('pPr')
-    pStyle = makeelement('pStyle', attributes={'val': lmap[lang]+str(headinglevel)})
+    pStyle = makeelement(
+        'pStyle', attributes={'val': lmap[lang]+str(headinglevel)})
     run = makeelement('r')
     text = makeelement('t', tagtext=headingtext)
     # Add the text the run, and the run to the paragraph
@@ -266,7 +279,8 @@ def heading(headingtext, headinglevel, lang='en'):
     return paragraph
 
 
-def table(contents, heading=True, colw=None, cwunit='dxa', tblw=0, twunit='auto', borders={}, celstyle=None):
+def table(contents, heading=True, colw=None, cwunit='dxa', tblw=0,
+          twunit='auto', borders={}, celstyle=None):
     """
     Return a table element based on specified parameters
 
@@ -310,7 +324,8 @@ def table(contents, heading=True, colw=None, cwunit='dxa', tblw=0, twunit='auto'
     tableprops = makeelement('tblPr')
     tablestyle = makeelement('tblStyle', attributes={'val': ''})
     tableprops.append(tablestyle)
-    tablewidth = makeelement('tblW', attributes={'w': str(tblw), 'type': str(twunit)})
+    tablewidth = makeelement(
+        'tblW', attributes={'w': str(tblw), 'type': str(twunit)})
     tableprops.append(tablewidth)
     if len(borders.keys()):
         tableborders = makeelement('tblBorders')
@@ -329,7 +344,8 @@ def table(contents, heading=True, colw=None, cwunit='dxa', tblw=0, twunit='auto'
     # Table Grid
     tablegrid = makeelement('tblGrid')
     for i in range(columns):
-        tablegrid.append(makeelement('gridCol', attributes={'w': str(colw[i]) if colw else '2390'}))
+        attrs = {'w': str(colw[i]) if colw else '2390'}
+        tablegrid.append(makeelement('gridCol', attributes=attrs))
     table.append(tablegrid)
     # Heading Row
     row = makeelement('tr')
@@ -400,9 +416,13 @@ def table(contents, heading=True, colw=None, cwunit='dxa', tblw=0, twunit='auto'
     return table
 
 
-def picture(relationshiplist, picname, picdescription, pixelwidth=None, pixelheight=None, nochangeaspect=True, nochangearrowheads=True):
-    '''Take a relationshiplist, picture file name, and return a paragraph containing the image
-    and an updated relationshiplist'''
+def picture(
+        relationshiplist, picname, picdescription, pixelwidth=None,
+        pixelheight=None, nochangeaspect=True, nochangearrowheads=True):
+    """
+    Take a relationshiplist, picture file name, and return a paragraph
+    containing the image and an updated relationshiplist.
+    """
     # http://openxmldeveloper.org/articles/462.aspx
     # Create an image. Size may be specified, otherwise it will based on the
     # pixel size of image. Return a paragraph containing the picture'''
@@ -427,11 +447,12 @@ def picture(relationshiplist, picname, picdescription, pixelwidth=None, pixelhei
     picid = '2'
     picrelid = 'rId'+str(len(relationshiplist)+1)
     relationshiplist.append([
-        'http://schemas.openxmlformats.org/officeDocument/2006/relationships/image',
-        'media/'+picname])
+        ('http://schemas.openxmlformats.org/officeDocument/2006/relationship'
+         's/image'), 'media/'+picname])
 
     # There are 3 main elements inside a picture
-    # 1. The Blipfill - specifies how the image fills the picture area (stretch, tile, etc.)
+    # 1. The Blipfill - specifies how the image fills the picture area
+    #    (stretch, tile, etc.)
     blipfill = makeelement('blipFill', nsprefix='pic')
     blipfill.append(makeelement('blip', nsprefix='a', attrnsprefix='r',
                     attributes={'embed': picrelid}))
@@ -442,21 +463,26 @@ def picture(relationshiplist, picname, picdescription, pixelwidth=None, pixelhei
 
     # 2. The non visual picture properties
     nvpicpr = makeelement('nvPicPr', nsprefix='pic')
-    cnvpr = makeelement('cNvPr', nsprefix='pic',
-                        attributes={'id': '0', 'name': 'Picture 1', 'descr': picname})
+    cnvpr = makeelement(
+        'cNvPr', nsprefix='pic',
+        attributes={'id': '0', 'name': 'Picture 1', 'descr': picname})
     nvpicpr.append(cnvpr)
     cnvpicpr = makeelement('cNvPicPr', nsprefix='pic')
-    cnvpicpr.append(makeelement('picLocks', nsprefix='a',
-                    attributes={'noChangeAspect': str(int(nochangeaspect)),
-                                'noChangeArrowheads': str(int(nochangearrowheads))}))
+    cnvpicpr.append(makeelement(
+        'picLocks', nsprefix='a',
+        attributes={'noChangeAspect': str(int(nochangeaspect)),
+                    'noChangeArrowheads': str(int(nochangearrowheads))}))
     nvpicpr.append(cnvpicpr)
 
     # 3. The Shape properties
     sppr = makeelement('spPr', nsprefix='pic', attributes={'bwMode': 'auto'})
     xfrm = makeelement('xfrm', nsprefix='a')
-    xfrm.append(makeelement('off', nsprefix='a', attributes={'x': '0', 'y': '0'}))
-    xfrm.append(makeelement('ext', nsprefix='a', attributes={'cx': width, 'cy': height}))
-    prstgeom = makeelement('prstGeom', nsprefix='a', attributes={'prst': 'rect'})
+    xfrm.append(makeelement(
+        'off', nsprefix='a', attributes={'x': '0', 'y': '0'}))
+    xfrm.append(makeelement(
+        'ext', nsprefix='a', attributes={'cx': width, 'cy': height}))
+    prstgeom = makeelement(
+        'prstGeom', nsprefix='a', attributes={'prst': 'rect'})
     prstgeom.append(makeelement('avLst', nsprefix='a'))
     sppr.append(xfrm)
     sppr.append(prstgeom)
@@ -469,9 +495,10 @@ def picture(relationshiplist, picname, picdescription, pixelwidth=None, pixelhei
 
     # Now make the supporting elements
     # The following sequence is just: make element, then add its children
-    graphicdata = makeelement('graphicData', nsprefix='a',
-                              attributes={'uri': 'http://schemas.openxmlforma'
-                                                 'ts.org/drawingml/2006/picture'})
+    graphicdata = makeelement(
+        'graphicData', nsprefix='a',
+        attributes={'uri': ('http://schemas.openxmlformats.org/drawingml/200'
+                            '6/picture')})
     graphicdata.append(pic)
     graphic = makeelement('graphic', nsprefix='a')
     graphic.append(graphicdata)
@@ -518,7 +545,10 @@ def search(document, search):
 
 
 def replace(document, search, replace):
-    '''Replace all occurences of string with a different string, return updated document'''
+    """
+    Replace all occurences of string with a different string, return updated
+    document
+    """
     newdocument = document
     searchre = re.compile(search)
     for element in newdocument.iter():
@@ -733,45 +763,62 @@ def advReplace(document, search, replace, bs=3):
                                 # I've found something :)
                                 if DEBUG:
                                     log.debug("Found element!")
-                                    log.debug("Search regexp: %s", searchre.pattern)
-                                    log.debug("Requested replacement: %s", replace)
+                                    log.debug("Search regexp: %s",
+                                              searchre.pattern)
+                                    log.debug("Requested replacement: %s",
+                                              replace)
                                     log.debug("Matched text: %s", txtsearch)
-                                    log.debug("Matched text (splitted): %s", map(lambda i: i.text, searchels))
-                                    log.debug("Matched at position: %s", match.start())
+                                    log.debug("Matched text (splitted): %s",
+                                              map(lambda i: i.text, searchels))
+                                    log.debug("Matched at position: %s",
+                                              match.start())
                                     log.debug("matched in elements: %s", e)
                                     if isinstance(replace, etree._Element):
                                         log.debug("Will replace with XML CODE")
                                     elif isinstance(replace(list, tuple)):
-                                        log.debug("Will replace with LIST OF ELEMENTS")
+                                        log.debug("Will replace with LIST OF"
+                                                  " ELEMENTS")
                                     else:
-                                        log.debug("Will replace with:", re.sub(search, replace, txtsearch))
+                                        log.debug("Will replace with:",
+                                                  re.sub(search, replace,
+                                                         txtsearch))
 
                                 curlen = 0
                                 replaced = False
                                 for i in e:
                                     curlen += len(searchels[i].text)
                                     if curlen > match.start() and not replaced:
-                                        # The match occurred in THIS element. Puth in the
-                                        # whole replaced text
+                                        # The match occurred in THIS element.
+                                        # Puth in the whole replaced text
                                         if isinstance(replace, etree._Element):
-                                            # Convert to a list and process it later
+                                            # Convert to a list and process
+                                            # it later
                                             replace = [replace]
                                         if isinstance(replace, (list, tuple)):
-                                            # I'm replacing with a list of etree elements
-                                            # clear the text in the tag and append the element after the
+                                            # I'm replacing with a list of
+                                            # etree elements
+                                            # clear the text in the tag and
+                                            # append the element after the
                                             # parent paragraph
-                                            # (because t elements cannot have childs)
-                                            p = findTypeParent(searchels[i], '{%s}p' % nsprefixes['w'])
-                                            searchels[i].text = re.sub(search, '', txtsearch)
-                                            insindex = p.getparent().index(p) + 1
+                                            # (because t elements cannot have
+                                            # childs)
+                                            p = findTypeParent(
+                                                searchels[i],
+                                                '{%s}p' % nsprefixes['w'])
+                                            searchels[i].text = re.sub(
+                                                search, '', txtsearch)
+                                            insindex = p.getparent().index(p)+1
                                             for r in replace:
-                                                p.getparent().insert(insindex, r)
+                                                p.getparent().insert(
+                                                    insindex, r)
                                                 insindex += 1
                                         else:
                                             # Replacing with pure text
-                                            searchels[i].text = re.sub(search, replace, txtsearch)
+                                            searchels[i].text = re.sub(
+                                                search, replace, txtsearch)
                                         replaced = True
-                                        log.debug("Replacing in element #: %s", i)
+                                        log.debug(
+                                            "Replacing in element #: %s", i)
                                     else:
                                         # Clears the other text elements
                                         searchels[i].text = ''
@@ -787,8 +834,9 @@ def getdocumenttext(document):
         # Find p (paragraph) elements
         if element.tag == '{'+nsprefixes['w']+'}p':
             paralist.append(element)
-    # Since a single sentence might be spread over multiple text elements, iterate through each
-    # paragraph, appending all text (t) children to that paragraphs text.
+    # Since a single sentence might be spread over multiple text elements,
+    # iterate through each paragraph, appending all text (t) children to that
+    # paragraphs text.
     for para in paralist:
         paratext = u''
         # Loop through each paragraph
@@ -806,27 +854,37 @@ def getdocumenttext(document):
 
 
 def coreproperties(title, subject, creator, keywords, lastmodifiedby=None):
-    '''Create core properties (common document properties referred to in the 'Dublin Core' specification).
-    See appproperties() for other stuff.'''
+    """
+    Create core properties (common document properties referred to in the
+    'Dublin Core' specification). See appproperties() for other stuff.
+    """
     coreprops = makeelement('coreProperties', nsprefix='cp')
     coreprops.append(makeelement('title', tagtext=title, nsprefix='dc'))
     coreprops.append(makeelement('subject', tagtext=subject, nsprefix='dc'))
     coreprops.append(makeelement('creator', tagtext=creator, nsprefix='dc'))
-    coreprops.append(makeelement('keywords', tagtext=','.join(keywords), nsprefix='cp'))
+    coreprops.append(makeelement('keywords', tagtext=','.join(keywords),
+                     nsprefix='cp'))
     if not lastmodifiedby:
         lastmodifiedby = creator
-    coreprops.append(makeelement('lastModifiedBy', tagtext=lastmodifiedby, nsprefix='cp'))
+    coreprops.append(makeelement('lastModifiedBy', tagtext=lastmodifiedby,
+                     nsprefix='cp'))
     coreprops.append(makeelement('revision', tagtext='1', nsprefix='cp'))
-    coreprops.append(makeelement('category', tagtext='Examples', nsprefix='cp'))
-    coreprops.append(makeelement('description', tagtext='Examples', nsprefix='dc'))
+    coreprops.append(
+        makeelement('category', tagtext='Examples', nsprefix='cp'))
+    coreprops.append(
+        makeelement('description', tagtext='Examples', nsprefix='dc'))
     currenttime = time.strftime('%Y-%m-%dT%H:%M:%SZ')
     # Document creation and modify times
     # Prob here: we have an attribute who name uses one namespace, and that
     # attribute's value uses another namespace.
     # We're creating the element from a string as a workaround...
     for doctime in ['created', 'modified']:
-        coreprops.append(etree.fromstring('''<dcterms:'''+doctime+''' xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:dcterms="http://purl.org/dc/terms/" xsi:type="dcterms:W3CDTF">'''+currenttime+'''</dcterms:'''+doctime+'''>'''))
-        pass
+        elm_str = (
+            '<dcterms:%s xmlns:xsi="http://www.w3.org/2001/XMLSchema-instanc'
+            'e" xmlns:dcterms="http://purl.org/dc/terms/" xsi:type="dcterms:'
+            'W3CDTF">%s</dcterms:%s>'
+        ) % (doctime, currenttime, doctime)
+        coreprops.append(etree.fromstring(elm_str))
     return coreprops
 
 
@@ -909,10 +967,12 @@ def wordrelationships(relationshiplist):
     return relationships
 
 
-def savedocx(document, coreprops, appprops, contenttypes, websettings, wordrelationships, output):
+def savedocx(document, coreprops, appprops, contenttypes, websettings,
+             wordrelationships, output):
     '''Save a modified document'''
     assert os.path.isdir(template_dir)
-    docxfile = zipfile.ZipFile(output, mode='w', compression=zipfile.ZIP_DEFLATED)
+    docxfile = zipfile.ZipFile(
+        output, mode='w', compression=zipfile.ZIP_DEFLATED)
 
     # Move to the template data path
     prev_dir = os.path.abspath('.')  # save previous working dir

From d6d837243f275abc2eab99d9602ce28d20e42069 Mon Sep 17 00:00:00 2001
From: Steve Canny <scanny@cisco.com>
Date: Mon, 9 Sep 2013 21:56:21 -0700
Subject: [PATCH 14/25] paragraph: add xml:space if leading/trailing whitespace

---
 docx.py | 61 ++++++++++++++++++++++++++++++---------------------------
 1 file changed, 32 insertions(+), 29 deletions(-)

diff --git a/docx.py b/docx.py
index 80acd2b..0689355 100755
--- a/docx.py
+++ b/docx.py
@@ -149,66 +149,69 @@ def pagebreak(type='page', orient='portrait'):
 
 
 def paragraph(paratext, style='BodyText', breakbefore=False, jc='left'):
-    '''Make a new paragraph element, containing a run, and some text.
-    Return the paragraph element.
+    """
+    Return a new paragraph element containing *paratext*. The paragraph's
+    default style is 'Body Text', but a new style may be set using the
+    *style* parameter.
 
     @param string jc: Paragraph alignment, possible values:
                       left, center, right, both (justified), ...
                       see http://www.schemacentral.com/sc/ooxml/t-w_ST_Jc.html
                       for a full list
 
-    If paratext is a list, spawn multiple run/text elements.
-    Support text styles (paratext must then be a list of lists in the form
-    <text> / <style>. Stile is a string containing a combination od 'bui' chars
+    If *paratext* is a list, add a run for each (text, char_format_str)
+    2-tuple in the list. char_format_str is a string containing one or more
+    of the characters 'b', 'i', or 'u', meaning bold, italic, and underline
+    respectively. For example:
 
-    example
-    paratext =\
-        [ ('some bold text', 'b')
-        , ('some normal text', '')
-        , ('some italic underlined text', 'iu')
+        paratext = [
+            ('some bold text', 'b'),
+            ('some normal text', ''),
+            ('some italic underlined text', 'iu')
         ]
-
-    '''
+    """
     # Make our elements
     paragraph = makeelement('p')
 
-    if isinstance(paratext, list):
-        text = []
-        for pt in paratext:
-            if isinstance(pt, (list, tuple)):
-                text.append([makeelement('t', tagtext=pt[0]), pt[1]])
-            else:
-                text.append([makeelement('t', tagtext=pt), ''])
-    else:
-        text = [[makeelement('t', tagtext=paratext), ''], ]
+    if not isinstance(paratext, list):
+        paratext = [(paratext, '')]
+    text_tuples = []
+    for pt in paratext:
+        text, char_styles_str = (pt if isinstance(pt, (list, tuple))
+                                 else (pt, ''))
+        text_elm = makeelement('t', tagtext=text)
+        if len(text.strip()) < len(text):
+            text_elm.set('{http://www.w3.org/XML/1998/namespace}space',
+                         'preserve')
+        text_tuples.append([text_elm, char_styles_str])
     pPr = makeelement('pPr')
     pStyle = makeelement('pStyle', attributes={'val': style})
     pJc = makeelement('jc', attributes={'val': jc})
     pPr.append(pStyle)
     pPr.append(pJc)
 
-    # Add the text the run, and the run to the paragraph
+    # Add the text to the run, and the run to the paragraph
     paragraph.append(pPr)
-    for t in text:
+    for text_elm, char_styles_str in text_tuples:
         run = makeelement('r')
         rPr = makeelement('rPr')
         # Apply styles
-        if t[1].find('b') > -1:
+        if 'b' in char_styles_str:
             b = makeelement('b')
             rPr.append(b)
-        if t[1].find('u') > -1:
-            u = makeelement('u', attributes={'val': 'single'})
-            rPr.append(u)
-        if t[1].find('i') > -1:
+        if 'i' in char_styles_str:
             i = makeelement('i')
             rPr.append(i)
+        if 'u' in char_styles_str:
+            u = makeelement('u', attributes={'val': 'single'})
+            rPr.append(u)
         run.append(rPr)
         # Insert lastRenderedPageBreak for assistive technologies like
         # document narrators to know when a page break occurred.
         if breakbefore:
             lastRenderedPageBreak = makeelement('lastRenderedPageBreak')
             run.append(lastRenderedPageBreak)
-        run.append(t[0])
+        run.append(text_elm)
         paragraph.append(run)
     # Return the combined paragraph
     return paragraph

From 77ff50cb239177c7b2c31b69e5d97b44280f728c Mon Sep 17 00:00:00 2001
From: Steve Canny <scanny@cisco.com>
Date: Thu, 10 Oct 2013 04:13:39 -0400
Subject: [PATCH 15/25] release: v0.2.1

---
 .gitignore | 1 +
 setup.py   | 8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 7576830..8587350 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
 .coverage
 dist
 *.docx
+/*.egg-info/
 MANIFEST
 *.pyc
 README.html
diff --git a/setup.py b/setup.py
index b1a655b..2ca6906 100644
--- a/setup.py
+++ b/setup.py
@@ -2,7 +2,7 @@
 
 try:
     from setuptools import setup
-except ImportError:    
+except ImportError:
     from distutils.core import setup
 from glob import glob
 
@@ -12,13 +12,13 @@
     scheme['data'] = scheme['purelib']
 
 setup(name='docx',
-      version='0.2.0',
+      version='0.2.1',
       install_requires=['lxml', 'PIL'],
       description='The docx module creates, reads and writes Microsoft Office Word 2007 docx files',
       author='Mike MacCana',
-      author_email='python.docx@librelist.com',
+      author_email='python-docx@googlegroups.com',
       maintainer='Steve Canny',
-      maintainer_email='python.docx@librelist.com',
+      maintainer_email='python-docx@googlegroups.com',
       url='http://github.com/mikemaccana/python-docx',
       py_modules=['docx'],
       data_files=[

From 04119168141227be317999c8137ddb8a2749b0a5 Mon Sep 17 00:00:00 2001
From: femesq <femesq@gmail.com>
Date: Wed, 9 Oct 2013 08:38:33 -0300
Subject: [PATCH 16/25] Parameter type for twunit adjusted to match cwunit

---
 docx.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docx.py b/docx.py
index 0689355..1a08455 100755
--- a/docx.py
+++ b/docx.py
@@ -300,7 +300,7 @@ def table(contents, heading=True, colw=None, cwunit='dxa', tblw=0,
                             'nil'  : no width
                             'auto' : automagically determined
     @param int  tblw:     Table width
-    @param int  twunit:   Unit used for table width. Same possible values as
+    @param str  twunit:   Unit used for table width. Same possible values as
                           cwunit.
     @param dict borders:  Dictionary defining table border. Supported keys
                           are: 'top', 'left', 'bottom', 'right',

From 6fbf8830d26021bfa75747b3d2391aa6e622214f Mon Sep 17 00:00:00 2001
From: Rein Spijkerman <github@reinspijkerman.nl>
Date: Wed, 7 Aug 2013 16:48:03 +0200
Subject: [PATCH 17/25] Extend picture() and savedocx() to save pictures
 without copying them to the template directory. When the same image file is
 used multiple times, no duplicates will be added.

Caveat: to prevent image files from accumulating in word/media/ across
runs, never call picture() and savedocx() without the imagefiledict
parameter. The imagefiledict is optional because of backward compatibility.
---
 docx.py            | 76 ++++++++++++++++++++++++++++++++++------------
 tests/test_docx.py | 25 +++++++++++----
 2 files changed, 75 insertions(+), 26 deletions(-)

diff --git a/docx.py b/docx.py
index 1a08455..934ea08 100755
--- a/docx.py
+++ b/docx.py
@@ -19,7 +19,7 @@
 import re
 import time
 import os
-from os.path import join
+from os.path import join, basename, abspath
 
 log = logging.getLogger(__name__)
 
@@ -421,19 +421,47 @@ def table(contents, heading=True, colw=None, cwunit='dxa', tblw=0,
 
 def picture(
         relationshiplist, picname, picdescription, pixelwidth=None,
-        pixelheight=None, nochangeaspect=True, nochangearrowheads=True):
+        pixelheight=None, nochangeaspect=True, nochangearrowheads=True,
+        imagefiledict=None):
     """
     Take a relationshiplist, picture file name, and return a paragraph
-    containing the image and an updated relationshiplist.
+    containing the image and an updated relationshiplist
     """
     # http://openxmldeveloper.org/articles/462.aspx
     # Create an image. Size may be specified, otherwise it will based on the
-    # pixel size of image. Return a paragraph containing the picture'''
-    # Copy the file into the media dir
-    media_dir = join(template_dir, 'word', 'media')
-    if not os.path.isdir(media_dir):
-        os.mkdir(media_dir)
-    shutil.copyfile(picname, join(media_dir, picname))
+    # pixel size of image. Return a paragraph containing the picture
+
+    # Set relationship ID to that of the image or the first available one
+    picid = '2'
+    if imagefiledict is not None:
+        # Keep track of the image files in a separate dictionary so they don't
+        # need to be copied into the template directory
+        picpath = abspath(picname)
+
+        if picpath not in imagefiledict:
+            picrelid = 'rId' + str(len(imagefiledict.keys()) + 1)
+            imagefiledict[picpath] = picrelid
+
+            relationshiplist.append([
+                'http://schemas.openxmlformats.org/officeDocument/2006/relat'
+                'ionships/image', 'media/' + basename(picpath)
+            ])
+        else:
+            picrelid = imagefiledict[picpath]
+    else:
+        # Copy files into template directory for backwards compatibility
+        # Images still accumulate in the template directory this way
+        picrelid = 'rId' + str(len(relationshiplist) + 1)
+
+        relationshiplist.append([
+            'http://schemas.openxmlformats.org/officeDocument/2006/relations'
+            'hips/image', 'media/' + picname
+        ])
+
+        media_dir = join(template_dir, 'word', 'media')
+        if not os.path.isdir(media_dir):
+            os.mkdir(media_dir)
+        shutil.copyfile(picname, join(media_dir, picname))
 
     # Check if the user has specified a size
     if not pixelwidth or not pixelheight:
@@ -446,13 +474,6 @@ def picture(
     width = str(pixelwidth * emuperpixel)
     height = str(pixelheight * emuperpixel)
 
-    # Set relationship ID to the first available
-    picid = '2'
-    picrelid = 'rId'+str(len(relationshiplist)+1)
-    relationshiplist.append([
-        ('http://schemas.openxmlformats.org/officeDocument/2006/relationship'
-         's/image'), 'media/'+picname])
-
     # There are 3 main elements inside a picture
     # 1. The Blipfill - specifies how the image fills the picture area
     #    (stretch, tile, etc.)
@@ -532,7 +553,11 @@ def picture(
     run.append(drawing)
     paragraph = makeelement('p')
     paragraph.append(run)
-    return relationshiplist, paragraph
+
+    if imagefiledict is not None:
+        return relationshiplist, paragraph, imagefiledict
+    else:
+        return relationshiplist, paragraph
 
 
 def search(document, search):
@@ -970,9 +995,12 @@ def wordrelationships(relationshiplist):
     return relationships
 
 
-def savedocx(document, coreprops, appprops, contenttypes, websettings,
-             wordrelationships, output):
-    '''Save a modified document'''
+def savedocx(
+        document, coreprops, appprops, contenttypes, websettings,
+        wordrelationships, output, imagefiledict=None):
+    """
+    Save a modified document
+    """
     assert os.path.isdir(template_dir)
     docxfile = zipfile.ZipFile(
         output, mode='w', compression=zipfile.ZIP_DEFLATED)
@@ -993,6 +1021,13 @@ def savedocx(document, coreprops, appprops, contenttypes, websettings,
         treestring = etree.tostring(tree, pretty_print=True)
         docxfile.writestr(treesandfiles[tree], treestring)
 
+    # Add & compress images, if applicable
+    if imagefiledict is not None:
+        for imagepath in imagefiledict.keys():
+            archivename = 'word/media/' + basename(imagepath)
+            log.info('Saving: %s', archivename)
+            docxfile.write(imagepath, archivename)
+
     # Add & compress support files
     files_to_ignore = ['.DS_Store']  # nuisance from some os's
     for dirpath, dirnames, filenames in os.walk('.'):
@@ -1003,6 +1038,7 @@ def savedocx(document, coreprops, appprops, contenttypes, websettings,
             archivename = templatefile[2:]
             log.info('Saving: %s', archivename)
             docxfile.write(templatefile, archivename)
+
     log.info('Saved new file to: %r', output)
     docxfile.close()
     os.chdir(prev_dir)  # restore previous working dir
diff --git a/tests/test_docx.py b/tests/test_docx.py
index 2783c16..c8535b1 100644
--- a/tests/test_docx.py
+++ b/tests/test_docx.py
@@ -22,9 +22,10 @@ def teardown_module():
     if TEST_FILE in os.listdir('.'):
         os.remove(TEST_FILE)
 
-def simpledoc():
+def simpledoc(noimagecopy=False):
     '''Make a docx (document, relationships) for use in other docx tests'''
     relationships = relationshiplist()
+    imagefiledict = {}
     document = newdocument()
     docbody = document.xpath('/w:document/w:body', namespaces=nsprefixes)[0]
     docbody.append(heading('Heading 1',1)  )   
@@ -36,11 +37,17 @@ def simpledoc():
     docbody.append(paragraph('Paragraph 2')) 
     docbody.append(table([['A1','A2','A3'],['B1','B2','B3'],['C1','C2','C3']]))
     docbody.append(pagebreak(type='section', orient='portrait'))
-    relationships,picpara = picture(relationships,IMAGE1_FILE,'This is a test description')
+    if noimagecopy:
+        relationships,picpara,imagefiledict = picture(relationships,IMAGE1_FILE,'This is a test description', imagefiledict=imagefiledict)
+    else:
+        relationships,picpara = picture(relationships,IMAGE1_FILE,'This is a test description')
     docbody.append(picpara)
     docbody.append(pagebreak(type='section', orient='landscape'))
     docbody.append(paragraph('Paragraph 3'))
-    return (document, docbody, relationships)
+    if noimagecopy:
+        return (document, docbody, relationships, imagefiledict)
+    else:
+        return (document, docbody, relationships)
 
 
 # --- Test Functions ---
@@ -56,7 +63,7 @@ def testsearchandreplace():
     if search(docbody, 'Paragraph 2'): 
         docbody = replace(docbody,'Paragraph 2','Whacko 55') 
     assert search(docbody, 'Whacko 55')
-    
+
 def testtextextraction():
     '''Ensure text can be pulled out of a document'''
     document = opendocx(TEST_FILE)
@@ -72,13 +79,19 @@ def testunsupportedpagebreak():
     except ValueError:
         return # passed
     assert False # failed
-    
+
 def testnewdocument():
     '''Test that a new document can be created'''
     document, docbody, relationships = simpledoc()
     coreprops = coreproperties('Python docx testnewdocument','A short example of making docx from Python','Alan Brooks',['python','Office Open XML','Word'])
     savedocx(document, coreprops, appproperties(), contenttypes(), websettings(), wordrelationships(relationships), TEST_FILE)
 
+def testnewdocument_noimagecopy():
+    '''Test that a new document can be created'''
+    document, docbody, relationships, imagefiledict = simpledoc(noimagecopy=True)
+    coreprops = coreproperties('Python docx testnewdocument','A short example of making docx from Python','Alan Brooks',['python','Office Open XML','Word'])
+    savedocx(document, coreprops, appproperties(), contenttypes(), websettings(), wordrelationships(relationships), TEST_FILE, imagefiledict=imagefiledict)
+
 def testopendocx():
     '''Ensure an etree element is returned'''
     if isinstance(opendocx(TEST_FILE),lxml.etree._Element):
@@ -107,4 +120,4 @@ def testtable():
 
 if __name__=='__main__':
     import nose
-    nose.main()
\ No newline at end of file
+    nose.main()

From 2b63b96380586b71f530d5174a8493b6b024e959 Mon Sep 17 00:00:00 2001
From: Rein Spijkerman <github@reinspijkerman.nl>
Date: Wed, 7 Aug 2013 19:09:54 +0200
Subject: [PATCH 18/25] Apply EXIF orientation information in the rot, flipH
 and flipV properties of the xfrm element when creating the shape properties
 of an image.

See: http://www.schemacentral.com/sc/ooxml/e-p_xfrm-1.html
---
 docx.py | 73 +++++++++++++++++++++++++++++++++++++++++++++------------
 1 file changed, 58 insertions(+), 15 deletions(-)

diff --git a/docx.py b/docx.py
index 934ea08..7b7ac8f 100755
--- a/docx.py
+++ b/docx.py
@@ -8,18 +8,27 @@
 See LICENSE for licensing information.
 """
 
-import logging
+import os
+import re
+import time
+import shutil
+import zipfile
+
 from lxml import etree
+from os.path import abspath, basename, join
+
 try:
     from PIL import Image
 except ImportError:
     import Image
-import zipfile
-import shutil
-import re
-import time
-import os
-from os.path import join, basename, abspath
+
+try:
+    from PIL.ExifTags import TAGS
+except ImportError:
+    TAGS = {}
+
+import logging
+
 
 log = logging.getLogger(__name__)
 
@@ -433,10 +442,11 @@ def picture(
 
     # Set relationship ID to that of the image or the first available one
     picid = '2'
+    picpath = abspath(picname)
+
     if imagefiledict is not None:
         # Keep track of the image files in a separate dictionary so they don't
         # need to be copied into the template directory
-        picpath = abspath(picname)
 
         if picpath not in imagefiledict:
             picrelid = 'rId' + str(len(imagefiledict.keys()) + 1)
@@ -463,10 +473,33 @@ def picture(
             os.mkdir(media_dir)
         shutil.copyfile(picname, join(media_dir, picname))
 
+    image = Image.open(picpath)
+
+    # Extract EXIF data, if available
+    imageExif = {}
+    try:
+        exif = image._getexif()
+    except:
+        exif = {}
+
+    for tag, value in exif.items():
+        imageExif[TAGS.get(tag, tag)] = value
+
+    imageOrientation = imageExif.get('Orientation', 1)
+    imageAngle = {
+        1: 0, 2: 0, 3: 180, 4: 0, 5: 90, 6: 90, 7: 270, 8: 270
+    }[imageOrientation]
+    imageFlipH = 'true' if imageOrientation in (2, 5, 7) else 'false'
+    imageFlipV = 'true' if imageOrientation == 4 else 'false'
+
     # Check if the user has specified a size
     if not pixelwidth or not pixelheight:
         # If not, get info from the picture itself
-        pixelwidth, pixelheight = Image.open(picname).size[0:2]
+        pixelwidth, pixelheight = image.size[0:2]
+
+    # Swap width and height if necessary
+    if imageOrientation in (5, 6, 7, 8):
+        pixelwidth, pixelheight = pixelheight, pixelwidth
 
     # OpenXML measures on-screen objects in English Metric Units
     # 1cm = 36000 EMUs
@@ -500,13 +533,23 @@ def picture(
 
     # 3. The Shape properties
     sppr = makeelement('spPr', nsprefix='pic', attributes={'bwMode': 'auto'})
-    xfrm = makeelement('xfrm', nsprefix='a')
-    xfrm.append(makeelement(
-        'off', nsprefix='a', attributes={'x': '0', 'y': '0'}))
-    xfrm.append(makeelement(
-        'ext', nsprefix='a', attributes={'cx': width, 'cy': height}))
+    xfrm = makeelement(
+        'xfrm', nsprefix='a', attributes={
+            'rot': str(imageAngle * 60000), 'flipH': imageFlipH,
+            'flipV': imageFlipV
+        }
+    )
+    xfrm.append(
+        makeelement('off', nsprefix='a', attributes={'x': '0', 'y': '0'})
+    )
+    xfrm.append(
+        makeelement(
+            'ext', nsprefix='a', attributes={'cx': width, 'cy': height}
+        )
+    )
     prstgeom = makeelement(
-        'prstGeom', nsprefix='a', attributes={'prst': 'rect'})
+        'prstGeom', nsprefix='a', attributes={'prst': 'rect'}
+    )
     prstgeom.append(makeelement('avLst', nsprefix='a'))
     sppr.append(xfrm)
     sppr.append(prstgeom)

From f0b431829bb9da8ded437dfe8ddda186974a14e3 Mon Sep 17 00:00:00 2001
From: Rein Spijkerman <github@reinspijkerman.nl>
Date: Wed, 7 Aug 2013 23:59:58 +0200
Subject: [PATCH 19/25] Corrected the creation of picrelid and unique
 filenames, usage of picdescription instead of picname in creating the cNvPr
 element, and removed an invalid reference from the template.

---
 docx.py              | 13 +++++++------
 template/_rels/.rels |  2 --
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/docx.py b/docx.py
index 7b7ac8f..b5bbb65 100755
--- a/docx.py
+++ b/docx.py
@@ -447,14 +447,14 @@ def picture(
     if imagefiledict is not None:
         # Keep track of the image files in a separate dictionary so they don't
         # need to be copied into the template directory
-
         if picpath not in imagefiledict:
-            picrelid = 'rId' + str(len(imagefiledict.keys()) + 1)
+            picrelid = 'rId' + str(len(relationshiplist) + 1)
             imagefiledict[picpath] = picrelid
 
             relationshiplist.append([
                 'http://schemas.openxmlformats.org/officeDocument/2006/relat'
-                'ionships/image', 'media/' + basename(picpath)
+                'ionships/image',
+                'media/%s_%s' % (picrelid, basename(picpath))
             ])
         else:
             picrelid = imagefiledict[picpath]
@@ -522,7 +522,8 @@ def picture(
     nvpicpr = makeelement('nvPicPr', nsprefix='pic')
     cnvpr = makeelement(
         'cNvPr', nsprefix='pic',
-        attributes={'id': '0', 'name': 'Picture 1', 'descr': picname})
+        attributes={'id': '0', 'name': 'Picture 1', 'descr': picdescription}
+    )
     nvpicpr.append(cnvpr)
     cnvpicpr = makeelement('cNvPicPr', nsprefix='pic')
     cnvpicpr.append(makeelement(
@@ -1066,8 +1067,8 @@ def savedocx(
 
     # Add & compress images, if applicable
     if imagefiledict is not None:
-        for imagepath in imagefiledict.keys():
-            archivename = 'word/media/' + basename(imagepath)
+        for imagepath, picrelid in imagefiledict.items():
+            archivename = 'word/media/%s_%s' % (picrelid, basename(imagepath))
             log.info('Saving: %s', archivename)
             docxfile.write(imagepath, archivename)
 
diff --git a/template/_rels/.rels b/template/_rels/.rels
index 124c1c6..19e8aca 100644
--- a/template/_rels/.rels
+++ b/template/_rels/.rels
@@ -9,6 +9,4 @@
 
 	<Relationship Id="rId3" Type="http://schemas.openxmlformats.org/officedocument/2006/relationships/metadata/core-properties" Target="docProps/core.xml"/>
 
-	<Relationship Id="rId7" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/image" Target="media/image1.png"/>
-
 </Relationships>

From 6056b3ccb5eab8bc0ed9fe1a002f46dac812c3ce Mon Sep 17 00:00:00 2001
From: Rein Spijkerman <github@reinspijkerman.nl>
Date: Thu, 8 Aug 2013 01:18:16 +0200
Subject: [PATCH 20/25] Added PendingDeprecationWarning for the code sections
 which ensure backward compatibility.

---
 docx.py | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/docx.py b/docx.py
index b5bbb65..b32b213 100755
--- a/docx.py
+++ b/docx.py
@@ -27,6 +27,9 @@
 except ImportError:
     TAGS = {}
 
+from exceptions import PendingDeprecationWarning
+from warnings import warn
+
 import logging
 
 
@@ -436,6 +439,12 @@ def picture(
     Take a relationshiplist, picture file name, and return a paragraph
     containing the image and an updated relationshiplist
     """
+    if imagefiledict is None:
+        warn(
+            'Using picture() without imagefiledict parameter will be depreca'
+            'ted in the future.', PendingDeprecationWarning
+        )
+
     # http://openxmldeveloper.org/articles/462.aspx
     # Create an image. Size may be specified, otherwise it will based on the
     # pixel size of image. Return a paragraph containing the picture
@@ -1045,6 +1054,12 @@ def savedocx(
     """
     Save a modified document
     """
+    if imagefiledict is None:
+        warn(
+            'Using savedocx() without imagefiledict parameter will be deprec'
+            'ated in the future.', PendingDeprecationWarning
+        )
+
     assert os.path.isdir(template_dir)
     docxfile = zipfile.ZipFile(
         output, mode='w', compression=zipfile.ZIP_DEFLATED)

From 88a60b5367ab2b340358e13e6eecc36127fe1b13 Mon Sep 17 00:00:00 2001
From: Steve Canny <scanny@cisco.com>
Date: Sun, 12 Jan 2014 17:08:27 -0800
Subject: [PATCH 21/25] release: v0.2.2

---
 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index 2ca6906..5326251 100644
--- a/setup.py
+++ b/setup.py
@@ -12,7 +12,7 @@
     scheme['data'] = scheme['purelib']
 
 setup(name='docx',
-      version='0.2.1',
+      version='0.2.2',
       install_requires=['lxml', 'PIL'],
       description='The docx module creates, reads and writes Microsoft Office Word 2007 docx files',
       author='Mike MacCana',

From 37a3709b451528b1a14976ab12958d9103b8f86f Mon Sep 17 00:00:00 2001
From: Steve Canny <scanny@cisco.com>
Date: Mon, 13 Jan 2014 16:48:38 -0800
Subject: [PATCH 22/25] release: v0.2.3 -- change PIL dependency to Pillow

---
 setup.py | 40 +++++++++++++++++++++++-----------------
 1 file changed, 23 insertions(+), 17 deletions(-)

diff --git a/setup.py b/setup.py
index 5326251..4223c2a 100644
--- a/setup.py
+++ b/setup.py
@@ -11,20 +11,26 @@
 for scheme in INSTALL_SCHEMES.values():
     scheme['data'] = scheme['purelib']
 
-setup(name='docx',
-      version='0.2.2',
-      install_requires=['lxml', 'PIL'],
-      description='The docx module creates, reads and writes Microsoft Office Word 2007 docx files',
-      author='Mike MacCana',
-      author_email='python-docx@googlegroups.com',
-      maintainer='Steve Canny',
-      maintainer_email='python-docx@googlegroups.com',
-      url='http://github.com/mikemaccana/python-docx',
-      py_modules=['docx'],
-      data_files=[
-          ('docx-template/_rels', glob('template/_rels/.*')),
-          ('docx-template/docProps', glob('template/docProps/*.*')),
-          ('docx-template/word', glob('template/word/*.xml')),
-          ('docx-template/word/theme', glob('template/word/theme/*.*')),
-          ],
-      )
+DESCRIPTION = (
+    'The docx module creates, reads and writes Microsoft Office Word 2007 do'
+    'cx files'
+)
+
+setup(
+    name='docx',
+    version='0.2.3',
+    install_requires=['lxml', 'Pillow>=2.0'],
+    description=DESCRIPTION,
+    author='Mike MacCana',
+    author_email='python-docx@googlegroups.com',
+    maintainer='Steve Canny',
+    maintainer_email='python-docx@googlegroups.com',
+    url='http://github.com/mikemaccana/python-docx',
+    py_modules=['docx'],
+    data_files=[
+        ('docx-template/_rels',      glob('template/_rels/.*')),
+        ('docx-template/docProps',   glob('template/docProps/*.*')),
+        ('docx-template/word',       glob('template/word/*.xml')),
+        ('docx-template/word/theme', glob('template/word/theme/*.*')),
+    ],
+)

From 6ba94ff602cfb148ab4cd2802a9b253a1aac3c43 Mon Sep 17 00:00:00 2001
From: Steve Canny <scanny@cisco.com>
Date: Thu, 6 Feb 2014 02:01:37 -0800
Subject: [PATCH 23/25] fix: issue #60, some reformatting

---
 docx.py            |  23 ++++---
 setup.py           |   2 +-
 tests/test_docx.py | 158 ++++++++++++++++++++++++++++++++-------------
 3 files changed, 127 insertions(+), 56 deletions(-)

diff --git a/docx.py b/docx.py
index b32b213..9d3f6e6 100755
--- a/docx.py
+++ b/docx.py
@@ -1,5 +1,5 @@
-#!/usr/bin/env python2.6
-# -*- coding: utf-8 -*-
+# encoding: utf-8
+
 """
 Open and modify Microsoft Word 2007 docx files (called 'OpenXML' and
 'Office OpenXML' by Microsoft)
@@ -104,7 +104,7 @@ def makeelement(tagname, tagtext=None, nsprefix='w', attributes=None,
         # FIXME: rest of code below expects a single prefix
         nsprefix = nsprefix[0]
     if nsprefix:
-        namespace = '{'+nsprefixes[nsprefix]+'}'
+        namespace = '{%s}' % nsprefixes[nsprefix]
     else:
         # For when namespace = None
         namespace = ''
@@ -485,12 +485,13 @@ def picture(
     image = Image.open(picpath)
 
     # Extract EXIF data, if available
-    imageExif = {}
     try:
         exif = image._getexif()
+        exif = {} if exif is None else exif
     except:
         exif = {}
 
+    imageExif = {}
     for tag, value in exif.items():
         imageExif[TAGS.get(tag, tag)] = value
 
@@ -1069,12 +1070,14 @@ def savedocx(
     os.chdir(template_dir)
 
     # Serialize our trees into out zip file
-    treesandfiles = {document:     'word/document.xml',
-                     coreprops:    'docProps/core.xml',
-                     appprops:     'docProps/app.xml',
-                     contenttypes: '[Content_Types].xml',
-                     websettings:  'word/webSettings.xml',
-                     wordrelationships: 'word/_rels/document.xml.rels'}
+    treesandfiles = {
+        document:          'word/document.xml',
+        coreprops:         'docProps/core.xml',
+        appprops:          'docProps/app.xml',
+        contenttypes:      '[Content_Types].xml',
+        websettings:       'word/webSettings.xml',
+        wordrelationships: 'word/_rels/document.xml.rels'
+    }
     for tree in treesandfiles:
         log.info('Saving: %s' % treesandfiles[tree])
         treestring = etree.tostring(tree, pretty_print=True)
diff --git a/setup.py b/setup.py
index 4223c2a..13035e6 100644
--- a/setup.py
+++ b/setup.py
@@ -18,7 +18,7 @@
 
 setup(
     name='docx',
-    version='0.2.3',
+    version='0.2.4',
     install_requires=['lxml', 'Pillow>=2.0'],
     description=DESCRIPTION,
     author='Mike MacCana',
diff --git a/tests/test_docx.py b/tests/test_docx.py
index c8535b1..7093fd3 100644
--- a/tests/test_docx.py
+++ b/tests/test_docx.py
@@ -1,46 +1,69 @@
-#!/usr/bin/env python2.6
-'''
+#!/usr/bin/env python
+
+"""
 Test docx module
-'''
+"""
+
 import os
 import lxml
-from docx import *
+from docx import (
+    appproperties, contenttypes, coreproperties, getdocumenttext, heading,
+    makeelement, newdocument, nsprefixes, opendocx, pagebreak, paragraph,
+    picture, relationshiplist, replace, savedocx, search, table, websettings,
+    wordrelationships
+)
 
 TEST_FILE = 'ShortTest.docx'
 IMAGE1_FILE = 'image1.png'
 
+
 # --- Setup & Support Functions ---
 def setup_module():
-    '''Set up test fixtures'''
+    """Set up test fixtures"""
     import shutil
     if IMAGE1_FILE not in os.listdir('.'):
-        shutil.copyfile(os.path.join(os.path.pardir,IMAGE1_FILE), IMAGE1_FILE)
+        shutil.copyfile(os.path.join(os.path.pardir, IMAGE1_FILE), IMAGE1_FILE)
     testnewdocument()
 
+
 def teardown_module():
-    '''Tear down test fixtures'''
+    """Tear down test fixtures"""
     if TEST_FILE in os.listdir('.'):
         os.remove(TEST_FILE)
 
+
 def simpledoc(noimagecopy=False):
-    '''Make a docx (document, relationships) for use in other docx tests'''
+    """Make a docx (document, relationships) for use in other docx tests"""
     relationships = relationshiplist()
     imagefiledict = {}
     document = newdocument()
     docbody = document.xpath('/w:document/w:body', namespaces=nsprefixes)[0]
-    docbody.append(heading('Heading 1',1)  )   
-    docbody.append(heading('Heading 2',2))
+    docbody.append(heading('Heading 1', 1))
+    docbody.append(heading('Heading 2', 2))
     docbody.append(paragraph('Paragraph 1'))
-    for point in ['List Item 1','List Item 2','List Item 3']:
-        docbody.append(paragraph(point,style='ListNumber'))
+    for point in ['List Item 1', 'List Item 2', 'List Item 3']:
+        docbody.append(paragraph(point, style='ListNumber'))
     docbody.append(pagebreak(type='page'))
-    docbody.append(paragraph('Paragraph 2')) 
-    docbody.append(table([['A1','A2','A3'],['B1','B2','B3'],['C1','C2','C3']]))
+    docbody.append(paragraph('Paragraph 2'))
+    docbody.append(
+        table(
+            [
+                ['A1', 'A2', 'A3'],
+                ['B1', 'B2', 'B3'],
+                ['C1', 'C2', 'C3']
+            ]
+        )
+    )
     docbody.append(pagebreak(type='section', orient='portrait'))
     if noimagecopy:
-        relationships,picpara,imagefiledict = picture(relationships,IMAGE1_FILE,'This is a test description', imagefiledict=imagefiledict)
+        relationships, picpara, imagefiledict = picture(
+            relationships, IMAGE1_FILE, 'This is a test description',
+            imagefiledict=imagefiledict
+        )
     else:
-        relationships,picpara = picture(relationships,IMAGE1_FILE,'This is a test description')
+        relationships, picpara = picture(
+            relationships, IMAGE1_FILE, 'This is a test description'
+        )
     docbody.append(picpara)
     docbody.append(pagebreak(type='section', orient='landscape'))
     docbody.append(paragraph('Paragraph 3'))
@@ -52,7 +75,7 @@ def simpledoc(noimagecopy=False):
 
 # --- Test Functions ---
 def testsearchandreplace():
-    '''Ensure search and replace functions work'''
+    """Ensure search and replace functions work"""
     document, docbody, relationships = simpledoc()
     docbody = document.xpath('/w:document/w:body', namespaces=nsprefixes)[0]
     assert search(docbody, 'ing 1')
@@ -60,64 +83,109 @@ def testsearchandreplace():
     assert search(docbody, 'graph 3')
     assert search(docbody, 'ist Item')
     assert search(docbody, 'A1')
-    if search(docbody, 'Paragraph 2'): 
-        docbody = replace(docbody,'Paragraph 2','Whacko 55') 
+    if search(docbody, 'Paragraph 2'):
+        docbody = replace(docbody, 'Paragraph 2', 'Whacko 55')
     assert search(docbody, 'Whacko 55')
 
+
 def testtextextraction():
-    '''Ensure text can be pulled out of a document'''
+    """Ensure text can be pulled out of a document"""
     document = opendocx(TEST_FILE)
     paratextlist = getdocumenttext(document)
     assert len(paratextlist) > 0
 
+
 def testunsupportedpagebreak():
-    '''Ensure unsupported page break types are trapped'''
+    """Ensure unsupported page break types are trapped"""
     document = newdocument()
     docbody = document.xpath('/w:document/w:body', namespaces=nsprefixes)[0]
     try:
         docbody.append(pagebreak(type='unsup'))
     except ValueError:
-        return # passed
-    assert False # failed
+        return  # passed
+    assert False  # failed
+
 
 def testnewdocument():
-    '''Test that a new document can be created'''
+    """Test that a new document can be created"""
     document, docbody, relationships = simpledoc()
-    coreprops = coreproperties('Python docx testnewdocument','A short example of making docx from Python','Alan Brooks',['python','Office Open XML','Word'])
-    savedocx(document, coreprops, appproperties(), contenttypes(), websettings(), wordrelationships(relationships), TEST_FILE)
+    coreprops = coreproperties(
+        'Python docx testnewdocument',
+        'A short example of making docx from Python', 'Alan Brooks',
+        ['python', 'Office Open XML', 'Word']
+    )
+    savedocx(
+        document, coreprops, appproperties(), contenttypes(), websettings(),
+        wordrelationships(relationships), TEST_FILE
+    )
+
 
 def testnewdocument_noimagecopy():
-    '''Test that a new document can be created'''
-    document, docbody, relationships, imagefiledict = simpledoc(noimagecopy=True)
-    coreprops = coreproperties('Python docx testnewdocument','A short example of making docx from Python','Alan Brooks',['python','Office Open XML','Word'])
-    savedocx(document, coreprops, appproperties(), contenttypes(), websettings(), wordrelationships(relationships), TEST_FILE, imagefiledict=imagefiledict)
+    """
+    Test that a new document can be created
+    """
+    document, docbody, relationships, imagefiledict = simpledoc(
+        noimagecopy=True
+    )
+    coreprops = coreproperties(
+        'Python docx testnewdocument',
+        'A short example of making docx from Python', 'Alan Brooks',
+        ['python', 'Office Open XML', 'Word']
+    )
+    savedocx(
+        document, coreprops, appproperties(), contenttypes(), websettings(),
+        wordrelationships(relationships), TEST_FILE,
+        imagefiledict=imagefiledict
+    )
+
 
 def testopendocx():
-    '''Ensure an etree element is returned'''
-    if isinstance(opendocx(TEST_FILE),lxml.etree._Element):
+    """Ensure an etree element is returned"""
+    if isinstance(opendocx(TEST_FILE), lxml.etree._Element):
         pass
     else:
         assert False
 
+
 def testmakeelement():
-    '''Ensure custom elements get created'''
-    testelement = makeelement('testname',attributes={'testattribute':'testvalue'},tagtext='testtagtext')
-    assert testelement.tag == '{http://schemas.openxmlformats.org/wordprocessingml/2006/main}testname'
-    assert testelement.attrib == {'{http://schemas.openxmlformats.org/wordprocessingml/2006/main}testattribute': 'testvalue'}
+    """Ensure custom elements get created"""
+    testelement = makeelement(
+        'testname',
+        attributes={'testattribute': 'testvalue'},
+        tagtext='testtagtext'
+    )
+    assert testelement.tag == (
+        '{http://schemas.openxmlformats.org/wordprocessingml/2006/main}testn'
+        'ame'
+    )
+    assert testelement.attrib == {
+        '{http://schemas.openxmlformats.org/wordprocessingml/2006/main}testa'
+        'ttribute': 'testvalue'
+    }
     assert testelement.text == 'testtagtext'
 
+
 def testparagraph():
-    '''Ensure paragraph creates p elements'''
-    testpara = paragraph('paratext',style='BodyText')
-    assert testpara.tag == '{http://schemas.openxmlformats.org/wordprocessingml/2006/main}p'
+    """Ensure paragraph creates p elements"""
+    testpara = paragraph('paratext', style='BodyText')
+    assert testpara.tag == (
+        '{http://schemas.openxmlformats.org/wordprocessingml/2006/main}p'
+    )
     pass
-    
+
+
 def testtable():
-    '''Ensure tables make sense'''
-    testtable = table([['A1','A2'],['B1','B2'],['C1','C2']])
-    ns = '{http://schemas.openxmlformats.org/wordprocessingml/2006/main}'
-    assert testtable.xpath('/ns0:tbl/ns0:tr[2]/ns0:tc[2]/ns0:p/ns0:r/ns0:t',namespaces={'ns0':'http://schemas.openxmlformats.org/wordprocessingml/2006/main'})[0].text == 'B2'
+    """Ensure tables make sense"""
+    testtable = table([['A1', 'A2'], ['B1', 'B2'], ['C1', 'C2']])
+    assert (
+        testtable.xpath(
+            '/ns0:tbl/ns0:tr[2]/ns0:tc[2]/ns0:p/ns0:r/ns0:t',
+            namespaces={'ns0': ('http://schemas.openxmlformats.org/wordproce'
+                                'ssingml/2006/main')}
+        )[0].text == 'B2'
+    )
+
 
-if __name__=='__main__':
+if __name__ == '__main__':
     import nose
     nose.main()

From e507db84bdaa65010b616033a8ac6639ac4f6a12 Mon Sep 17 00:00:00 2001
From: Mike MacCana <mike.maccana@gmail.com>
Date: Tue, 18 Feb 2014 10:36:52 +0000
Subject: [PATCH 24/25] Add links to new project and docs

Really, we should have done this a while ago, but I wasn't sure if Steve considered his new stuff 'official'. Should give the new project some SEO as well. Related to #61.
---
 README.rst | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/README.rst b/README.rst
index fefcc1c..466a79b 100644
--- a/README.rst
+++ b/README.rst
@@ -2,6 +2,13 @@
 Python docx
 ###########
 
+This Project Has Moved!
+=======================
+
+**Python DocX is now part of Python OpenXML**. There's all kinds of new stuff, including Python 3 support, sister libraries for doing Excel files, and more. Check out the `current Python DocX GitHub <https://github.com/python-openxml/python-docx>`_ and the `current Python DocX docs <https://python-docx.readthedocs.org/en/latest/>`_.
+
+Info below is kept for archival purposes. **Go use the new stuff!**
+
 Introduction
 ============
 

From 4c9b46dbebe3d2a9b82dbcd35af36584a36fd9fe Mon Sep 17 00:00:00 2001
From: Mike MacCana <mike.maccana@gmail.com>
Date: Tue, 19 Aug 2014 13:50:35 +0100
Subject: [PATCH 25/25] Make it more prominent that the project has moved.

---
 README.rst | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/README.rst b/README.rst
index 466a79b..291465a 100644
--- a/README.rst
+++ b/README.rst
@@ -1,9 +1,6 @@
 ###########
-Python docx
-###########
-
 This Project Has Moved!
-=======================
+###########
 
 **Python DocX is now part of Python OpenXML**. There's all kinds of new stuff, including Python 3 support, sister libraries for doing Excel files, and more. Check out the `current Python DocX GitHub <https://github.com/python-openxml/python-docx>`_ and the `current Python DocX docs <https://python-docx.readthedocs.org/en/latest/>`_.