From a9500adcee70d7dc3f4da3a4185a6e34f6ba0618 Mon Sep 17 00:00:00 2001
From: Derek Hsu <derekhybrid@gmail.com>
Date: Sat, 28 Jul 2012 15:44:40 +0800
Subject: [PATCH 01/16] modified paragraph, search and replace, relationship...

Add multi-line text support to paragraph. Different lines are splited
into different <w:r>s.
Modified paragraph to support more complicated style like color and font
size.
Improved advSearch and advReplace algorithem.
Support extracting relation and contenttype form .docx file
Add findElementByText function
---
 docx.py | 1878 +++++++++++++++++++++++++++++--------------------------
 1 file changed, 993 insertions(+), 885 deletions(-)

diff --git a/docx.py b/docx.py
index 0f41b09..d58b5f8 100755
--- a/docx.py
+++ b/docx.py
@@ -1,885 +1,993 @@
-#!/usr/bin/env python2.6
-# -*- coding: utf-8 -*-
-'''
-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
-try:
-    from PIL import Image
-except ImportError:
-    import Image
-import zipfile
-import shutil
-import re
-import time
-import os
-from os.path import join
-
-log = logging.getLogger(__name__)
-
-# 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
-if not os.path.isdir(template_dir):
-    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'
-    }
-
-def opendocx(file):
-    '''Open a docx file, return a document XML tree'''
-    mydoc = zipfile.ZipFile(file)
-    xmlcontent = mydoc.read('word/document.xml')
-    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
-    namespacemap = None
-    if isinstance(nsprefix, list):
-        namespacemap = {}
-        for prefix in nsprefix:
-            namespacemap[prefix] = nsprefixes[prefix]
-        nsprefix = nsprefix[0] # FIXME: rest of code below expects a single prefix
-    if nsprefix:
-        namespace = '{'+nsprefixes[nsprefix]+'}'
-    else:
-        # For when namespace = None
-        namespace = ''
-    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 not attrnsprefix:
-            # 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:
-                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
-    Return our page break element.'''
-    # 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))
-    pagebreak = makeelement('p')
-    if type == 'page':
-        run = makeelement('r')
-        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'})
-        elif 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:
-            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),''],]
-    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
-    paragraph.append(pPr)
-    for t in text:
-        run = makeelement('r')
-        rPr = makeelement('rPr')
-        # Apply styles
-        if t[1].find('b') > -1:
-            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:
-            i = makeelement('i')
-            rPr.append(i)
-        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])
-        paragraph.append(run)
-    # 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'
-        }
-    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'}
-    for extension in filetypes:
-        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)})
-    run = makeelement('r')
-    text = makeelement('t',tagtext=headingtext)
-    # Add the text the run, and the run to the paragraph
-    pr.append(pStyle)
-    run.append(text)
-    paragraph.append(pr)
-    paragraph.append(run)
-    # 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
-    '''
-    table = makeelement('tbl')
-    columns = len(contents[0])
-    # Table properties
-    tableprops = makeelement('tblPr')
-    tablestyle = makeelement('tblStyle',attributes={'val':''})
-    tableprops.append(tablestyle)
-    tablewidth = makeelement('tblW',attributes={'w':str(tblw),'type':str(twunit)})
-    tableprops.append(tablewidth)
-    if len(borders.keys()):
-        tableborders = makeelement('tblBorders')
-        for b in ['top', 'left', 'bottom', 'right', 'insideH', 'insideV']:
-            if b in borders.keys() or 'all' in borders.keys():
-                k = 'all' if 'all' in borders.keys() else b
-                attrs = {}
-                for a in borders[k].keys():
-                    attrs[a] = unicode(borders[k][a])
-                borderelem = makeelement(b,attributes=attrs)
-                tableborders.append(borderelem)
-        tableprops.append(tableborders)
-    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'}))
-    table.append(tablegrid)
-    # Heading Row
-    row = makeelement('tr')
-    rowprops = makeelement('trPr')
-    cnfStyle = makeelement('cnfStyle',attributes={'val':'000000100000'})
-    rowprops.append(cnfStyle)
-    row.append(rowprops)
-    if heading:
-        i = 0
-        for heading in contents[0]:
-            cell = makeelement('tc')
-            # Cell properties
-            cellprops = makeelement('tcPr')
-            if colw:
-                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'})
-            cellprops.append(cellwidth)
-            cellprops.append(cellstyle)
-            cell.append(cellprops)
-            # Paragraph (Content)
-            if not isinstance(heading, (list, tuple)):
-                heading = [heading,]
-            for h in heading:
-                if isinstance(h, etree._Element):
-                    cell.append(h)
-                else:
-                    cell.append(paragraph(h,jc='center'))
-            row.append(cell)
-            i += 1
-        table.append(row)
-    # Contents Rows
-    for contentrow in contents[1 if heading else 0:]:
-        row = makeelement('tr')
-        i = 0
-        for content in contentrow:
-            cell = makeelement('tc')
-            # Properties
-            cellprops = makeelement('tcPr')
-            if colw:
-                wattr = {'w':str(colw[i]),'type':cwunit}
-            else:
-                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,]
-            for c in content:
-                if isinstance(c, etree._Element):
-                    cell.append(c)
-                else:
-                    if celstyle and 'align' in celstyle[i].keys():
-                        align = celstyle[i]['align']
-                    else:
-                        align = 'left'
-                    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):
-    '''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')
-    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}))
-    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.append(cnvpr)
-    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.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'})
-    graphicdata.append(pic)
-    graphic = makeelement('graphic',nsprefix='a')
-    graphic.append(graphicdata)
-
-    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})
-    inline = makeelement('inline',
-        attributes={'distT':"0",'distB':"0",'distL':"0",'distR':"0"},nsprefix='wp')
-    inline.append(extent)
-    inline.append(effectextent)
-    inline.append(docpr)
-    inline.append(framepr)
-    inline.append(graphic)
-    drawing = makeelement('drawing')
-    drawing.append(inline)
-    run = makeelement('r')
-    run.append(drawing)
-    paragraph = makeelement('p')
-    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.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.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 = []
-        for element in newdocument.iter():
-            if element.tag == '{%s}%s' % (nsprefixes['w'], t):
-                if not element.text and not len(element):
-                    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,
-    we need to adopt some sort of algorithm to handle this situation.
-    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:
-                # 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
-                # s = search start
-                # e = element IDs to merge
-                found = False
-                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)
-                            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
-
-    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.
-    Since the text to search could be spawned across multiple text blocks,
-    we need to adopt some sort of algorithm to handle this situation.
-    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:
-                # 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
-                # s = search start
-                # e = element IDs to merge
-                found = False
-                for l in range(1,len(searchels)+1):
-                    if found:
-                        break
-                    #print "slen:", l
-                    for s in range(len(searchels)):
-                        if found:
-                            break
-                        if s+l <= len(searchels):
-                            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 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")
-                                    else:
-                                        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
-                                        if isinstance(replace, etree._Element):
-                                            # 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
-                                            # 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
-                                            for r in replace:
-                                                p.getparent().insert(insindex, r)
-                                                insindex += 1
-                                        else:
-                                            # Replacing with pure text
-                                            searchels[i].text = re.sub(search,replace,txtsearch)
-                                        replaced = True
-                                        log.debug("Replacing in element #: %s", i)
-                                    else:
-                                        # Clears the other text elements
-                                        searchels[i].text = ''
-    return newdocument
-
-def getdocumenttext(document):
-    '''Return the raw text of a document, as a list of paragraphs.'''
-    paratextlist=[]
-    # Compile a list of all paragraph (p) elements
-    paralist = []
-    for element in document.iter():
-        # 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.
-    for para in paralist:
-        paratext=u''
-        # Loop through each paragraph
-        for element in para.iter():
-            # Find t (text) elements
-            if element.tag == '{'+nsprefixes['w']+'}t':
-                if element.text:
-                    paratext = paratext+element.text
-            elif element.tag == '{'+nsprefixes['w']+'}tab':
-                paratext = paratext + '\t'
-        # Add our completed paragraph text to the list of paragraph text
-        if not len(paratext) == 0:
-            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.'''
-    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'))
-    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']:
-        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')
-    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',
-            }
-    for prop in props:
-        appprops.append(makeelement(prop,tagtext=props[prop],nsprefix=None))
-    return appprops
-
-
-def websettings():
-    '''Generate websettings'''
-    web = makeelement('webSettings')
-    web.append(makeelement('allowPNG'))
-    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'],
-    ]
-    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>'''
-    )
-    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))
-        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
-    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'}
-    for tree in treesandfiles:
-        log.info('Saving: '+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
-    for dirpath,dirnames,filenames in os.walk('.'):
-        for filename in filenames:
-            if filename in files_to_ignore:
-                continue
-            templatefile = join(dirpath,filename)
-            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
-    return
-
-
+#!/usr/bin/env python2.6
+# -*- coding: utf-8 -*-
+'''
+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
+try:
+    from PIL import Image
+except ImportError:
+    import Image
+import zipfile
+import shutil
+import re
+import time
+import os
+from os.path import join
+
+log = logging.getLogger(__name__)
+
+# 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
+if not os.path.isdir(template_dir):
+    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'
+    }
+
+def opendocx(file):
+    '''Open a docx file, return a document XML tree'''
+    mydoc = zipfile.ZipFile(file)
+    xmlcontent = mydoc.read('word/document.xml')
+    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
+    namespacemap = None
+    if isinstance(nsprefix, list):
+        namespacemap = {}
+        for prefix in nsprefix:
+            namespacemap[prefix] = nsprefixes[prefix]
+        nsprefix = nsprefix[0] # FIXME: rest of code below expects a single prefix
+    if nsprefix:
+        namespace = '{'+nsprefixes[nsprefix]+'}'
+    else:
+        # For when namespace = None
+        namespace = ''
+    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 not attrnsprefix:
+            # 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:
+                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
+    Return our page break element.'''
+    # 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))
+    pagebreak = makeelement('p')
+    if type == 'page':
+        run = makeelement('r')
+        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'})
+        elif 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', {'style': 'b'}),
+        ('some normal text', {'style': ''}),
+        ('some italic underlined text', {'style': 'iu'}),
+        ('some bold text with color and font size', {'style': 'b', 
+                                                     'color': 'C00000', 
+                                                     'sz': '32'})
+    ]
+
+    '''
+    # Make our elements
+    paragraph = makeelement('p')
+
+    if not isinstance(paratext, list):
+        paratext = [paratext]
+    text = []
+    for pt in paratext:
+        if not isinstance(pt, (list,tuple)):
+            pt = (pt, {})
+        lines = pt[0].split('\n')
+        for l in lines[:-1]:
+            text.append((makeelement('t',tagtext=l), pt[1], True))  # with line break
+        text.append((makeelement('t',tagtext=lines[-1]), pt[1], False))  # the last line, without line break        
+
+    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
+    paragraph.append(pPr)
+    for t in text:
+        run = makeelement('r')
+        rPr = makeelement('rPr')
+        # Apply styles
+        if t[1].has_key('style'):
+            if t[1]['style'].find('b') > -1:
+                b = makeelement('b')
+                rPr.append(b)
+            if t[1]['style'].find('u') > -1:
+                u = makeelement('u',attributes={'val':'single'})
+                rPr.append(u)
+            if t[1]['style'].find('i') > -1:
+                i = makeelement('i')
+                rPr.append(i)
+        for pr_key in t[1]:
+            if not pr_key == 'style':
+                pr = makeelement(pr_key,attributes={'val': t[1][pr_key]})
+                rPr.append(pr)
+        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])
+        # Insert line break if there is multiple lines
+        if t[2]:
+            br = makeelement('br')
+            run.append(br)
+        paragraph.append(run)
+    # Return the combined paragraph
+    return paragraph
+
+def getDefaultContentTypes():
+    # 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'
+        }
+    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'}
+    for extension in filetypes:
+        types.append(makeelement('Default',nsprefix=None,attributes={'Extension':extension,'ContentType':filetypes[extension]}))
+    return types
+
+def getContentTypes(file):
+    '''Get Content Types file from a given Word document'''
+    if os.path.isfile(file):
+        mydoc = zipfile.ZipFile(file)
+        xmlcontent = mydoc.read('[Content_Types].xml')
+        types = etree.fromstring(xmlcontent)
+        return types
+    else:
+        return getDefaultContentTypes()
+
+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)})
+    run = makeelement('r')
+    text = makeelement('t',tagtext=headingtext)
+    # Add the text the run, and the run to the paragraph
+    pr.append(pStyle)
+    run.append(text)
+    paragraph.append(pr)
+    paragraph.append(run)
+    # 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
+    '''
+    table = makeelement('tbl')
+    columns = len(contents[0])
+    # Table properties
+    tableprops = makeelement('tblPr')
+    tablestyle = makeelement('tblStyle',attributes={'val':''})
+    tableprops.append(tablestyle)
+    tablewidth = makeelement('tblW',attributes={'w':str(tblw),'type':str(twunit)})
+    tableprops.append(tablewidth)
+    if len(borders.keys()):
+        tableborders = makeelement('tblBorders')
+        for b in ['top', 'left', 'bottom', 'right', 'insideH', 'insideV']:
+            if b in borders.keys() or 'all' in borders.keys():
+                k = 'all' if 'all' in borders.keys() else b
+                attrs = {}
+                for a in borders[k].keys():
+                    attrs[a] = unicode(borders[k][a])
+                borderelem = makeelement(b,attributes=attrs)
+                tableborders.append(borderelem)
+        tableprops.append(tableborders)
+    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'}))
+    table.append(tablegrid)
+    # Heading Row
+    row = makeelement('tr')
+    rowprops = makeelement('trPr')
+    cnfStyle = makeelement('cnfStyle',attributes={'val':'000000100000'})
+    rowprops.append(cnfStyle)
+    row.append(rowprops)
+    if heading:
+        i = 0
+        for heading in contents[0]:
+            cell = makeelement('tc')
+            # Cell properties
+            cellprops = makeelement('tcPr')
+            if colw:
+                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'})
+            cellprops.append(cellwidth)
+            cellprops.append(cellstyle)
+            cell.append(cellprops)
+            # Paragraph (Content)
+            if not isinstance(heading, (list, tuple)):
+                heading = [heading,]
+            for h in heading:
+                if isinstance(h, etree._Element):
+                    cell.append(h)
+                else:
+                    cell.append(paragraph(h,jc='center'))
+            row.append(cell)
+            i += 1
+        table.append(row)
+    # Contents Rows
+    for contentrow in contents[1 if heading else 0:]:
+        row = makeelement('tr')
+        i = 0
+        for content in contentrow:
+            cell = makeelement('tc')
+            # Properties
+            cellprops = makeelement('tcPr')
+            if colw:
+                wattr = {'w':str(colw[i]),'type':cwunit}
+            else:
+                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,]
+            for c in content:
+                if isinstance(c, etree._Element):
+                    cell.append(c)
+                else:
+                    if celstyle and 'align' in celstyle[i].keys():
+                        align = celstyle[i]['align']
+                    else:
+                        align = 'left'
+                    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):
+    '''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')
+    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(makeelement('Relationship',attributes={'Id':'rId'+picrelid,
+        'Type': 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/image','Target': 'media/'+picname},nsprefix=None))
+
+    # 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.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.append(cnvpr)
+    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.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'})
+    graphicdata.append(pic)
+    graphic = makeelement('graphic',nsprefix='a')
+    graphic.append(graphicdata)
+
+    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})
+    inline = makeelement('inline',
+        attributes={'distT':"0",'distB':"0",'distL':"0",'distR':"0"},nsprefix='wp')
+    inline.append(extent)
+    inline.append(effectextent)
+    inline.append(docpr)
+    inline.append(framepr)
+    inline.append(graphic)
+    drawing = makeelement('drawing')
+    drawing.append(inline)
+    run = makeelement('r')
+    run.append(drawing)
+    paragraph = makeelement('p')
+    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.text:
+                if searchre.search(element.text):
+                    result = True
+    return result
+
+def findElementByText(document,search):
+    '''Search a document for a regex, return the first matching text element'''
+    res_element = None
+    searchre = re.compile(search)
+    for element in document.iter():
+        if element.tag == '{%s}t' % nsprefixes['w']: # t (text) elements
+            if element.text:
+                if searchre.search(element.text):
+                    res_element = element
+                    return res_element
+    return res_element
+
+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.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 = []
+        for element in newdocument.iter():
+            if element.tag == '{%s}%s' % (nsprefixes['w'], t):
+                if not element.text and not len(element):
+                    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,
+    we need to adopt some sort of algorithm to handle this situation.
+    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:
+                # Add this element to searchels
+                searchels.append(element)
+                if len(searchels) > bs:
+                    # Is searchels is too long, remove first elements
+                    searchels.pop(0)
+
+                found = False
+                txtsearch = ''
+                for el in searchels:
+                    txtsearch += el.text
+
+                # Searcs for the text in the whole txtsearch
+                match = searchre.search(txtsearch)
+                if match:
+                    # I've found something :)
+                    # The end of match must be in the last element
+                    # |----|---s|omet|hing|!---|
+                    # Now we need to find the element containing the start of the match
+                    # Search all combinations, of searchels, starting from
+                    # smaller up to bigger ones
+                    # s = search start
+                    # e = element IDs to merge
+                    els_len = len(searchels)
+                    for s in reversed(range(els_len)):
+                        txtsearch = ''
+                        e = range(s,els_len)
+                        for k in e:
+                            txtsearch += searchels[k].text
+                        match = searchre.search(txtsearch)
+                        if match:
+                            found = True
+                            matches.append(match.group())
+                    # Now we have found the start and ending element of the match
+                    # |  0 |  1 |  2 |  3 |  4 |
+                    # |----|---s|omet|hing|!---|
+                    # e = [1,2,3,4]
+    return set(matches)
+
+
+def advFindElementByText(document, search, bs=3):
+    '''
+    This is an advanced version of python-docx.findElementByText() that takes into
+    account blocks of <bs> elements at a time.
+
+    @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 list      The element set contains the search when combined
+    '''
+
+    # 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 document.iter():
+        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)
+
+                found = False
+                txtsearch = ''
+                for el in searchels:
+                    txtsearch += el.text
+
+                # Searcs for the text in the whole txtsearch
+                match = searchre.search(txtsearch)
+                if match:
+                    # I've found something :)
+                    # The end of match must be in the last element
+                    # |----|---s|omet|hing|!---|
+                    # Now we need to find the element containing the start of the match
+                    # Search all combinations, of searchels, starting from
+                    # smaller up to bigger ones
+                    # s = search start
+                    # e = element IDs to merge
+                    els_len = len(searchels)
+                    for s in reversed(range(els_len)):
+                        txtsearch = ''
+                        e = range(s,els_len)
+                        for k in e:
+                            txtsearch += searchels[k].text
+                        match = searchre.search(txtsearch)
+                        if match:
+                            found = True
+                            return searchels[s:]
+                    # Now we have found the start and ending element of the match
+                    # |  0 |  1 |  2 |  3 |  4 |
+                    # |----|---s|omet|hing|!---|
+                    # e = [1,2,3,4]
+    return None
+
+
+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.
+    Since the text to search could be spawned across multiple text blocks,
+    we need to adopt some sort of algorithm to handle this situation.
+    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:
+                # Add this element to searchels
+                searchels.append(element)
+                if len(searchels) > bs:
+                    # Is searchels is too long, remove first elements
+                    searchels.pop(0)
+
+                found = False
+                txtsearch = ''
+                for el in searchels:
+                    txtsearch += el.text
+
+                # Searcs for the text in the whole txtsearch
+                match = searchre.search(txtsearch)
+                if match:
+                    # I've found something :)
+                    # The end of match must be in the last element
+                    # |----|---s|omet|hing|!---|
+                    # Now we need to find the element containing the start of the match
+                    # Search all combinations, of searchels, starting from
+                    # smaller up to bigger ones
+                    # s = search start
+                    # e = element IDs to merge
+                    els_len = len(searchels)
+                    for s in reversed(range(els_len)):
+                        txtsearch = ''
+                        e = range(s,els_len)
+                        for k in e:
+                            txtsearch += searchels[k].text
+                        match = searchre.search(txtsearch)
+                        if match:
+                            found = True
+                            break
+                    # Now we have found the start and ending element of the match
+                    # |  0 |  1 |  2 |  3 |  4 |
+                    # |----|---s|omet|hing|!---|
+                    # e = [1,2,3,4]
+                    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 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")
+                        else:
+                            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
+                            if isinstance(replace, etree._Element):
+                                # 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
+                                # 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
+                                for r in replace:
+                                    p.getparent().insert(insindex, r)
+                                    insindex += 1
+                            else:
+                                # Replacing with pure text
+                                searchels[i].text = re.sub(search,replace,txtsearch)
+                            replaced = True
+                            log.debug("Replacing in element #: %s", i)
+                        else:
+                            # Clears the other text elements
+                            searchels[i].text = ''
+    return newdocument
+
+def getdocumenttext(document):
+    '''Return the raw text of a document, as a list of paragraphs.'''
+    paratextlist=[]
+    # Compile a list of all paragraph (p) elements
+    paralist = []
+    for element in document.iter():
+        # 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.
+    for para in paralist:
+        paratext=u''
+        # Loop through each paragraph
+        for element in para.iter():
+            # Find t (text) elements
+            if element.tag == '{'+nsprefixes['w']+'}t':
+                if element.text:
+                    paratext = paratext+element.text
+            elif element.tag == '{'+nsprefixes['w']+'}tab':
+                paratext = paratext + '\t'
+        # Add our completed paragraph text to the list of paragraph text
+        if not len(paratext) == 0:
+            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.'''
+    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'))
+    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']:
+        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')
+    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',
+            }
+    for prop in props:
+        appprops.append(makeelement(prop,tagtext=props[prop],nsprefix=None))
+    return appprops
+
+def websettings():
+    '''Generate websettings'''
+    web = makeelement('webSettings')
+    web.append(makeelement('allowPNG'))
+    web.append(makeelement('doNotSaveAsSingleFile'))
+    return web
+
+def getDefaultRelationships():
+    '''Generate a default Word relationships file'''
+    # Default list of relationships
+    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'],
+    ]
+    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))
+        count += 1
+    return relationships
+
+def getRelationships(file):
+    '''Get a Word relationships file from a given Word document'''
+    if os.path.isfile(file):
+        mydoc = zipfile.ZipFile(file)
+        xmlcontent = mydoc.read('word/_rels/document.xml.rels')
+        relationships = etree.fromstring(xmlcontent)
+        return relationships
+    else:
+        return getDefaultRelationships()
+
+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
+    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'}
+    for tree in treesandfiles:
+        log.info('Saving: '+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
+    for dirpath,dirnames,filenames in os.walk('.'):
+        for filename in filenames:
+            if filename in files_to_ignore:
+                continue
+            templatefile = join(dirpath,filename)
+            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
+    return
+
+

From d34d5e4735408ff1be94d95a49c8ccbf89fb7737 Mon Sep 17 00:00:00 2001
From: Derek Hsu <derekhybrid@gmail.com>
Date: Sat, 28 Jul 2012 16:04:40 +0800
Subject: [PATCH 02/16] Revert "modified paragraph, search and replace,
 relationship..."

This reverts commit a9500adcee70d7dc3f4da3a4185a6e34f6ba0618.
---
 docx.py | 1878 ++++++++++++++++++++++++++-----------------------------
 1 file changed, 885 insertions(+), 993 deletions(-)

diff --git a/docx.py b/docx.py
index d58b5f8..0f41b09 100755
--- a/docx.py
+++ b/docx.py
@@ -1,993 +1,885 @@
-#!/usr/bin/env python2.6
-# -*- coding: utf-8 -*-
-'''
-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
-try:
-    from PIL import Image
-except ImportError:
-    import Image
-import zipfile
-import shutil
-import re
-import time
-import os
-from os.path import join
-
-log = logging.getLogger(__name__)
-
-# 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
-if not os.path.isdir(template_dir):
-    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'
-    }
-
-def opendocx(file):
-    '''Open a docx file, return a document XML tree'''
-    mydoc = zipfile.ZipFile(file)
-    xmlcontent = mydoc.read('word/document.xml')
-    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
-    namespacemap = None
-    if isinstance(nsprefix, list):
-        namespacemap = {}
-        for prefix in nsprefix:
-            namespacemap[prefix] = nsprefixes[prefix]
-        nsprefix = nsprefix[0] # FIXME: rest of code below expects a single prefix
-    if nsprefix:
-        namespace = '{'+nsprefixes[nsprefix]+'}'
-    else:
-        # For when namespace = None
-        namespace = ''
-    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 not attrnsprefix:
-            # 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:
-                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
-    Return our page break element.'''
-    # 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))
-    pagebreak = makeelement('p')
-    if type == 'page':
-        run = makeelement('r')
-        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'})
-        elif 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', {'style': 'b'}),
-        ('some normal text', {'style': ''}),
-        ('some italic underlined text', {'style': 'iu'}),
-        ('some bold text with color and font size', {'style': 'b', 
-                                                     'color': 'C00000', 
-                                                     'sz': '32'})
-    ]
-
-    '''
-    # Make our elements
-    paragraph = makeelement('p')
-
-    if not isinstance(paratext, list):
-        paratext = [paratext]
-    text = []
-    for pt in paratext:
-        if not isinstance(pt, (list,tuple)):
-            pt = (pt, {})
-        lines = pt[0].split('\n')
-        for l in lines[:-1]:
-            text.append((makeelement('t',tagtext=l), pt[1], True))  # with line break
-        text.append((makeelement('t',tagtext=lines[-1]), pt[1], False))  # the last line, without line break        
-
-    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
-    paragraph.append(pPr)
-    for t in text:
-        run = makeelement('r')
-        rPr = makeelement('rPr')
-        # Apply styles
-        if t[1].has_key('style'):
-            if t[1]['style'].find('b') > -1:
-                b = makeelement('b')
-                rPr.append(b)
-            if t[1]['style'].find('u') > -1:
-                u = makeelement('u',attributes={'val':'single'})
-                rPr.append(u)
-            if t[1]['style'].find('i') > -1:
-                i = makeelement('i')
-                rPr.append(i)
-        for pr_key in t[1]:
-            if not pr_key == 'style':
-                pr = makeelement(pr_key,attributes={'val': t[1][pr_key]})
-                rPr.append(pr)
-        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])
-        # Insert line break if there is multiple lines
-        if t[2]:
-            br = makeelement('br')
-            run.append(br)
-        paragraph.append(run)
-    # Return the combined paragraph
-    return paragraph
-
-def getDefaultContentTypes():
-    # 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'
-        }
-    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'}
-    for extension in filetypes:
-        types.append(makeelement('Default',nsprefix=None,attributes={'Extension':extension,'ContentType':filetypes[extension]}))
-    return types
-
-def getContentTypes(file):
-    '''Get Content Types file from a given Word document'''
-    if os.path.isfile(file):
-        mydoc = zipfile.ZipFile(file)
-        xmlcontent = mydoc.read('[Content_Types].xml')
-        types = etree.fromstring(xmlcontent)
-        return types
-    else:
-        return getDefaultContentTypes()
-
-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)})
-    run = makeelement('r')
-    text = makeelement('t',tagtext=headingtext)
-    # Add the text the run, and the run to the paragraph
-    pr.append(pStyle)
-    run.append(text)
-    paragraph.append(pr)
-    paragraph.append(run)
-    # 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
-    '''
-    table = makeelement('tbl')
-    columns = len(contents[0])
-    # Table properties
-    tableprops = makeelement('tblPr')
-    tablestyle = makeelement('tblStyle',attributes={'val':''})
-    tableprops.append(tablestyle)
-    tablewidth = makeelement('tblW',attributes={'w':str(tblw),'type':str(twunit)})
-    tableprops.append(tablewidth)
-    if len(borders.keys()):
-        tableborders = makeelement('tblBorders')
-        for b in ['top', 'left', 'bottom', 'right', 'insideH', 'insideV']:
-            if b in borders.keys() or 'all' in borders.keys():
-                k = 'all' if 'all' in borders.keys() else b
-                attrs = {}
-                for a in borders[k].keys():
-                    attrs[a] = unicode(borders[k][a])
-                borderelem = makeelement(b,attributes=attrs)
-                tableborders.append(borderelem)
-        tableprops.append(tableborders)
-    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'}))
-    table.append(tablegrid)
-    # Heading Row
-    row = makeelement('tr')
-    rowprops = makeelement('trPr')
-    cnfStyle = makeelement('cnfStyle',attributes={'val':'000000100000'})
-    rowprops.append(cnfStyle)
-    row.append(rowprops)
-    if heading:
-        i = 0
-        for heading in contents[0]:
-            cell = makeelement('tc')
-            # Cell properties
-            cellprops = makeelement('tcPr')
-            if colw:
-                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'})
-            cellprops.append(cellwidth)
-            cellprops.append(cellstyle)
-            cell.append(cellprops)
-            # Paragraph (Content)
-            if not isinstance(heading, (list, tuple)):
-                heading = [heading,]
-            for h in heading:
-                if isinstance(h, etree._Element):
-                    cell.append(h)
-                else:
-                    cell.append(paragraph(h,jc='center'))
-            row.append(cell)
-            i += 1
-        table.append(row)
-    # Contents Rows
-    for contentrow in contents[1 if heading else 0:]:
-        row = makeelement('tr')
-        i = 0
-        for content in contentrow:
-            cell = makeelement('tc')
-            # Properties
-            cellprops = makeelement('tcPr')
-            if colw:
-                wattr = {'w':str(colw[i]),'type':cwunit}
-            else:
-                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,]
-            for c in content:
-                if isinstance(c, etree._Element):
-                    cell.append(c)
-                else:
-                    if celstyle and 'align' in celstyle[i].keys():
-                        align = celstyle[i]['align']
-                    else:
-                        align = 'left'
-                    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):
-    '''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')
-    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(makeelement('Relationship',attributes={'Id':'rId'+picrelid,
-        'Type': 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/image','Target': 'media/'+picname},nsprefix=None))
-
-    # 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.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.append(cnvpr)
-    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.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'})
-    graphicdata.append(pic)
-    graphic = makeelement('graphic',nsprefix='a')
-    graphic.append(graphicdata)
-
-    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})
-    inline = makeelement('inline',
-        attributes={'distT':"0",'distB':"0",'distL':"0",'distR':"0"},nsprefix='wp')
-    inline.append(extent)
-    inline.append(effectextent)
-    inline.append(docpr)
-    inline.append(framepr)
-    inline.append(graphic)
-    drawing = makeelement('drawing')
-    drawing.append(inline)
-    run = makeelement('r')
-    run.append(drawing)
-    paragraph = makeelement('p')
-    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.text:
-                if searchre.search(element.text):
-                    result = True
-    return result
-
-def findElementByText(document,search):
-    '''Search a document for a regex, return the first matching text element'''
-    res_element = None
-    searchre = re.compile(search)
-    for element in document.iter():
-        if element.tag == '{%s}t' % nsprefixes['w']: # t (text) elements
-            if element.text:
-                if searchre.search(element.text):
-                    res_element = element
-                    return res_element
-    return res_element
-
-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.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 = []
-        for element in newdocument.iter():
-            if element.tag == '{%s}%s' % (nsprefixes['w'], t):
-                if not element.text and not len(element):
-                    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,
-    we need to adopt some sort of algorithm to handle this situation.
-    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:
-                # Add this element to searchels
-                searchels.append(element)
-                if len(searchels) > bs:
-                    # Is searchels is too long, remove first elements
-                    searchels.pop(0)
-
-                found = False
-                txtsearch = ''
-                for el in searchels:
-                    txtsearch += el.text
-
-                # Searcs for the text in the whole txtsearch
-                match = searchre.search(txtsearch)
-                if match:
-                    # I've found something :)
-                    # The end of match must be in the last element
-                    # |----|---s|omet|hing|!---|
-                    # Now we need to find the element containing the start of the match
-                    # Search all combinations, of searchels, starting from
-                    # smaller up to bigger ones
-                    # s = search start
-                    # e = element IDs to merge
-                    els_len = len(searchels)
-                    for s in reversed(range(els_len)):
-                        txtsearch = ''
-                        e = range(s,els_len)
-                        for k in e:
-                            txtsearch += searchels[k].text
-                        match = searchre.search(txtsearch)
-                        if match:
-                            found = True
-                            matches.append(match.group())
-                    # Now we have found the start and ending element of the match
-                    # |  0 |  1 |  2 |  3 |  4 |
-                    # |----|---s|omet|hing|!---|
-                    # e = [1,2,3,4]
-    return set(matches)
-
-
-def advFindElementByText(document, search, bs=3):
-    '''
-    This is an advanced version of python-docx.findElementByText() that takes into
-    account blocks of <bs> elements at a time.
-
-    @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 list      The element set contains the search when combined
-    '''
-
-    # 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 document.iter():
-        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)
-
-                found = False
-                txtsearch = ''
-                for el in searchels:
-                    txtsearch += el.text
-
-                # Searcs for the text in the whole txtsearch
-                match = searchre.search(txtsearch)
-                if match:
-                    # I've found something :)
-                    # The end of match must be in the last element
-                    # |----|---s|omet|hing|!---|
-                    # Now we need to find the element containing the start of the match
-                    # Search all combinations, of searchels, starting from
-                    # smaller up to bigger ones
-                    # s = search start
-                    # e = element IDs to merge
-                    els_len = len(searchels)
-                    for s in reversed(range(els_len)):
-                        txtsearch = ''
-                        e = range(s,els_len)
-                        for k in e:
-                            txtsearch += searchels[k].text
-                        match = searchre.search(txtsearch)
-                        if match:
-                            found = True
-                            return searchels[s:]
-                    # Now we have found the start and ending element of the match
-                    # |  0 |  1 |  2 |  3 |  4 |
-                    # |----|---s|omet|hing|!---|
-                    # e = [1,2,3,4]
-    return None
-
-
-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.
-    Since the text to search could be spawned across multiple text blocks,
-    we need to adopt some sort of algorithm to handle this situation.
-    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:
-                # Add this element to searchels
-                searchels.append(element)
-                if len(searchels) > bs:
-                    # Is searchels is too long, remove first elements
-                    searchels.pop(0)
-
-                found = False
-                txtsearch = ''
-                for el in searchels:
-                    txtsearch += el.text
-
-                # Searcs for the text in the whole txtsearch
-                match = searchre.search(txtsearch)
-                if match:
-                    # I've found something :)
-                    # The end of match must be in the last element
-                    # |----|---s|omet|hing|!---|
-                    # Now we need to find the element containing the start of the match
-                    # Search all combinations, of searchels, starting from
-                    # smaller up to bigger ones
-                    # s = search start
-                    # e = element IDs to merge
-                    els_len = len(searchels)
-                    for s in reversed(range(els_len)):
-                        txtsearch = ''
-                        e = range(s,els_len)
-                        for k in e:
-                            txtsearch += searchels[k].text
-                        match = searchre.search(txtsearch)
-                        if match:
-                            found = True
-                            break
-                    # Now we have found the start and ending element of the match
-                    # |  0 |  1 |  2 |  3 |  4 |
-                    # |----|---s|omet|hing|!---|
-                    # e = [1,2,3,4]
-                    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 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")
-                        else:
-                            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
-                            if isinstance(replace, etree._Element):
-                                # 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
-                                # 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
-                                for r in replace:
-                                    p.getparent().insert(insindex, r)
-                                    insindex += 1
-                            else:
-                                # Replacing with pure text
-                                searchels[i].text = re.sub(search,replace,txtsearch)
-                            replaced = True
-                            log.debug("Replacing in element #: %s", i)
-                        else:
-                            # Clears the other text elements
-                            searchels[i].text = ''
-    return newdocument
-
-def getdocumenttext(document):
-    '''Return the raw text of a document, as a list of paragraphs.'''
-    paratextlist=[]
-    # Compile a list of all paragraph (p) elements
-    paralist = []
-    for element in document.iter():
-        # 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.
-    for para in paralist:
-        paratext=u''
-        # Loop through each paragraph
-        for element in para.iter():
-            # Find t (text) elements
-            if element.tag == '{'+nsprefixes['w']+'}t':
-                if element.text:
-                    paratext = paratext+element.text
-            elif element.tag == '{'+nsprefixes['w']+'}tab':
-                paratext = paratext + '\t'
-        # Add our completed paragraph text to the list of paragraph text
-        if not len(paratext) == 0:
-            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.'''
-    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'))
-    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']:
-        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')
-    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',
-            }
-    for prop in props:
-        appprops.append(makeelement(prop,tagtext=props[prop],nsprefix=None))
-    return appprops
-
-def websettings():
-    '''Generate websettings'''
-    web = makeelement('webSettings')
-    web.append(makeelement('allowPNG'))
-    web.append(makeelement('doNotSaveAsSingleFile'))
-    return web
-
-def getDefaultRelationships():
-    '''Generate a default Word relationships file'''
-    # Default list of relationships
-    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'],
-    ]
-    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))
-        count += 1
-    return relationships
-
-def getRelationships(file):
-    '''Get a Word relationships file from a given Word document'''
-    if os.path.isfile(file):
-        mydoc = zipfile.ZipFile(file)
-        xmlcontent = mydoc.read('word/_rels/document.xml.rels')
-        relationships = etree.fromstring(xmlcontent)
-        return relationships
-    else:
-        return getDefaultRelationships()
-
-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
-    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'}
-    for tree in treesandfiles:
-        log.info('Saving: '+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
-    for dirpath,dirnames,filenames in os.walk('.'):
-        for filename in filenames:
-            if filename in files_to_ignore:
-                continue
-            templatefile = join(dirpath,filename)
-            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
-    return
-
-
+#!/usr/bin/env python2.6
+# -*- coding: utf-8 -*-
+'''
+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
+try:
+    from PIL import Image
+except ImportError:
+    import Image
+import zipfile
+import shutil
+import re
+import time
+import os
+from os.path import join
+
+log = logging.getLogger(__name__)
+
+# 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
+if not os.path.isdir(template_dir):
+    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'
+    }
+
+def opendocx(file):
+    '''Open a docx file, return a document XML tree'''
+    mydoc = zipfile.ZipFile(file)
+    xmlcontent = mydoc.read('word/document.xml')
+    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
+    namespacemap = None
+    if isinstance(nsprefix, list):
+        namespacemap = {}
+        for prefix in nsprefix:
+            namespacemap[prefix] = nsprefixes[prefix]
+        nsprefix = nsprefix[0] # FIXME: rest of code below expects a single prefix
+    if nsprefix:
+        namespace = '{'+nsprefixes[nsprefix]+'}'
+    else:
+        # For when namespace = None
+        namespace = ''
+    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 not attrnsprefix:
+            # 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:
+                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
+    Return our page break element.'''
+    # 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))
+    pagebreak = makeelement('p')
+    if type == 'page':
+        run = makeelement('r')
+        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'})
+        elif 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:
+            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),''],]
+    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
+    paragraph.append(pPr)
+    for t in text:
+        run = makeelement('r')
+        rPr = makeelement('rPr')
+        # Apply styles
+        if t[1].find('b') > -1:
+            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:
+            i = makeelement('i')
+            rPr.append(i)
+        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])
+        paragraph.append(run)
+    # 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'
+        }
+    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'}
+    for extension in filetypes:
+        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)})
+    run = makeelement('r')
+    text = makeelement('t',tagtext=headingtext)
+    # Add the text the run, and the run to the paragraph
+    pr.append(pStyle)
+    run.append(text)
+    paragraph.append(pr)
+    paragraph.append(run)
+    # 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
+    '''
+    table = makeelement('tbl')
+    columns = len(contents[0])
+    # Table properties
+    tableprops = makeelement('tblPr')
+    tablestyle = makeelement('tblStyle',attributes={'val':''})
+    tableprops.append(tablestyle)
+    tablewidth = makeelement('tblW',attributes={'w':str(tblw),'type':str(twunit)})
+    tableprops.append(tablewidth)
+    if len(borders.keys()):
+        tableborders = makeelement('tblBorders')
+        for b in ['top', 'left', 'bottom', 'right', 'insideH', 'insideV']:
+            if b in borders.keys() or 'all' in borders.keys():
+                k = 'all' if 'all' in borders.keys() else b
+                attrs = {}
+                for a in borders[k].keys():
+                    attrs[a] = unicode(borders[k][a])
+                borderelem = makeelement(b,attributes=attrs)
+                tableborders.append(borderelem)
+        tableprops.append(tableborders)
+    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'}))
+    table.append(tablegrid)
+    # Heading Row
+    row = makeelement('tr')
+    rowprops = makeelement('trPr')
+    cnfStyle = makeelement('cnfStyle',attributes={'val':'000000100000'})
+    rowprops.append(cnfStyle)
+    row.append(rowprops)
+    if heading:
+        i = 0
+        for heading in contents[0]:
+            cell = makeelement('tc')
+            # Cell properties
+            cellprops = makeelement('tcPr')
+            if colw:
+                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'})
+            cellprops.append(cellwidth)
+            cellprops.append(cellstyle)
+            cell.append(cellprops)
+            # Paragraph (Content)
+            if not isinstance(heading, (list, tuple)):
+                heading = [heading,]
+            for h in heading:
+                if isinstance(h, etree._Element):
+                    cell.append(h)
+                else:
+                    cell.append(paragraph(h,jc='center'))
+            row.append(cell)
+            i += 1
+        table.append(row)
+    # Contents Rows
+    for contentrow in contents[1 if heading else 0:]:
+        row = makeelement('tr')
+        i = 0
+        for content in contentrow:
+            cell = makeelement('tc')
+            # Properties
+            cellprops = makeelement('tcPr')
+            if colw:
+                wattr = {'w':str(colw[i]),'type':cwunit}
+            else:
+                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,]
+            for c in content:
+                if isinstance(c, etree._Element):
+                    cell.append(c)
+                else:
+                    if celstyle and 'align' in celstyle[i].keys():
+                        align = celstyle[i]['align']
+                    else:
+                        align = 'left'
+                    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):
+    '''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')
+    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}))
+    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.append(cnvpr)
+    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.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'})
+    graphicdata.append(pic)
+    graphic = makeelement('graphic',nsprefix='a')
+    graphic.append(graphicdata)
+
+    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})
+    inline = makeelement('inline',
+        attributes={'distT':"0",'distB':"0",'distL':"0",'distR':"0"},nsprefix='wp')
+    inline.append(extent)
+    inline.append(effectextent)
+    inline.append(docpr)
+    inline.append(framepr)
+    inline.append(graphic)
+    drawing = makeelement('drawing')
+    drawing.append(inline)
+    run = makeelement('r')
+    run.append(drawing)
+    paragraph = makeelement('p')
+    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.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.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 = []
+        for element in newdocument.iter():
+            if element.tag == '{%s}%s' % (nsprefixes['w'], t):
+                if not element.text and not len(element):
+                    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,
+    we need to adopt some sort of algorithm to handle this situation.
+    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:
+                # 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
+                # s = search start
+                # e = element IDs to merge
+                found = False
+                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)
+                            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
+
+    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.
+    Since the text to search could be spawned across multiple text blocks,
+    we need to adopt some sort of algorithm to handle this situation.
+    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:
+                # 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
+                # s = search start
+                # e = element IDs to merge
+                found = False
+                for l in range(1,len(searchels)+1):
+                    if found:
+                        break
+                    #print "slen:", l
+                    for s in range(len(searchels)):
+                        if found:
+                            break
+                        if s+l <= len(searchels):
+                            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 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")
+                                    else:
+                                        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
+                                        if isinstance(replace, etree._Element):
+                                            # 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
+                                            # 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
+                                            for r in replace:
+                                                p.getparent().insert(insindex, r)
+                                                insindex += 1
+                                        else:
+                                            # Replacing with pure text
+                                            searchels[i].text = re.sub(search,replace,txtsearch)
+                                        replaced = True
+                                        log.debug("Replacing in element #: %s", i)
+                                    else:
+                                        # Clears the other text elements
+                                        searchels[i].text = ''
+    return newdocument
+
+def getdocumenttext(document):
+    '''Return the raw text of a document, as a list of paragraphs.'''
+    paratextlist=[]
+    # Compile a list of all paragraph (p) elements
+    paralist = []
+    for element in document.iter():
+        # 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.
+    for para in paralist:
+        paratext=u''
+        # Loop through each paragraph
+        for element in para.iter():
+            # Find t (text) elements
+            if element.tag == '{'+nsprefixes['w']+'}t':
+                if element.text:
+                    paratext = paratext+element.text
+            elif element.tag == '{'+nsprefixes['w']+'}tab':
+                paratext = paratext + '\t'
+        # Add our completed paragraph text to the list of paragraph text
+        if not len(paratext) == 0:
+            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.'''
+    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'))
+    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']:
+        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')
+    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',
+            }
+    for prop in props:
+        appprops.append(makeelement(prop,tagtext=props[prop],nsprefix=None))
+    return appprops
+
+
+def websettings():
+    '''Generate websettings'''
+    web = makeelement('webSettings')
+    web.append(makeelement('allowPNG'))
+    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'],
+    ]
+    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>'''
+    )
+    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))
+        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
+    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'}
+    for tree in treesandfiles:
+        log.info('Saving: '+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
+    for dirpath,dirnames,filenames in os.walk('.'):
+        for filename in filenames:
+            if filename in files_to_ignore:
+                continue
+            templatefile = join(dirpath,filename)
+            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
+    return
+
+

From 2c58132698f2019dfb66f3bddba91ac30b790dcc Mon Sep 17 00:00:00 2001
From: Derek Hsu <derekhybrid@gmail.com>
Date: Sat, 28 Jul 2012 16:12:09 +0800
Subject: [PATCH 03/16] modified paragraph, search and replace, relationship,
 etc.

Add multi-line text support to paragraph. Different lines are splited
into different <w:r>s.
Modified paragraph to support more complicated style like color and font
size.
Improved advSearch and advReplace algorithem.
Support extracting relation and contenttype form .docx file.
Add findElementByText function.
Mistakely set the line ending to Windows in the last commit... :P
---
 docx.py | 372 ++++++++++++++++++++++++++++++++++++--------------------
 1 file changed, 240 insertions(+), 132 deletions(-)

diff --git a/docx.py b/docx.py
index 0f41b09..c8698c8 100755
--- a/docx.py
+++ b/docx.py
@@ -147,24 +147,29 @@ def paragraph(paratext,style='BodyText',breakbefore=False,jc='left'):
 
     example
     paratext = [
-        ('some bold text', 'b'),
-        ('some normal text', ''),
-        ('some italic underlined text', 'iu'),
+        ('some bold text', {'style': 'b'}),
+        ('some normal text', {'style': ''}),
+        ('some italic underlined text', {'style': 'iu'}),
+        ('some bold text with color and font size', {'style': 'b', 
+                                                     'color': 'C00000', 
+                                                     'sz': '32'})
     ]
 
     '''
     # 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 = []
+    for pt in paratext:
+        if not isinstance(pt, (list,tuple)):
+            pt = (pt, {})
+        lines = pt[0].split('\n')
+        for l in lines[:-1]:
+            text.append((makeelement('t',tagtext=l), pt[1], True))  # with line break
+        text.append((makeelement('t',tagtext=lines[-1]), pt[1], False))  # the last line, without line break        
+
     pPr = makeelement('pPr')
     pStyle = makeelement('pStyle',attributes={'val':style})
     pJc = makeelement('jc',attributes={'val':jc})
@@ -177,15 +182,20 @@ def paragraph(paratext,style='BodyText',breakbefore=False,jc='left'):
         run = makeelement('r')
         rPr = makeelement('rPr')
         # Apply styles
-        if t[1].find('b') > -1:
-            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:
-            i = makeelement('i')
-            rPr.append(i)
+        if t[1].has_key('style'):
+            if t[1]['style'].find('b') > -1:
+                b = makeelement('b')
+                rPr.append(b)
+            if t[1]['style'].find('u') > -1:
+                u = makeelement('u',attributes={'val':'single'})
+                rPr.append(u)
+            if t[1]['style'].find('i') > -1:
+                i = makeelement('i')
+                rPr.append(i)
+        for pr_key in t[1]:
+            if not pr_key == 'style':
+                pr = makeelement(pr_key,attributes={'val': t[1][pr_key]})
+                rPr.append(pr)
         run.append(rPr)
         # Insert lastRenderedPageBreak for assistive technologies like
         # document narrators to know when a page break occurred.
@@ -193,11 +203,15 @@ def paragraph(paratext,style='BodyText',breakbefore=False,jc='left'):
             lastRenderedPageBreak = makeelement('lastRenderedPageBreak')
             run.append(lastRenderedPageBreak)
         run.append(t[0])
+        # Insert line break if there is multiple lines
+        if t[2]:
+            br = makeelement('br')
+            run.append(br)
         paragraph.append(run)
     # Return the combined paragraph
     return paragraph
 
-def contenttypes():
+def getDefaultContentTypes():
     # 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>''')
@@ -220,6 +234,16 @@ def contenttypes():
         types.append(makeelement('Default',nsprefix=None,attributes={'Extension':extension,'ContentType':filetypes[extension]}))
     return types
 
+def getContentTypes(file):
+    '''Get Content Types file from a given Word document'''
+    if os.path.isfile(file):
+        mydoc = zipfile.ZipFile(file)
+        xmlcontent = mydoc.read('[Content_Types].xml')
+        types = etree.fromstring(xmlcontent)
+        return types
+    else:
+        return getDefaultContentTypes()
+
 def heading(headingtext,headinglevel,lang='en'):
     '''Make a new heading, return the heading element'''
     lmap = {
@@ -391,9 +415,8 @@ def picture(relationshiplist, picname, picdescription, pixelwidth=None,
     # 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])
+    relationshiplist.append(makeelement('Relationship',attributes={'Id':'rId'+picrelid,
+        'Type': 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/image','Target': 'media/'+picname},nsprefix=None))
 
     # There are 3 main elements inside a picture
     # 1. The Blipfill - specifies how the image fills the picture area (stretch, tile, etc.)
@@ -474,6 +497,18 @@ def search(document,search):
                     result = True
     return result
 
+def findElementByText(document,search):
+    '''Search a document for a regex, return the first matching text element'''
+    res_element = None
+    searchre = re.compile(search)
+    for element in document.iter():
+        if element.tag == '{%s}t' % nsprefixes['w']: # t (text) elements
+            if element.text:
+                if searchre.search(element.text):
+                    res_element = element
+                    return res_element
+    return res_element
+
 def replace(document,search,replace):
     '''Replace all occurences of string with a different string, return updated document'''
     newdocument = document
@@ -522,7 +557,7 @@ def findTypeParent(element, tag):
     # Not found
     return None
 
-def AdvSearch(document, search, bs=3):
+def advSearch(document, search, bs=3):
     '''Return set of all regex matches
 
     This is an advanced version of python-docx.search() that takes into
@@ -572,34 +607,99 @@ def AdvSearch(document, search, bs=3):
                     # 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):
-                    if found:
-                        break
-                    for s in range(len(searchels)):
-                        if found:
-                            break
-                        if s+l <= len(searchels):
-                            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
-
+                txtsearch = ''
+                for el in searchels:
+                    txtsearch += el.text
+
+                # Searcs for the text in the whole txtsearch
+                match = searchre.search(txtsearch)
+                if match:
+                    # I've found something :)
+                    # The end of match must be in the last element
+                    # |----|---s|omet|hing|!---|
+                    # Now we need to find the element containing the start of the match
+                    # Search all combinations, of searchels, starting from
+                    # smaller up to bigger ones
+                    # s = search start
+                    # e = element IDs to merge
+                    els_len = len(searchels)
+                    for s in reversed(range(els_len)):
+                        txtsearch = ''
+                        e = range(s,els_len)
+                        for k in e:
+                            txtsearch += searchels[k].text
+                        match = searchre.search(txtsearch)
+                        if match:
+                            found = True
+                            matches.append(match.group())
+                    # Now we have found the start and ending element of the match
+                    # |  0 |  1 |  2 |  3 |  4 |
+                    # |----|---s|omet|hing|!---|
+                    # e = [1,2,3,4]
     return set(matches)
 
 
+def advFindElementByText(document, search, bs=3):
+    '''
+    This is an advanced version of python-docx.findElementByText() that takes into
+    account blocks of <bs> elements at a time.
+
+    @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 list      The element set contains the search when combined
+    '''
+
+    # 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 document.iter():
+        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)
+
+                found = False
+                txtsearch = ''
+                for el in searchels:
+                    txtsearch += el.text
+
+                # Searcs for the text in the whole txtsearch
+                match = searchre.search(txtsearch)
+                if match:
+                    # I've found something :)
+                    # The end of match must be in the last element
+                    # |----|---s|omet|hing|!---|
+                    # Now we need to find the element containing the start of the match
+                    # Search all combinations, of searchels, starting from
+                    # smaller up to bigger ones
+                    # s = search start
+                    # e = element IDs to merge
+                    els_len = len(searchels)
+                    for s in reversed(range(els_len)):
+                        txtsearch = ''
+                        e = range(s,els_len)
+                        for k in e:
+                            txtsearch += searchels[k].text
+                        match = searchre.search(txtsearch)
+                        if match:
+                            found = True
+                            return searchels[s:]
+                    # Now we have found the start and ending element of the match
+                    # |  0 |  1 |  2 |  3 |  4 |
+                    # |----|---s|omet|hing|!---|
+                    # e = [1,2,3,4]
+    return None
 
 
 def advReplace(document,search,replace,bs=3):
@@ -661,76 +761,80 @@ def advReplace(document,search,replace,bs=3):
                     # 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):
-                    if found:
-                        break
-                    #print "slen:", l
-                    for s in range(len(searchels)):
-                        if found:
+                txtsearch = ''
+                for el in searchels:
+                    txtsearch += el.text
+
+                # Searcs for the text in the whole txtsearch
+                match = searchre.search(txtsearch)
+                if match:
+                    # I've found something :)
+                    # The end of match must be in the last element
+                    # |----|---s|omet|hing|!---|
+                    # Now we need to find the element containing the start of the match
+                    # Search all combinations, of searchels, starting from
+                    # smaller up to bigger ones
+                    # s = search start
+                    # e = element IDs to merge
+                    els_len = len(searchels)
+                    for s in reversed(range(els_len)):
+                        txtsearch = ''
+                        e = range(s,els_len)
+                        for k in e:
+                            txtsearch += searchels[k].text
+                        match = searchre.search(txtsearch)
+                        if match:
+                            found = True
                             break
-                        if s+l <= len(searchels):
-                            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 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")
-                                    else:
-                                        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
-                                        if isinstance(replace, etree._Element):
-                                            # 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
-                                            # 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
-                                            for r in replace:
-                                                p.getparent().insert(insindex, r)
-                                                insindex += 1
-                                        else:
-                                            # Replacing with pure text
-                                            searchels[i].text = re.sub(search,replace,txtsearch)
-                                        replaced = True
-                                        log.debug("Replacing in element #: %s", i)
-                                    else:
-                                        # Clears the other text elements
-                                        searchels[i].text = ''
+                    # Now we have found the start and ending element of the match
+                    # |  0 |  1 |  2 |  3 |  4 |
+                    # |----|---s|omet|hing|!---|
+                    # e = [1,2,3,4]
+                    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 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")
+                        else:
+                            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
+                            if isinstance(replace, etree._Element):
+                                # 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
+                                # 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
+                                for r in replace:
+                                    p.getparent().insert(insindex, r)
+                                    insindex += 1
+                            else:
+                                # Replacing with pure text
+                                searchels[i].text = re.sub(search,replace,txtsearch)
+                            replaced = True
+                            log.debug("Replacing in element #: %s", i)
+                        else:
+                            # Clears the other text elements
+                            searchels[i].text = ''
     return newdocument
 
 def getdocumenttext(document):
@@ -810,7 +914,6 @@ def appproperties():
         appprops.append(makeelement(prop,tagtext=props[prop],nsprefix=None))
     return appprops
 
-
 def websettings():
     '''Generate websettings'''
     web = makeelement('webSettings')
@@ -818,22 +921,17 @@ def websettings():
     web.append(makeelement('doNotSaveAsSingleFile'))
     return web
 
-def relationshiplist():
+def getDefaultRelationships():
+    '''Generate a default Word relationships file'''
+    # Default list of relationships
     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.openxmlformats.org/package/2006/relationships">
         </Relationships>'''
@@ -846,6 +944,16 @@ def wordrelationships(relationshiplist):
         count += 1
     return relationships
 
+def getRelationships(file):
+    '''Get a Word relationships file from a given Word document'''
+    if os.path.isfile(file):
+        mydoc = zipfile.ZipFile(file)
+        xmlcontent = mydoc.read('word/_rels/document.xml.rels')
+        relationships = etree.fromstring(xmlcontent)
+        return relationships
+    else:
+        return getDefaultRelationships()
+
 def savedocx(document,coreprops,appprops,contenttypes,websettings,wordrelationships,output):
     '''Save a modified document'''
     assert os.path.isdir(template_dir)

From dc159fe3b6a270b1b3d59fc6b4434fd6fddcd84b Mon Sep 17 00:00:00 2001
From: Derek Hsu <derekhybrid@gmail.com>
Date: Sat, 28 Jul 2012 21:11:19 +0800
Subject: [PATCH 04/16] Add multi-line support to advReplace

Limit advReplace to accept string because previous code has bug when
replacing etree elements.
Different line are split into different <w:r>s.
---
 docx.py | 122 ++++++++++++++++++++++++++++++++++++++++++--------------
 1 file changed, 92 insertions(+), 30 deletions(-)

diff --git a/docx.py b/docx.py
index c8698c8..6d1b717 100755
--- a/docx.py
+++ b/docx.py
@@ -19,6 +19,7 @@
 import time
 import os
 from os.path import join
+import copy
 
 log = logging.getLogger(__name__)
 
@@ -706,8 +707,8 @@ 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.
+    account blocks of <bs> elements at a time. The replace element can only
+    be a string currently. (There is some bug with element replacing)
 
     What it does:
     It searches the entire document body for text blocks.
@@ -806,35 +807,96 @@ def advReplace(document,search,replace,bs=3):
                         else:
                             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
-                            if isinstance(replace, etree._Element):
-                                # 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
-                                # 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
-                                for r in replace:
-                                    p.getparent().insert(insindex, r)
-                                    insindex += 1
-                            else:
-                                # Replacing with pure text
-                                searchels[i].text = re.sub(search,replace,txtsearch)
-                            replaced = True
-                            log.debug("Replacing in element #: %s", i)
-                        else:
-                            # Clears the other text elements
+                    try:
+                        # for text, we want to replace at <w:r> level
+                        # because there will be new lines
+                        # <w:p>
+                        #     <w:pPr></w:pPr>
+                        #     <w:r>
+                        #         <w:rPr></w:rPr>
+                        #         <w:t>[PREFIX]</w:t>
+                        #     </w:r>
+                        #     <w:r>
+                        #         <w:rPr></w:rPr>
+                        #         <w:t>[REPLACE_LINE_1]</w:t>
+                        #         <w:br/>
+                        #     </w:r>
+                        #     <w:r>
+                        #         <w:rPr></w:rPr>
+                        #         <w:t>[REPLACE_LINE_2]</w:t>
+                        #     </w:r>
+                        #     <w:r>
+                        #         <w:rPr></w:rPr>
+                        #         <w:t>[SUFIX]</w:t>
+                        #     </w:r>
+                        # </w:p>
+                        txt_prefix = txtsearch[:match.start()]
+                        txt_sufix = txtsearch[match.end():]
+                        if not isinstance(replace, (list, tuple)):
+                            replace = [replace]
+                        # get the first matching <w:r> element and copy it
+                        # because we want to keep its property <w:rPr> for the replaced content
+                        org_first_r = findTypeParent(searchels[e[0]], '{%s}r' % nsprefixes['w'])
+                        first_r = copy.deepcopy(org_first_r)
+                        # and remove <w:br> if there is any
+                        # because these <w:br>s will be added accordingly later
+                        el_to_delete = first_r.find('{%s}br' % nsprefixes['w'])
+                        if not el_to_delete == None:
+                            first_r.remove(el_to_delete)
+                        template_r = copy.deepcopy(first_r)
+                        # empty the text
+                        el_to_delete = template_r.find('{%s}t' % nsprefixes['w'])
+                        if not el_to_delete == None:
+                            template_r.remove(el_to_delete)
+                        p =  org_first_r.getparent()
+                        insindex = p.index(org_first_r)
+
+                        # insert the prefix
+                        p.insert(insindex, first_r)
+                        insindex += 1
+                        first_r.find('{%s}t' % nsprefixes['w']).text = txt_prefix
+                        # insert the runs to replace
+                        for r in replace:
+                            if isinstance(r, etree._Element):
+                                # TODO: there was some bug in element replacement
+                                # delete the function currently
+                                # but replacing some text with some picture is really useful
+                                # will add element replacing later
+                                continue
+                            lines = r.split('\n')
+                            for line in lines[:-1]:
+                                new_r = copy.deepcopy(template_r)
+                                new_r.append(makeelement('t',tagtext=line))
+                                new_r.append(makeelement('br'))
+                                p.insert(insindex, new_r)
+                                insindex += 1
+                            # the last line of the segment
+                            new_r = copy.deepcopy(template_r)
+                            new_r.append(makeelement('t',tagtext=lines[-1]))
+                            p.insert(insindex, new_r)
+                            insindex += 1
+                        # copy the last matching <w:r> element
+                        # because it may be the same as the first <w:r> element
+                        last_r = copy.deepcopy(findTypeParent(searchels[e[-1]], '{%s}r' % nsprefixes['w']))
+                        p.insert(insindex, last_r)
+                        insindex += 1
+                        last_r.find('{%s}t' % nsprefixes['w']).text = txt_sufix
+
+                        # there may be 1 matching element, or multiple elements combined
+                        # anyway, remove them all since we have safely copied the prefix
+                        # and sufix and inserted replace in between
+                        for i in e:
+                            # maybe the element cannot be removed
+                            # so, anyway, empty them first in case I cannot remove them
                             searchels[i].text = ''
+                            try:
+                                p.remove(findTypeParent(searchels[i], '{%s}r' % nsprefixes['w']))
+                            except Exception, e:
+                                log.exception(e)
+
+                        return newdocument
+                    except Extension, e:
+                        log.exception(e)
     return newdocument
 
 def getdocumenttext(document):

From b7147b0497a7ba066fce2f8e41a42423b77d0da3 Mon Sep 17 00:00:00 2001
From: highcat <highcatland@gmail.com>
Date: Mon, 30 Jul 2012 20:01:59 +0400
Subject: [PATCH 05/16] some table customization for my own purposes (row
 height and vAlign)

---
 docx.py | 24 +++++++++++++++++++-----
 1 file changed, 19 insertions(+), 5 deletions(-)

diff --git a/docx.py b/docx.py
index 0f41b09..13f957a 100755
--- a/docx.py
+++ b/docx.py
@@ -240,7 +240,7 @@ 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):
+def table(contents, heading=True, colw=None, cwunit='dxa', tblw=0, twunit='auto', borders={}, celstyle=None, rowstyle=None):
     '''Get a list of lists, return a table
 
         @param list contents: A list of lists describing contents
@@ -335,6 +335,13 @@ def table(contents, heading=True, colw=None, cwunit='dxa', tblw=0, twunit='auto'
     # Contents Rows
     for contentrow in contents[1 if heading else 0:]:
         row = makeelement('tr')
+        if rowstyle:
+            rowprops = makeelement('trPr')
+            if 'height' in rowstyle:
+                rowHeight = makeelement('trHeight', attributes={'val': str(rowstyle['height']),
+                                                                'hRule': 'exact'})
+            rowprops.append(rowHeight)
+            row.append(rowprops)
         i = 0
         for content in contentrow:
             cell = makeelement('tc')
@@ -354,10 +361,17 @@ def table(contents, heading=True, colw=None, cwunit='dxa', tblw=0, twunit='auto'
                 if isinstance(c, etree._Element):
                     cell.append(c)
                 else:
-                    if celstyle and 'align' in celstyle[i].keys():
-                        align = celstyle[i]['align']
-                    else:
-                        align = 'left'
+                    align = 'left'
+                    vAlign = 'bottom'
+                    if celstyle:
+                        if 'align' in celstyle[i].keys():
+                            align = celstyle[i]['align']
+                        if 'vAlign' in celstyle[i].keys():
+                            vAlign = celstyle[i]['vAlign']
+                    cellprops = makeelement('tcPr')
+                    cellVAlign = makeelement('vAlign', attributes={'val': vAlign})
+                    cellprops.append(cellVAlign)
+                    cell.append(cellprops)
                     cell.append(paragraph(c,jc=align))
             row.append(cell)
             i += 1

From 6654bf0257ef51876f4bb90125bf9e24ef90f09f Mon Sep 17 00:00:00 2001
From: highcat <highcatland@gmail.com>
Date: Mon, 30 Jul 2012 20:03:45 +0400
Subject: [PATCH 06/16] example file: some fixes and one more table sample

---
 example-makedocument.py | 103 ++++++++++++++++++++++++++--------------
 1 file changed, 68 insertions(+), 35 deletions(-)

diff --git a/example-makedocument.py b/example-makedocument.py
index bb8e946..e7bc51f 100755
--- a/example-makedocument.py
+++ b/example-makedocument.py
@@ -7,73 +7,106 @@
 Part of Python's docx module - http://github.com/mikemaccana/python-docx
 See LICENSE for licensing information.
 '''
-from docx import *
+import docx as dx
 
 if __name__ == '__main__':        
     # Default set of relationshipships - these are the minimum components of a document
-    relationships = relationshiplist()
+    relationships = dx.relationshiplist()
 
     # Make a new document tree - this is the main part of a Word document
-    document = newdocument()
+    document = dx.newdocument()
     
     # This xpath location is where most interesting content lives 
-    docbody = document.xpath('/w:document/w:body', namespaces=nsprefixes)[0]
-    
+    docbody = document.xpath('/w:document/w:body', namespaces=dx.nsprefixes)[0]
+
+    # Append a table
+    CELL_SIZE = 12*80 # twenties of a point
+    docbody.append(dx.table([['A1','A2','A3'],
+                             ['B1','B2','B3'],
+                             ['C1','C2','C3']],
+        heading=False,                            
+        colw=[CELL_SIZE]*3,
+        cwunit='dxa', # twenties of a point
+        borders={'all': {'color': 0xAAAAAA}},
+        celstyle=[{'align': 'center', 'vAlign': 'center'}]*3,
+        rowstyle={'height': CELL_SIZE},
+    ))
+
     # 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:'))
+    docbody.append(dx.heading('''Welcome to Python's docx module''',1)  )   
+    docbody.append(dx.heading('Make and edit docx in 200 lines of pure Python',2))
+    docbody.append(dx.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(dx.paragraph(point,style='ListNumber'))
+    docbody.append(dx.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:'''))
+    docbody.append(dx.heading('Making documents',2))
+    docbody.append(dx.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'))
+        docbody.append(dx.paragraph(point,style='ListBullet'))
 
-    docbody.append(paragraph('Tables are just lists of lists, like this:'))
+    docbody.append(dx.paragraph('Tables are just lists of lists, like this:'))
     # Append a table
-    docbody.append(table([['A1','A2','A3'],['B1','B2','B3'],['C1','C2','C3']]))
+    docbody.append(dx.table([['A1','A2','A3'],['B1','B2','B3'],['C1','C2','C3']]))
 
-    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'))
+    docbody.append(dx.heading('Editing documents',2))
+    docbody.append(dx.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(dx.paragraph(point, style='ListBullet'))
         
     # Add an image
-    relationships,picpara = picture(relationships,'image1.png','This is a test description')
+    relationships, picpara = dx.picture(
+        relationships,
+        'image1.png',
+        'This is a test description')
     docbody.append(picpara)
  
     # Search and replace
     print 'Searching for something in a paragraph ...',
-    if search(docbody, 'the awesomeness'): print 'found it!'
-    else: print 'nope.'
-    
+    if dx.search(docbody, '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 dx.search(docbody, '200 lines'):
+         print 'found it!'
+    else:
+         print 'nope.'
     
     print 'Replacing ...',
-    docbody = replace(docbody,'the awesomeness','the goshdarned awesomeness') 
+    docbody = dx.replace(docbody,'the awesomeness','the goshdarned awesomeness') 
     print 'done.'
 
     # Add a pagebreak
-    docbody.append(pagebreak(type='page', orient='portrait'))
+    docbody.append(dx.pagebreak(type='page', orient='portrait'))
 
-    docbody.append(heading('Ideas? Questions? Want to contribute?',2))
-    docbody.append(paragraph('''Email <python.docx@librelist.com>'''))
+    docbody.append(dx.heading('Ideas? Questions? Want to contribute?',2))
+    docbody.append(dx.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'])
-    appprops = appproperties()
-    contenttypes = contenttypes()
-    websettings = websettings()
-    wordrelationships = wordrelationships(relationships)
+    coreprops = dx.coreproperties(
+        title='Python docx demo',
+        subject='A practical example of making docx from Python',
+        creator='Mike MacCana',
+        keywords=['python','Office Open XML','Word'])
+    appprops = dx.appproperties()
+    my_contenttypes = dx.contenttypes()
+    my_websettings = dx.websettings()
+    my_wordrelationships = dx.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
+    dx.savedocx(
+        document,
+        coreprops,
+        appprops,
+        my_contenttypes,
+        my_websettings,
+        my_wordrelationships,
+        'example.docx')

From 1cee8103620c2af76f79b6ac0692517d91c6531b Mon Sep 17 00:00:00 2001
From: highcat <highcatland@gmail.com>
Date: Mon, 30 Jul 2012 23:18:13 +0400
Subject: [PATCH 07/16] possibility to add special properties to paragraph
 chunks; fixed cell properties when adding element as cell

---
 docx.py                 | 56 ++++++++++++++++++++++++-----------------
 example-makedocument.py | 40 ++++++++++++++++++-----------
 2 files changed, 58 insertions(+), 38 deletions(-)

diff --git a/docx.py b/docx.py
index 13f957a..752b14d 100755
--- a/docx.py
+++ b/docx.py
@@ -132,7 +132,7 @@ def pagebreak(type='page', orient='portrait'):
         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.
 
@@ -176,22 +176,28 @@ def paragraph(paratext,style='BodyText',breakbefore=False,jc='left'):
     for t in text:
         run = makeelement('r')
         rPr = makeelement('rPr')
-        # Apply styles
-        if t[1].find('b') > -1:
-            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:
-            i = makeelement('i')
-            rPr.append(i)
+        if isinstance(t[1], list):
+            for prop in t[1]: # custom properties
+                rPr.append(prop)
+        else:
+            # Apply styles
+            if t[1].find('b') > -1:
+                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:
+                i = makeelement('i')
+                rPr.append(i)
+            
         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)
+        print '****', t[0]
         run.append(t[0])
         paragraph.append(run)
     # Return the combined paragraph
@@ -240,7 +246,7 @@ 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, rowstyle=None):
+def table(contents, heading=True, colw=None, cwunit='dxa', tblw=0, twunit='auto', borders={}, celstyle=None, rowstyle=None, tableAlign=None):
     '''Get a list of lists, return a table
 
         @param list contents: A list of lists describing contents
@@ -279,6 +285,10 @@ def table(contents, heading=True, colw=None, cwunit='dxa', tblw=0, twunit='auto'
     tableprops = makeelement('tblPr')
     tablestyle = makeelement('tblStyle',attributes={'val':''})
     tableprops.append(tablestyle)
+    if not tableAlign:
+        tableAlign = 'left'
+    tableAlign = makeelement('jc',attributes={'val': tableAlign})
+    tableprops.append(tableAlign)
     tablewidth = makeelement('tblW',attributes={'w':str(tblw),'type':str(twunit)})
     tableprops.append(tablewidth)
     if len(borders.keys()):
@@ -358,20 +368,20 @@ def table(contents, heading=True, colw=None, cwunit='dxa', tblw=0, twunit='auto'
             if not isinstance(content, (list, tuple)):
                 content = [content,]
             for c in content:
+                align = 'left'
+                vAlign = 'bottom'
+                if celstyle:
+                    if 'align' in celstyle[i].keys():
+                        align = celstyle[i]['align']
+                    if 'vAlign' in celstyle[i].keys():
+                        vAlign = celstyle[i]['vAlign']
+                cellprops = makeelement('tcPr')
+                cellVAlign = makeelement('vAlign', attributes={'val': vAlign})
+                cellprops.append(cellVAlign)
+                cell.append(cellprops)
                 if isinstance(c, etree._Element):
                     cell.append(c)
                 else:
-                    align = 'left'
-                    vAlign = 'bottom'
-                    if celstyle:
-                        if 'align' in celstyle[i].keys():
-                            align = celstyle[i]['align']
-                        if 'vAlign' in celstyle[i].keys():
-                            vAlign = celstyle[i]['vAlign']
-                    cellprops = makeelement('tcPr')
-                    cellVAlign = makeelement('vAlign', attributes={'val': vAlign})
-                    cellprops.append(cellVAlign)
-                    cell.append(cellprops)
                     cell.append(paragraph(c,jc=align))
             row.append(cell)
             i += 1
diff --git a/example-makedocument.py b/example-makedocument.py
index e7bc51f..5093f40 100755
--- a/example-makedocument.py
+++ b/example-makedocument.py
@@ -19,19 +19,6 @@
     # This xpath location is where most interesting content lives 
     docbody = document.xpath('/w:document/w:body', namespaces=dx.nsprefixes)[0]
 
-    # Append a table
-    CELL_SIZE = 12*80 # twenties of a point
-    docbody.append(dx.table([['A1','A2','A3'],
-                             ['B1','B2','B3'],
-                             ['C1','C2','C3']],
-        heading=False,                            
-        colw=[CELL_SIZE]*3,
-        cwunit='dxa', # twenties of a point
-        borders={'all': {'color': 0xAAAAAA}},
-        celstyle=[{'align': 'center', 'vAlign': 'center'}]*3,
-        rowstyle={'height': CELL_SIZE},
-    ))
-
     # Append two headings and a paragraph
     docbody.append(dx.heading('''Welcome to Python's docx module''',1)  )   
     docbody.append(dx.heading('Make and edit docx in 200 lines of pure Python',2))
@@ -59,14 +46,37 @@
                   'Extract plain text of document',
                   'Add and delete items anywhere within the document']:
         docbody.append(dx.paragraph(point, style='ListBullet'))
-        
+
     # Add an image
     relationships, picpara = dx.picture(
         relationships,
         'image1.png',
         'This is a test description')
     docbody.append(picpara)
- 
+
+    spec_cell = dx.paragraph([
+        ('2', [dx.makeelement('vertAlign', attributes={'val': 'superscript'})]),
+        ])
+    
+    # Append a table
+    CELL_SIZE = 12*50 # twenties of a point
+    docbody.append(dx.table([['A1',spec_cell,'A3'],
+                             ['B1','B2','B3'],
+                             ['C1','C2','C3']],
+        heading=False,                            
+        colw=[CELL_SIZE]*3,
+        cwunit='dxa', # twenties of a point
+        borders={'all': {'color': 0xAAAAAA}},
+        celstyle=[{'align': 'center', 'vAlign': 'center'}]*3,
+        rowstyle={'height': CELL_SIZE},
+        tableAlign='center',
+    ))
+    
+    docbody.append(dx.paragraph([
+        ('hello', ''),
+        ('2', [dx.makeelement('vertAlign', attributes={'val': 'superscript'})]),
+        ]))
+    
     # Search and replace
     print 'Searching for something in a paragraph ...',
     if dx.search(docbody, 'the awesomeness'):

From 6ff63aad083e9302c1ede741bab93ef9c4649322 Mon Sep 17 00:00:00 2001
From: highcat <highcatland@gmail.com>
Date: Mon, 30 Jul 2012 23:22:14 +0400
Subject: [PATCH 08/16] remove print

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

diff --git a/docx.py b/docx.py
index 752b14d..a0726ca 100755
--- a/docx.py
+++ b/docx.py
@@ -197,7 +197,6 @@ def paragraph(paratext, style='BodyText', breakbefore=False, jc='left'):
         if breakbefore:
             lastRenderedPageBreak = makeelement('lastRenderedPageBreak')
             run.append(lastRenderedPageBreak)
-        print '****', t[0]
         run.append(t[0])
         paragraph.append(run)
     # Return the combined paragraph

From c1d012260c18c97fab9b2a664e53579b36d3302d Mon Sep 17 00:00:00 2001
From: highcat <highcatland@gmail.com>
Date: Mon, 30 Jul 2012 23:59:46 +0400
Subject: [PATCH 09/16] table: cell-specific style

---
 docx.py                 | 42 ++++++++++++++++++++++++-----------------
 example-makedocument.py |  7 +++++--
 2 files changed, 30 insertions(+), 19 deletions(-)

diff --git a/docx.py b/docx.py
index a0726ca..1cd741f 100755
--- a/docx.py
+++ b/docx.py
@@ -7,6 +7,7 @@
 See LICENSE for licensing information.
 '''
 
+from copy import deepcopy
 import logging
 from lxml import etree
 try:
@@ -352,7 +353,7 @@ def table(contents, heading=True, colw=None, cwunit='dxa', tblw=0, twunit='auto'
             rowprops.append(rowHeight)
             row.append(rowprops)
         i = 0
-        for content in contentrow:
+        for content_cell in contentrow:
             cell = makeelement('tc')
             # Properties
             cellprops = makeelement('tcPr')
@@ -360,28 +361,35 @@ def table(contents, heading=True, colw=None, cwunit='dxa', tblw=0, twunit='auto'
                 wattr = {'w':str(colw[i]),'type':cwunit}
             else:
                 wattr = {'w':'0','type':'auto'}
-            cellwidth = makeelement('tcW',attributes=wattr)
+            cellwidth = makeelement('tcW', attributes=wattr)
             cellprops.append(cellwidth)
+            align = 'left'
+            cell_spec_style = {}
+            if celstyle:
+                cell_spec_style = deepcopy(celstyle[i])
+            if isinstance(content_cell, dict):
+                cell_spec_style.update(content_cell['style'])                
+                content_cell = content_cell['content']
+            # spec. align property
+            SPEC_PROPS = ['align',]
+            if 'align' in cell_spec_style:
+                align = celstyle[i]['align']
+            # any property for cell, by OOXML specification
+            for cs, attrs in cell_spec_style.iteritems():
+                if cs in SPEC_PROPS:
+                    continue
+                cell_prop = makeelement(cs, attributes=attrs)
+                cellprops.append(cell_prop)
             cell.append(cellprops)
             # Paragraph (Content)
-            if not isinstance(content, (list, tuple)):
-                content = [content,]
-            for c in content:
-                align = 'left'
-                vAlign = 'bottom'
-                if celstyle:
-                    if 'align' in celstyle[i].keys():
-                        align = celstyle[i]['align']
-                    if 'vAlign' in celstyle[i].keys():
-                        vAlign = celstyle[i]['vAlign']
-                cellprops = makeelement('tcPr')
-                cellVAlign = makeelement('vAlign', attributes={'val': vAlign})
-                cellprops.append(cellVAlign)
-                cell.append(cellprops)
+            if not isinstance(content_cell, (list, tuple)):
+                content_cell = [content_cell,]
+            for c in content_cell:
+                # cell.append(cellprops)
                 if isinstance(c, etree._Element):
                     cell.append(c)
                 else:
-                    cell.append(paragraph(c,jc=align))
+                    cell.append(paragraph(c, jc=align))
             row.append(cell)
             i += 1
         table.append(row)
diff --git a/example-makedocument.py b/example-makedocument.py
index 5093f40..f8206db 100755
--- a/example-makedocument.py
+++ b/example-makedocument.py
@@ -60,14 +60,17 @@
     
     # Append a table
     CELL_SIZE = 12*50 # twenties of a point
-    docbody.append(dx.table([['A1',spec_cell,'A3'],
+    docbody.append(dx.table([['A1',
+                              {'content': spec_cell, 'style': {'vAlign': {'val': 'top'},
+                                                               'shd': {'fill': '777777'}}},
+                              ('A3', 'ttt')],
                              ['B1','B2','B3'],
                              ['C1','C2','C3']],
         heading=False,                            
         colw=[CELL_SIZE]*3,
         cwunit='dxa', # twenties of a point
         borders={'all': {'color': 0xAAAAAA}},
-        celstyle=[{'align': 'center', 'vAlign': 'center'}]*3,
+        celstyle=[{'align': 'right', 'vAlign': {'val': 'center'}}]*3,
         rowstyle={'height': CELL_SIZE},
         tableAlign='center',
     ))

From ce2e58ddabc792b111577bfc9470a819914a9e74 Mon Sep 17 00:00:00 2001
From: highcat <highcatland@gmail.com>
Date: Tue, 31 Jul 2012 00:39:06 +0400
Subject: [PATCH 10/16] arbitrary table properties

---
 docx.py                 | 15 +++++++++-----
 example-makedocument.py | 46 ++++++++++++++++++++++-------------------
 2 files changed, 35 insertions(+), 26 deletions(-)

diff --git a/docx.py b/docx.py
index 1cd741f..e1471e7 100755
--- a/docx.py
+++ b/docx.py
@@ -246,7 +246,7 @@ 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, rowstyle=None, tableAlign=None):
+def table(contents, heading=True, colw=None, cwunit='dxa', tblw=0, twunit='auto', borders={}, celstyle=None, rowstyle=None, table_props=None):
     '''Get a list of lists, return a table
 
         @param list contents: A list of lists describing contents
@@ -285,10 +285,15 @@ def table(contents, heading=True, colw=None, cwunit='dxa', tblw=0, twunit='auto'
     tableprops = makeelement('tblPr')
     tablestyle = makeelement('tblStyle',attributes={'val':''})
     tableprops.append(tablestyle)
-    if not tableAlign:
-        tableAlign = 'left'
-    tableAlign = makeelement('jc',attributes={'val': tableAlign})
-    tableprops.append(tableAlign)
+    if not table_props:
+        table_props = {}
+    for k, attr in table_props.iteritems():
+        if isinstance(attr, etree._Element):        
+            tableprops.append(attr)            
+        else:
+            prop = makeelement(k, attributes=attr)
+            tableprops.append(prop)
+            
     tablewidth = makeelement('tblW',attributes={'w':str(tblw),'type':str(twunit)})
     tableprops.append(tablewidth)
     if len(borders.keys()):
diff --git a/example-makedocument.py b/example-makedocument.py
index f8206db..ab39c00 100755
--- a/example-makedocument.py
+++ b/example-makedocument.py
@@ -19,6 +19,31 @@
     # This xpath location is where most interesting content lives 
     docbody = document.xpath('/w:document/w:body', namespaces=dx.nsprefixes)[0]
 
+    # Append a table
+    spec_cell = dx.paragraph([
+        ('2', [dx.makeelement('vertAlign', attributes={'val': 'superscript'})]),
+        ])
+    t_prop_margin = dx.makeelement('tblCellMar')
+    for margin_type in ['top', 'left', 'right', 'bottom']:
+        t_prop_margin.append(dx.makeelement(margin_type, attributes={'w': '0', 'type': 'dxa'}))
+    CELL_SIZE = 12*30 # twenties of a point
+    docbody.append(dx.table([['A1',
+                              {'content': spec_cell, 'style': {'vAlign': {'val': 'top'},
+                                                               'shd': {'fill': '777777'}}},
+                              ('A3', 'ttt')],
+                             ['B1','B2','B3'],
+                             ['C1','C2','C3']],
+        heading=False,                            
+        colw=[CELL_SIZE]*3,
+        cwunit='dxa', # twenties of a point
+        borders={'all': {'color': 0xAAAAAA}},
+        celstyle=[{'align': 'center', 'vAlign': {'val': 'center'}}]*3,
+        rowstyle={'height': CELL_SIZE},
+        table_props={'jc': {'val': 'center'},
+                     '__margin__': t_prop_margin,
+                     },
+    ))
+    
     # Append two headings and a paragraph
     docbody.append(dx.heading('''Welcome to Python's docx module''',1)  )   
     docbody.append(dx.heading('Make and edit docx in 200 lines of pure Python',2))
@@ -54,27 +79,6 @@
         'This is a test description')
     docbody.append(picpara)
 
-    spec_cell = dx.paragraph([
-        ('2', [dx.makeelement('vertAlign', attributes={'val': 'superscript'})]),
-        ])
-    
-    # Append a table
-    CELL_SIZE = 12*50 # twenties of a point
-    docbody.append(dx.table([['A1',
-                              {'content': spec_cell, 'style': {'vAlign': {'val': 'top'},
-                                                               'shd': {'fill': '777777'}}},
-                              ('A3', 'ttt')],
-                             ['B1','B2','B3'],
-                             ['C1','C2','C3']],
-        heading=False,                            
-        colw=[CELL_SIZE]*3,
-        cwunit='dxa', # twenties of a point
-        borders={'all': {'color': 0xAAAAAA}},
-        celstyle=[{'align': 'right', 'vAlign': {'val': 'center'}}]*3,
-        rowstyle={'height': CELL_SIZE},
-        tableAlign='center',
-    ))
-    
     docbody.append(dx.paragraph([
         ('hello', ''),
         ('2', [dx.makeelement('vertAlign', attributes={'val': 'superscript'})]),

From b27e820d18d90f80cca2371e4b88916ad2772fd8 Mon Sep 17 00:00:00 2001
From: highcat <highcatland@gmail.com>
Date: Tue, 31 Jul 2012 20:18:23 +0400
Subject: [PATCH 11/16] gitignore cleanup & update

---
 .gitignore | 237 +----------------------------------------------------
 1 file changed, 4 insertions(+), 233 deletions(-)

diff --git a/.gitignore b/.gitignore
index 352fe3b..d6636f4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,236 +3,7 @@
 *.docx
 *.kpf
 build
-problems
-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
+
+*~
+\#*\#
+.\#*

From 236a864868e5d5972b2f3a521fd654b017d0e4e2 Mon Sep 17 00:00:00 2001
From: highcat <highcatland@gmail.com>
Date: Tue, 31 Jul 2012 20:23:41 +0400
Subject: [PATCH 12/16] don't use common docx directory. Copy the whole
 template to temporary directory specified by user and work on it - so we're
 saved from collisions

---
 docx.py                 | 34 ++++++++++++-------
 example-makedocument.py | 75 ++++++++++++++++++++++++++---------------
 2 files changed, 68 insertions(+), 41 deletions(-)

diff --git a/docx.py b/docx.py
index e1471e7..25fb458 100755
--- a/docx.py
+++ b/docx.py
@@ -16,6 +16,7 @@
     import Image
 import zipfile
 import shutil
+import distutils.dir_util
 import re
 import time
 import os
@@ -25,9 +26,11 @@
 
 # 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
-if not os.path.isdir(template_dir):
-    template_dir = join(os.path.dirname(__file__),'template') # dev
+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
+
+_DOCX_DIR_NAME = 'docx-template'
 
 # All Word prefixes / namespace matches used in document.xml & core.xml.
 # LXML doesn't actually use prefixes (just the real namespace) , but these
@@ -144,7 +147,7 @@ def paragraph(paratext, style='BodyText', breakbefore=False, jc='left'):
 
     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
+    <text> / <style>. Style is a string containing a combination of 'bui' chars
 
     example
     paratext = [
@@ -401,16 +404,18 @@ 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):
+            pixelheight=None, nochangeaspect=True, nochangearrowheads=True,
+            temp_dir=None):
     '''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')
+    assert temp_dir
+    media_dir = join(temp_dir, _DOCX_DIR_NAME, 'word', 'media')
     if not os.path.isdir(media_dir):
-        os.mkdir(media_dir)
+        os.makedirs(media_dir)
     shutil.copyfile(picname, join(media_dir,picname))
 
     # Check if the user has specified a size
@@ -882,14 +887,19 @@ def wordrelationships(relationshiplist):
         count += 1
     return relationships
 
-def savedocx(document,coreprops,appprops,contenttypes,websettings,wordrelationships,output):
+def savedocx(document, coreprops, appprops, contenttypes, websettings, wordrelationships, output,
+             temp_dir=None):
     '''Save a modified document'''
-    assert os.path.isdir(template_dir)
+    assert temp_dir
+    assert os.path.isdir(temp_dir)
+    docx_dir = join(temp_dir, _DOCX_DIR_NAME)
+    # Copy whole template to temporary directory
+    distutils.dir_util.copy_tree(TEMPLATE_DIR, docx_dir) # directory can already exist
     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)
+    os.chdir(docx_dir)
 
     # Serialize our trees into out zip file
     treesandfiles = {document:'word/document.xml',
@@ -909,7 +919,7 @@ def savedocx(document,coreprops,appprops,contenttypes,websettings,wordrelationsh
         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)
@@ -917,5 +927,3 @@ def savedocx(document,coreprops,appprops,contenttypes,websettings,wordrelationsh
     docxfile.close()
     os.chdir(prev_dir) # restore previous working dir
     return
-
-
diff --git a/example-makedocument.py b/example-makedocument.py
index ab39c00..694ce8e 100755
--- a/example-makedocument.py
+++ b/example-makedocument.py
@@ -7,9 +7,14 @@
 Part of Python's docx module - http://github.com/mikemaccana/python-docx
 See LICENSE for licensing information.
 '''
+import shutil
+from copy import deepcopy
+from tempfile import TemporaryFile, mkdtemp
 import docx as dx
 
-if __name__ == '__main__':        
+if __name__ == '__main__':
+    temp_dir = mkdtemp()
+
     # Default set of relationshipships - these are the minimum components of a document
     relationships = dx.relationshiplist()
 
@@ -19,31 +24,6 @@
     # This xpath location is where most interesting content lives 
     docbody = document.xpath('/w:document/w:body', namespaces=dx.nsprefixes)[0]
 
-    # Append a table
-    spec_cell = dx.paragraph([
-        ('2', [dx.makeelement('vertAlign', attributes={'val': 'superscript'})]),
-        ])
-    t_prop_margin = dx.makeelement('tblCellMar')
-    for margin_type in ['top', 'left', 'right', 'bottom']:
-        t_prop_margin.append(dx.makeelement(margin_type, attributes={'w': '0', 'type': 'dxa'}))
-    CELL_SIZE = 12*30 # twenties of a point
-    docbody.append(dx.table([['A1',
-                              {'content': spec_cell, 'style': {'vAlign': {'val': 'top'},
-                                                               'shd': {'fill': '777777'}}},
-                              ('A3', 'ttt')],
-                             ['B1','B2','B3'],
-                             ['C1','C2','C3']],
-        heading=False,                            
-        colw=[CELL_SIZE]*3,
-        cwunit='dxa', # twenties of a point
-        borders={'all': {'color': 0xAAAAAA}},
-        celstyle=[{'align': 'center', 'vAlign': {'val': 'center'}}]*3,
-        rowstyle={'height': CELL_SIZE},
-        table_props={'jc': {'val': 'center'},
-                     '__margin__': t_prop_margin,
-                     },
-    ))
-    
     # Append two headings and a paragraph
     docbody.append(dx.heading('''Welcome to Python's docx module''',1)  )   
     docbody.append(dx.heading('Make and edit docx in 200 lines of pure Python',2))
@@ -76,13 +56,39 @@
     relationships, picpara = dx.picture(
         relationships,
         'image1.png',
-        'This is a test description')
+        'This is a test description',
+        temp_dir = temp_dir)
     docbody.append(picpara)
 
     docbody.append(dx.paragraph([
         ('hello', ''),
         ('2', [dx.makeelement('vertAlign', attributes={'val': 'superscript'})]),
         ]))
+
+    # Append a table with special properties and cells
+    spec_cell = dx.paragraph([
+        ('2', [dx.makeelement('vertAlign', attributes={'val': 'superscript'})]),
+        ])
+    t_prop_margin = dx.makeelement('tblCellMar')
+    for margin_type in ['top', 'left', 'right', 'bottom']:
+        t_prop_margin.append(dx.makeelement(margin_type, attributes={'w': '0', 'type': 'dxa'}))
+    CELL_SIZE = 12*30 # twenties of a point
+    docbody.append(dx.table([['A1',
+                              {'content': spec_cell, 'style': {'vAlign': {'val': 'top'},
+                                                               'shd': {'fill': '777777'}}},
+                              ('A3', 'ttt')],
+                             ['B1','B2','B3'],
+                             ['C1','C2','C3']],
+        heading=False,
+        colw=[CELL_SIZE]*3,
+        cwunit='dxa', # twenties of a point
+        borders={'all': {'color': 'AAAAAA'}},
+        celstyle=[{'align': 'center', 'vAlign': {'val': 'center'}}]*3,
+        rowstyle={'height': CELL_SIZE},
+        table_props={'jc': {'val': 'center'},
+                     '__margin__': t_prop_margin,
+                     },
+    ))
     
     # Search and replace
     print 'Searching for something in a paragraph ...',
@@ -119,6 +125,7 @@
     my_wordrelationships = dx.wordrelationships(relationships)
     
     # Save our document
+    temp_file = TemporaryFile()
     dx.savedocx(
         document,
         coreprops,
@@ -126,4 +133,16 @@
         my_contenttypes,
         my_websettings,
         my_wordrelationships,
-        'example.docx')
+        # can be either file-like object, or file name:
+        output=temp_file,
+        temp_dir=temp_dir,
+        )
+    temp_file.seek(0)
+    print "temp dir is:", temp_dir
+    shutil.rmtree(temp_dir)
+    print "temp dir deleted"
+
+    f = open('example.docx', 'w+b')
+    f.write(temp_file.read())
+    f.close()
+    

From 00244da5fc9770455b3ebd595575db8898e650db Mon Sep 17 00:00:00 2001
From: Derek Hsu <derekhybrid@gmail.com>
Date: Wed, 8 Aug 2012 20:41:39 +0800
Subject: [PATCH 13/16] merge with highcat's fork

merge with highcat's fork and modified the make document example
---
 .gitignore              | 247 ++--------------------------------------
 docx.py                 | 122 ++++++++++++++------
 example-makedocument.py | 119 ++++++++++++-------
 3 files changed, 177 insertions(+), 311 deletions(-)

diff --git a/.gitignore b/.gitignore
index 352fe3b..7795e86 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,238 +1,9 @@
-.coverage
-*.pyc
-*.docx
-*.kpf
-build
-problems
-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
+.coverage
+*.pyc
+*.docx
+*.kpf
+build
+
+*~
+\#*\#
+.\#*
diff --git a/docx.py b/docx.py
index 6d1b717..f17b27d 100755
--- a/docx.py
+++ b/docx.py
@@ -7,6 +7,7 @@
 See LICENSE for licensing information.
 '''
 
+from copy import deepcopy
 import logging
 from lxml import etree
 try:
@@ -15,19 +16,21 @@
     import Image
 import zipfile
 import shutil
+from distutils import dir_util
 import re
 import time
 import os
 from os.path import join
-import copy
 
 log = logging.getLogger(__name__)
 
 # 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
-if not os.path.isdir(template_dir):
-    template_dir = join(os.path.dirname(__file__),'template') # dev
+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
+
+TEMP_TEMPLATE_DIR = join(os.path.dirname(__file__), '.temp_template_dir')
 
 # All Word prefixes / namespace matches used in document.xml & core.xml.
 # LXML doesn't actually use prefixes (just the real namespace) , but these
@@ -69,10 +72,23 @@ def opendocx(file):
     return document
 
 def newdocument():
+    build_temp_template_layout()
+
     document = makeelement('document')
     document.append(makeelement('body'))
     return document
 
+def build_temp_template_layout():
+    clear_temp_template_layout()
+    dir_util.copy_tree(TEMPLATE_DIR, TEMP_TEMPLATE_DIR)
+
+def clear_temp_template_layout():
+    if os.path.exists(TEMP_TEMPLATE_DIR):
+        if os.path.isdir(TEMP_TEMPLATE_DIR):
+            shutil.rmtree(TEMP_TEMPLATE_DIR)
+        else:
+            os.remove(TEMP_TEMPLATE_DIR)
+
 def makeelement(tagname,tagtext=None,nsprefix='w',attributes=None,attrnsprefix=None):
     '''Create an element & return it'''
     # Deal with list of nsprefix by making namespacemap
@@ -133,7 +149,7 @@ def pagebreak(type='page', orient='portrait'):
         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.
 
@@ -144,7 +160,7 @@ def paragraph(paratext,style='BodyText',breakbefore=False,jc='left'):
 
     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
+    <text> / <style>. Style is a string containing a combination of 'bui' chars
 
     example
     paratext = [
@@ -235,9 +251,9 @@ def getDefaultContentTypes():
         types.append(makeelement('Default',nsprefix=None,attributes={'Extension':extension,'ContentType':filetypes[extension]}))
     return types
 
-def getContentTypes(file):
+def getContentTypes(file=None):
     '''Get Content Types file from a given Word document'''
-    if os.path.isfile(file):
+    if file and os.path.isfile(file):
         mydoc = zipfile.ZipFile(file)
         xmlcontent = mydoc.read('[Content_Types].xml')
         types = etree.fromstring(xmlcontent)
@@ -265,7 +281,7 @@ 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):
+def table(contents, heading=True, colw=None, cwunit='dxa', tblw=0, twunit='auto', borders={}, celstyle=None, rowstyle=None, table_props=None):
     '''Get a list of lists, return a table
 
         @param list contents: A list of lists describing contents
@@ -304,6 +320,15 @@ def table(contents, heading=True, colw=None, cwunit='dxa', tblw=0, twunit='auto'
     tableprops = makeelement('tblPr')
     tablestyle = makeelement('tblStyle',attributes={'val':''})
     tableprops.append(tablestyle)
+    if not table_props:
+        table_props = {}
+    for k, attr in table_props.iteritems():
+        if isinstance(attr, etree._Element):        
+            tableprops.append(attr)            
+        else:
+            prop = makeelement(k, attributes=attr)
+            tableprops.append(prop)
+            
     tablewidth = makeelement('tblW',attributes={'w':str(tblw),'type':str(twunit)})
     tableprops.append(tablewidth)
     if len(borders.keys()):
@@ -360,8 +385,15 @@ def table(contents, heading=True, colw=None, cwunit='dxa', tblw=0, twunit='auto'
     # Contents Rows
     for contentrow in contents[1 if heading else 0:]:
         row = makeelement('tr')
+        if rowstyle:
+            rowprops = makeelement('trPr')
+            if 'height' in rowstyle:
+                rowHeight = makeelement('trHeight', attributes={'val': str(rowstyle['height']),
+                                                                'hRule': 'exact'})
+            rowprops.append(rowHeight)
+            row.append(rowprops)
         i = 0
-        for content in contentrow:
+        for content_cell in contentrow:
             cell = makeelement('tc')
             # Properties
             cellprops = makeelement('tcPr')
@@ -369,37 +401,54 @@ def table(contents, heading=True, colw=None, cwunit='dxa', tblw=0, twunit='auto'
                 wattr = {'w':str(colw[i]),'type':cwunit}
             else:
                 wattr = {'w':'0','type':'auto'}
-            cellwidth = makeelement('tcW',attributes=wattr)
+            cellwidth = makeelement('tcW', attributes=wattr)
             cellprops.append(cellwidth)
+            align = 'left'
+            cell_spec_style = {}
+            if celstyle:
+                cell_spec_style = deepcopy(celstyle[i])
+            if isinstance(content_cell, dict):
+                cell_spec_style.update(content_cell['style'])                
+                content_cell = content_cell['content']
+            # spec. align property
+            SPEC_PROPS = ['align',]
+            if 'align' in cell_spec_style:
+                align = celstyle[i]['align']
+            # any property for cell, by OOXML specification
+            for cs, attrs in cell_spec_style.iteritems():
+                if cs in SPEC_PROPS:
+                    continue
+                cell_prop = makeelement(cs, attributes=attrs)
+                cellprops.append(cell_prop)
             cell.append(cellprops)
             # Paragraph (Content)
-            if not isinstance(content, (list, tuple)):
-                content = [content,]
-            for c in content:
+            if not isinstance(content_cell, (list, tuple)):
+                content_cell = [content_cell,]
+            for c in content_cell:
+                # cell.append(cellprops)
                 if isinstance(c, etree._Element):
                     cell.append(c)
                 else:
-                    if celstyle and 'align' in celstyle[i].keys():
-                        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):
+            pixelheight=None, nochangeaspect=True, nochangearrowheads=True,
+            template_dir=None):
     '''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')
+    if not template_dir:
+        template_dir = TEMP_TEMPLATE_DIR
+    media_dir = join(template_dir, 'word', 'media')
     if not os.path.isdir(media_dir):
-        os.mkdir(media_dir)
+        os.makedirs(media_dir)
     shutil.copyfile(picname, join(media_dir,picname))
 
     # Check if the user has specified a size
@@ -416,8 +465,9 @@ def picture(relationshiplist, picname, picdescription, pixelwidth=None,
     # Set relationship ID to the first available
     picid = '2'
     picrelid = 'rId'+str(len(relationshiplist)+1)
-    relationshiplist.append(makeelement('Relationship',attributes={'Id':'rId'+picrelid,
-        'Type': 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/image','Target': 'media/'+picname},nsprefix=None))
+    relationshiplist.append(makeelement('Relationship',attributes={'Id': picrelid,
+        'Type': 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/image',
+        'Target': 'media/'+picname},nsprefix=None))
 
     # There are 3 main elements inside a picture
     # 1. The Blipfill - specifies how the image fills the picture area (stretch, tile, etc.)
@@ -837,13 +887,13 @@ def advReplace(document,search,replace,bs=3):
                         # get the first matching <w:r> element and copy it
                         # because we want to keep its property <w:rPr> for the replaced content
                         org_first_r = findTypeParent(searchels[e[0]], '{%s}r' % nsprefixes['w'])
-                        first_r = copy.deepcopy(org_first_r)
+                        first_r = deepcopy(org_first_r)
                         # and remove <w:br> if there is any
                         # because these <w:br>s will be added accordingly later
                         el_to_delete = first_r.find('{%s}br' % nsprefixes['w'])
                         if not el_to_delete == None:
                             first_r.remove(el_to_delete)
-                        template_r = copy.deepcopy(first_r)
+                        template_r = deepcopy(first_r)
                         # empty the text
                         el_to_delete = template_r.find('{%s}t' % nsprefixes['w'])
                         if not el_to_delete == None:
@@ -865,19 +915,19 @@ def advReplace(document,search,replace,bs=3):
                                 continue
                             lines = r.split('\n')
                             for line in lines[:-1]:
-                                new_r = copy.deepcopy(template_r)
+                                new_r = deepcopy(template_r)
                                 new_r.append(makeelement('t',tagtext=line))
                                 new_r.append(makeelement('br'))
                                 p.insert(insindex, new_r)
                                 insindex += 1
                             # the last line of the segment
-                            new_r = copy.deepcopy(template_r)
+                            new_r = deepcopy(template_r)
                             new_r.append(makeelement('t',tagtext=lines[-1]))
                             p.insert(insindex, new_r)
                             insindex += 1
                         # copy the last matching <w:r> element
                         # because it may be the same as the first <w:r> element
-                        last_r = copy.deepcopy(findTypeParent(searchels[e[-1]], '{%s}r' % nsprefixes['w']))
+                        last_r = deepcopy(findTypeParent(searchels[e[-1]], '{%s}r' % nsprefixes['w']))
                         p.insert(insindex, last_r)
                         insindex += 1
                         last_r.find('{%s}t' % nsprefixes['w']).text = txt_sufix
@@ -1006,9 +1056,9 @@ def getDefaultRelationships():
         count += 1
     return relationships
 
-def getRelationships(file):
+def getRelationships(file=None):
     '''Get a Word relationships file from a given Word document'''
-    if os.path.isfile(file):
+    if file and os.path.isfile(file):
         mydoc = zipfile.ZipFile(file)
         xmlcontent = mydoc.read('word/_rels/document.xml.rels')
         relationships = etree.fromstring(xmlcontent)
@@ -1016,9 +1066,13 @@ def getRelationships(file):
     else:
         return getDefaultRelationships()
 
-def savedocx(document,coreprops,appprops,contenttypes,websettings,wordrelationships,output):
+def savedocx(document, coreprops, appprops, contenttypes, websettings, wordrelationships, output,
+             template_dir=None):
     '''Save a modified document'''
+    if not template_dir:
+        template_dir = TEMP_TEMPLATE_DIR
     assert os.path.isdir(template_dir)
+
     docxfile = zipfile.ZipFile(output,mode='w',compression=zipfile.ZIP_DEFLATED)
 
     # Move to the template data path
@@ -1043,7 +1097,7 @@ def savedocx(document,coreprops,appprops,contenttypes,websettings,wordrelationsh
         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)
@@ -1051,5 +1105,3 @@ def savedocx(document,coreprops,appprops,contenttypes,websettings,wordrelationsh
     docxfile.close()
     os.chdir(prev_dir) # restore previous working dir
     return
-
-
diff --git a/example-makedocument.py b/example-makedocument.py
index bb8e946..31085d6 100755
--- a/example-makedocument.py
+++ b/example-makedocument.py
@@ -7,73 +7,116 @@
 Part of Python's docx module - http://github.com/mikemaccana/python-docx
 See LICENSE for licensing information.
 '''
-from docx import *
+import shutil
+from copy import deepcopy
+from tempfile import TemporaryFile, mkdtemp
+import docx as dx
 
-if __name__ == '__main__':        
+if __name__ == '__main__':
     # Default set of relationshipships - these are the minimum components of a document
-    relationships = relationshiplist()
+    relationships = dx.getRelationships()
 
     # Make a new document tree - this is the main part of a Word document
-    document = newdocument()
+    document = dx.newdocument()
     
     # This xpath location is where most interesting content lives 
-    docbody = document.xpath('/w:document/w:body', namespaces=nsprefixes)[0]
-    
+    docbody = document.xpath('/w:document/w:body', namespaces=dx.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:'))
+    docbody.append(dx.heading('''Welcome to Python's docx module''',1)  )   
+    docbody.append(dx.heading('Make and edit docx in 200 lines of pure Python',2))
+    docbody.append(dx.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(dx.paragraph(point,style='ListNumber'))
+    docbody.append(dx.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:'''))
+    docbody.append(dx.heading('Making documents',2))
+    docbody.append(dx.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'))
+        docbody.append(dx.paragraph(point,style='ListBullet'))
 
-    docbody.append(paragraph('Tables are just lists of lists, like this:'))
+    docbody.append(dx.paragraph('Tables are just lists of lists, like this:'))
     # Append a table
-    docbody.append(table([['A1','A2','A3'],['B1','B2','B3'],['C1','C2','C3']]))
+    docbody.append(dx.table([['A1','A2','A3'],['B1','B2','B3'],['C1','C2','C3']]))
+
+    docbody.append(dx.heading('Editing documents',2))
+    docbody.append(dx.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(dx.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')
+    relationships, picpara = dx.picture(
+        relationships,
+        'image1.png',
+        'This is a test description')
     docbody.append(picpara)
- 
+
+    docbody.append(dx.paragraph([
+        ('hello', {}),
+        ('2', {'vertAlign': 'superscript'}),
+        ]))
+
+    # Append a table with special properties and cells
+    spec_cell = dx.paragraph([('2', {'vertAlign': 'superscript'})])
+    t_prop_margin = dx.makeelement('tblCellMar')
+    for margin_type in ['top', 'left', 'right', 'bottom']:
+        t_prop_margin.append(dx.makeelement(margin_type, attributes={'w': '0', 'type': 'dxa'}))
+    CELL_SIZE = 12*30 # twenties of a point
+    docbody.append(dx.table([['A1',
+                              {'content': spec_cell, 'style': {'vAlign': {'val': 'top'},
+                                                               'shd': {'fill': '777777'}}},
+                              ('A3', 'ttt')],
+                             ['B1','B2','B3'],
+                             ['C1','C2','C3']],
+        heading=False,
+        colw=[CELL_SIZE]*3,
+        cwunit='dxa', # twenties of a point
+        borders={'all': {'color': 'AAAAAA'}},
+        celstyle=[{'align': 'center', 'vAlign': {'val': 'center'}}]*3,
+        rowstyle={'height': CELL_SIZE},
+        table_props={'jc': {'val': 'center'},
+                     '__margin__': t_prop_margin,
+                     },
+    ))
+    
     # Search and replace
     print 'Searching for something in a paragraph ...',
-    if search(docbody, 'the awesomeness'): print 'found it!'
-    else: print 'nope.'
-    
+    if dx.search(docbody, '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 dx.search(docbody, '200 lines'):
+         print 'found it!'
+    else:
+         print 'nope.'
     
     print 'Replacing ...',
-    docbody = replace(docbody,'the awesomeness','the goshdarned awesomeness') 
+    docbody = dx.replace(docbody,'the awesomeness','the goshdarned awesomeness') 
     print 'done.'
 
     # Add a pagebreak
-    docbody.append(pagebreak(type='page', orient='portrait'))
+    docbody.append(dx.pagebreak(type='page', orient='portrait'))
 
-    docbody.append(heading('Ideas? Questions? Want to contribute?',2))
-    docbody.append(paragraph('''Email <python.docx@librelist.com>'''))
+    docbody.append(dx.heading('Ideas? Questions? Want to contribute?',2))
+    docbody.append(dx.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'])
-    appprops = appproperties()
-    contenttypes = contenttypes()
-    websettings = websettings()
-    wordrelationships = wordrelationships(relationships)
+    coreprops = dx.coreproperties(
+        title='Python docx demo',
+        subject='A practical example of making docx from Python',
+        creator='Mike MacCana',
+        keywords=['python','Office Open XML','Word'])
+    appprops = dx.appproperties()
+    my_contenttypes = dx.getContentTypes()
+    my_websettings = dx.websettings()
     
     # Save our document
-    savedocx(document,coreprops,appprops,contenttypes,websettings,wordrelationships,'Welcome to the Python docx module.docx')
\ No newline at end of file
+    dx.savedocx(document,coreprops,appprops,my_contenttypes,my_websettings,relationships,'Welcome to the Python docx module.docx')
\ No newline at end of file

From 8d4a4bd486245808fb859d30aa849ab4d9364825 Mon Sep 17 00:00:00 2001
From: Derek Hsu <derekhybrid@gmail.com>
Date: Wed, 8 Aug 2012 20:48:31 +0800
Subject: [PATCH 14/16] the line ending on win...

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

diff --git a/.gitignore b/.gitignore
index 7795e86..d6636f4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,9 +1,9 @@
-.coverage
-*.pyc
-*.docx
-*.kpf
-build
-
-*~
-\#*\#
-.\#*
+.coverage
+*.pyc
+*.docx
+*.kpf
+build
+
+*~
+\#*\#
+.\#*

From c2c09b66b47efe1922d5dd4f03e52eec0a06ad15 Mon Sep 17 00:00:00 2001
From: Derek Hsu <derekhybrid@gmail.com>
Date: Wed, 8 Aug 2012 21:41:05 +0800
Subject: [PATCH 15/16] Normalize line endings

---
 .gitattributes                 |   22 +
 template/_rels/.rels           |   28 +-
 template/word/fontTable.xml    |  104 ++--
 template/word/numbering.xml    | 1018 ++++++++++++++++----------------
 template/word/styles.xml       |    2 +-
 template/word/theme/theme1.xml |    2 +-
 6 files changed, 599 insertions(+), 577 deletions(-)
 create mode 100644 .gitattributes

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..412eeda
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,22 @@
+# Auto detect text files and perform LF normalization
+* text=auto
+
+# Custom for Visual Studio
+*.cs     diff=csharp
+*.sln    merge=union
+*.csproj merge=union
+*.vbproj merge=union
+*.fsproj merge=union
+*.dbproj merge=union
+
+# Standard to msysgit
+*.doc	 diff=astextplain
+*.DOC	 diff=astextplain
+*.docx diff=astextplain
+*.DOCX diff=astextplain
+*.dot  diff=astextplain
+*.DOT  diff=astextplain
+*.pdf  diff=astextplain
+*.PDF	 diff=astextplain
+*.rtf	 diff=astextplain
+*.RTF	 diff=astextplain
diff --git a/template/_rels/.rels b/template/_rels/.rels
index 124c1c6..c1b0310 100644
--- a/template/_rels/.rels
+++ b/template/_rels/.rels
@@ -1,14 +1,14 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<Relationships xmlns="http://schemas.openxmlformats.org/package/2006/relationships">
-
-	<Relationship Id="rId4" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/extended-properties" Target="docProps/app.xml"/>
-
-	<Relationship Id="rId1" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/officeDocument" Target="word/document.xml"/>
-
-	<Relationship Id="rId2" Type="http://schemas.openxmlformats.org/package/2006/relationships/metadata/thumbnail" Target="docProps/thumbnail.jpeg"/>
-
-	<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>
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<Relationships xmlns="http://schemas.openxmlformats.org/package/2006/relationships">
+
+	<Relationship Id="rId4" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/extended-properties" Target="docProps/app.xml"/>
+
+	<Relationship Id="rId1" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/officeDocument" Target="word/document.xml"/>
+
+	<Relationship Id="rId2" Type="http://schemas.openxmlformats.org/package/2006/relationships/metadata/thumbnail" Target="docProps/thumbnail.jpeg"/>
+
+	<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>
diff --git a/template/word/fontTable.xml b/template/word/fontTable.xml
index e66fe2c..c47d943 100644
--- a/template/word/fontTable.xml
+++ b/template/word/fontTable.xml
@@ -1,52 +1,52 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<w:fonts xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships" xmlns:w="http://schemas.openxmlformats.org/wordprocessingml/2006/main">
-	<w:font w:name="Symbol">
-		<w:panose1 w:val="02000500000000000000"/>
-		<w:charset w:val="02"/>
-		<w:family w:val="auto"/>
-		<w:pitch w:val="variable"/>
-		<w:sig w:usb0="00000000" w:usb1="00000000" w:usb2="00010000" w:usb3="00000000" w:csb0="80000000" w:csb1="00000000"/>
-	</w:font>
-	<w:font w:name="Times New Roman">
-		<w:panose1 w:val="02020603050405020304"/>
-		<w:charset w:val="00"/>
-		<w:family w:val="auto"/>
-		<w:pitch w:val="variable"/>
-		<w:sig w:usb0="00000003" w:usb1="00000000" w:usb2="00000000" w:usb3="00000000" w:csb0="00000001" w:csb1="00000000"/>
-	</w:font>
-	<w:font w:name="Courier New">
-		<w:panose1 w:val="02070309020205020404"/>
-		<w:charset w:val="00"/>
-		<w:family w:val="auto"/>
-		<w:pitch w:val="variable"/>
-		<w:sig w:usb0="00000003" w:usb1="00000000" w:usb2="00000000" w:usb3="00000000" w:csb0="00000001" w:csb1="00000000"/>
-	</w:font>
-	<w:font w:name="Wingdings">
-		<w:panose1 w:val="05020102010804080708"/>
-		<w:charset w:val="02"/>
-		<w:family w:val="auto"/>
-		<w:pitch w:val="variable"/>
-		<w:sig w:usb0="00000000" w:usb1="00000000" w:usb2="00010000" w:usb3="00000000" w:csb0="80000000" w:csb1="00000000"/>
-	</w:font>
-	<w:font w:name="Cambria">
-		<w:panose1 w:val="02040503050406030204"/>
-		<w:charset w:val="00"/>
-		<w:family w:val="auto"/>
-		<w:pitch w:val="variable"/>
-		<w:sig w:usb0="00000003" w:usb1="00000000" w:usb2="00000000" w:usb3="00000000" w:csb0="00000001" w:csb1="00000000"/>
-	</w:font>
-	<w:font w:name="Calibri">
-		<w:panose1 w:val="020F0502020204030204"/>
-		<w:charset w:val="00"/>
-		<w:family w:val="auto"/>
-		<w:pitch w:val="variable"/>
-		<w:sig w:usb0="00000003" w:usb1="00000000" w:usb2="00000000" w:usb3="00000000" w:csb0="00000001" w:csb1="00000000"/>
-	</w:font>
-	<w:font w:name="Arial">
-		<w:panose1 w:val="020B0604020202020204"/>
-		<w:charset w:val="00"/>
-		<w:family w:val="auto"/>
-		<w:pitch w:val="variable"/>
-		<w:sig w:usb0="00000003" w:usb1="00000000" w:usb2="00000000" w:usb3="00000000" w:csb0="00000001" w:csb1="00000000"/>
-	</w:font>
-</w:fonts>
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<w:fonts xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships" xmlns:w="http://schemas.openxmlformats.org/wordprocessingml/2006/main">
+	<w:font w:name="Symbol">
+		<w:panose1 w:val="02000500000000000000"/>
+		<w:charset w:val="02"/>
+		<w:family w:val="auto"/>
+		<w:pitch w:val="variable"/>
+		<w:sig w:usb0="00000000" w:usb1="00000000" w:usb2="00010000" w:usb3="00000000" w:csb0="80000000" w:csb1="00000000"/>
+	</w:font>
+	<w:font w:name="Times New Roman">
+		<w:panose1 w:val="02020603050405020304"/>
+		<w:charset w:val="00"/>
+		<w:family w:val="auto"/>
+		<w:pitch w:val="variable"/>
+		<w:sig w:usb0="00000003" w:usb1="00000000" w:usb2="00000000" w:usb3="00000000" w:csb0="00000001" w:csb1="00000000"/>
+	</w:font>
+	<w:font w:name="Courier New">
+		<w:panose1 w:val="02070309020205020404"/>
+		<w:charset w:val="00"/>
+		<w:family w:val="auto"/>
+		<w:pitch w:val="variable"/>
+		<w:sig w:usb0="00000003" w:usb1="00000000" w:usb2="00000000" w:usb3="00000000" w:csb0="00000001" w:csb1="00000000"/>
+	</w:font>
+	<w:font w:name="Wingdings">
+		<w:panose1 w:val="05020102010804080708"/>
+		<w:charset w:val="02"/>
+		<w:family w:val="auto"/>
+		<w:pitch w:val="variable"/>
+		<w:sig w:usb0="00000000" w:usb1="00000000" w:usb2="00010000" w:usb3="00000000" w:csb0="80000000" w:csb1="00000000"/>
+	</w:font>
+	<w:font w:name="Cambria">
+		<w:panose1 w:val="02040503050406030204"/>
+		<w:charset w:val="00"/>
+		<w:family w:val="auto"/>
+		<w:pitch w:val="variable"/>
+		<w:sig w:usb0="00000003" w:usb1="00000000" w:usb2="00000000" w:usb3="00000000" w:csb0="00000001" w:csb1="00000000"/>
+	</w:font>
+	<w:font w:name="Calibri">
+		<w:panose1 w:val="020F0502020204030204"/>
+		<w:charset w:val="00"/>
+		<w:family w:val="auto"/>
+		<w:pitch w:val="variable"/>
+		<w:sig w:usb0="00000003" w:usb1="00000000" w:usb2="00000000" w:usb3="00000000" w:csb0="00000001" w:csb1="00000000"/>
+	</w:font>
+	<w:font w:name="Arial">
+		<w:panose1 w:val="020B0604020202020204"/>
+		<w:charset w:val="00"/>
+		<w:family w:val="auto"/>
+		<w:pitch w:val="variable"/>
+		<w:sig w:usb0="00000003" w:usb1="00000000" w:usb2="00000000" w:usb3="00000000" w:csb0="00000001" w:csb1="00000000"/>
+	</w:font>
+</w:fonts>
diff --git a/template/word/numbering.xml b/template/word/numbering.xml
index 0c025b4..415ef51 100644
--- a/template/word/numbering.xml
+++ b/template/word/numbering.xml
@@ -1,509 +1,509 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<w:numbering xmlns:mv="urn:schemas-microsoft-com:mac:vml" xmlns:mo="http://schemas.microsoft.com/office/mac/office/2008/main" xmlns:ve="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships" xmlns:m="http://schemas.openxmlformats.org/officeDocument/2006/math" xmlns:v="urn:schemas-microsoft-com:vml" xmlns:w10="urn:schemas-microsoft-com:office:word" xmlns:w="http://schemas.openxmlformats.org/wordprocessingml/2006/main" xmlns:wne="http://schemas.microsoft.com/office/word/2006/wordml" xmlns:wp="http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing">
-	<w:abstractNum w:abstractNumId="0">
-		<w:nsid w:val="FFFFFF1D"/>
-		<w:multiLevelType w:val="multilevel"/>
-		<w:tmpl w:val="D0409C7C"/>
-		<w:lvl w:ilvl="0">
-			<w:start w:val="1"/>
-			<w:numFmt w:val="bullet"/>
-			<w:lvlText w:val=""/>
-			<w:lvlJc w:val="left"/>
-			<w:pPr>
-				<w:tabs>
-					<w:tab w:val="num" w:pos="0"/>
-				</w:tabs>
-				<w:ind w:left="0" w:firstLine="0"/>
-			</w:pPr>
-			<w:rPr>
-				<w:rFonts w:ascii="Symbol" w:hAnsi="Symbol" w:hint="default"/>
-			</w:rPr>
-		</w:lvl>
-		<w:lvl w:ilvl="1">
-			<w:start w:val="1"/>
-			<w:numFmt w:val="bullet"/>
-			<w:lvlText w:val=""/>
-			<w:lvlJc w:val="left"/>
-			<w:pPr>
-				<w:tabs>
-					<w:tab w:val="num" w:pos="720"/>
-				</w:tabs>
-				<w:ind w:left="1080" w:hanging="360"/>
-			</w:pPr>
-			<w:rPr>
-				<w:rFonts w:ascii="Symbol" w:hAnsi="Symbol" w:hint="default"/>
-			</w:rPr>
-		</w:lvl>
-		<w:lvl w:ilvl="2">
-			<w:start w:val="1"/>
-			<w:numFmt w:val="bullet"/>
-			<w:lvlText w:val="o"/>
-			<w:lvlJc w:val="left"/>
-			<w:pPr>
-				<w:tabs>
-					<w:tab w:val="num" w:pos="1440"/>
-				</w:tabs>
-				<w:ind w:left="1800" w:hanging="360"/>
-			</w:pPr>
-			<w:rPr>
-				<w:rFonts w:ascii="Courier New" w:hAnsi="Courier New" w:hint="default"/>
-			</w:rPr>
-		</w:lvl>
-		<w:lvl w:ilvl="3">
-			<w:start w:val="1"/>
-			<w:numFmt w:val="bullet"/>
-			<w:lvlText w:val=""/>
-			<w:lvlJc w:val="left"/>
-			<w:pPr>
-				<w:tabs>
-					<w:tab w:val="num" w:pos="2160"/>
-				</w:tabs>
-				<w:ind w:left="2520" w:hanging="360"/>
-			</w:pPr>
-			<w:rPr>
-				<w:rFonts w:ascii="Wingdings" w:hAnsi="Wingdings" w:hint="default"/>
-			</w:rPr>
-		</w:lvl>
-		<w:lvl w:ilvl="4">
-			<w:start w:val="1"/>
-			<w:numFmt w:val="bullet"/>
-			<w:lvlText w:val=""/>
-			<w:lvlJc w:val="left"/>
-			<w:pPr>
-				<w:tabs>
-					<w:tab w:val="num" w:pos="2880"/>
-				</w:tabs>
-				<w:ind w:left="3240" w:hanging="360"/>
-			</w:pPr>
-			<w:rPr>
-				<w:rFonts w:ascii="Wingdings" w:hAnsi="Wingdings" w:hint="default"/>
-			</w:rPr>
-		</w:lvl>
-		<w:lvl w:ilvl="5">
-			<w:start w:val="1"/>
-			<w:numFmt w:val="bullet"/>
-			<w:lvlText w:val=""/>
-			<w:lvlJc w:val="left"/>
-			<w:pPr>
-				<w:tabs>
-					<w:tab w:val="num" w:pos="3600"/>
-				</w:tabs>
-				<w:ind w:left="3960" w:hanging="360"/>
-			</w:pPr>
-			<w:rPr>
-				<w:rFonts w:ascii="Symbol" w:hAnsi="Symbol" w:hint="default"/>
-			</w:rPr>
-		</w:lvl>
-		<w:lvl w:ilvl="6">
-			<w:start w:val="1"/>
-			<w:numFmt w:val="bullet"/>
-			<w:lvlText w:val="o"/>
-			<w:lvlJc w:val="left"/>
-			<w:pPr>
-				<w:tabs>
-					<w:tab w:val="num" w:pos="4320"/>
-				</w:tabs>
-				<w:ind w:left="4680" w:hanging="360"/>
-			</w:pPr>
-			<w:rPr>
-				<w:rFonts w:ascii="Courier New" w:hAnsi="Courier New" w:hint="default"/>
-			</w:rPr>
-		</w:lvl>
-		<w:lvl w:ilvl="7">
-			<w:start w:val="1"/>
-			<w:numFmt w:val="bullet"/>
-			<w:lvlText w:val=""/>
-			<w:lvlJc w:val="left"/>
-			<w:pPr>
-				<w:tabs>
-					<w:tab w:val="num" w:pos="5040"/>
-				</w:tabs>
-				<w:ind w:left="5400" w:hanging="360"/>
-			</w:pPr>
-			<w:rPr>
-				<w:rFonts w:ascii="Wingdings" w:hAnsi="Wingdings" w:hint="default"/>
-			</w:rPr>
-		</w:lvl>
-		<w:lvl w:ilvl="8">
-			<w:start w:val="1"/>
-			<w:numFmt w:val="bullet"/>
-			<w:lvlText w:val=""/>
-			<w:lvlJc w:val="left"/>
-			<w:pPr>
-				<w:tabs>
-					<w:tab w:val="num" w:pos="5760"/>
-				</w:tabs>
-				<w:ind w:left="6120" w:hanging="360"/>
-			</w:pPr>
-			<w:rPr>
-				<w:rFonts w:ascii="Wingdings" w:hAnsi="Wingdings" w:hint="default"/>
-			</w:rPr>
-		</w:lvl>
-	</w:abstractNum>
-	<w:abstractNum w:abstractNumId="1">
-		<w:nsid w:val="FFFFFF7C"/>
-		<w:multiLevelType w:val="singleLevel"/>
-		<w:tmpl w:val="9B522538"/>
-		<w:lvl w:ilvl="0">
-			<w:start w:val="1"/>
-			<w:numFmt w:val="decimal"/>
-			<w:lvlText w:val="%1."/>
-			<w:lvlJc w:val="left"/>
-			<w:pPr>
-				<w:tabs>
-					<w:tab w:val="num" w:pos="1492"/>
-				</w:tabs>
-				<w:ind w:left="1492" w:hanging="360"/>
-			</w:pPr>
-		</w:lvl>
-	</w:abstractNum>
-	<w:abstractNum w:abstractNumId="2">
-		<w:nsid w:val="FFFFFF7D"/>
-		<w:multiLevelType w:val="singleLevel"/>
-		<w:tmpl w:val="1BB4178C"/>
-		<w:lvl w:ilvl="0">
-			<w:start w:val="1"/>
-			<w:numFmt w:val="decimal"/>
-			<w:lvlText w:val="%1."/>
-			<w:lvlJc w:val="left"/>
-			<w:pPr>
-				<w:tabs>
-					<w:tab w:val="num" w:pos="1209"/>
-				</w:tabs>
-				<w:ind w:left="1209" w:hanging="360"/>
-			</w:pPr>
-		</w:lvl>
-	</w:abstractNum>
-	<w:abstractNum w:abstractNumId="3">
-		<w:nsid w:val="FFFFFF7E"/>
-		<w:multiLevelType w:val="singleLevel"/>
-		<w:tmpl w:val="4720F336"/>
-		<w:lvl w:ilvl="0">
-			<w:start w:val="1"/>
-			<w:numFmt w:val="decimal"/>
-			<w:lvlText w:val="%1."/>
-			<w:lvlJc w:val="left"/>
-			<w:pPr>
-				<w:tabs>
-					<w:tab w:val="num" w:pos="926"/>
-				</w:tabs>
-				<w:ind w:left="926" w:hanging="360"/>
-			</w:pPr>
-		</w:lvl>
-	</w:abstractNum>
-	<w:abstractNum w:abstractNumId="4">
-		<w:nsid w:val="FFFFFF7F"/>
-		<w:multiLevelType w:val="singleLevel"/>
-		<w:tmpl w:val="7DCEC040"/>
-		<w:lvl w:ilvl="0">
-			<w:start w:val="1"/>
-			<w:numFmt w:val="decimal"/>
-			<w:lvlText w:val="%1."/>
-			<w:lvlJc w:val="left"/>
-			<w:pPr>
-				<w:tabs>
-					<w:tab w:val="num" w:pos="643"/>
-				</w:tabs>
-				<w:ind w:left="643" w:hanging="360"/>
-			</w:pPr>
-		</w:lvl>
-	</w:abstractNum>
-	<w:abstractNum w:abstractNumId="5">
-		<w:nsid w:val="FFFFFF80"/>
-		<w:multiLevelType w:val="singleLevel"/>
-		<w:tmpl w:val="A01021FA"/>
-		<w:lvl w:ilvl="0">
-			<w:start w:val="1"/>
-			<w:numFmt w:val="bullet"/>
-			<w:lvlText w:val=""/>
-			<w:lvlJc w:val="left"/>
-			<w:pPr>
-				<w:tabs>
-					<w:tab w:val="num" w:pos="1492"/>
-				</w:tabs>
-				<w:ind w:left="1492" w:hanging="360"/>
-			</w:pPr>
-			<w:rPr>
-				<w:rFonts w:ascii="Symbol" w:hAnsi="Symbol" w:hint="default"/>
-			</w:rPr>
-		</w:lvl>
-	</w:abstractNum>
-	<w:abstractNum w:abstractNumId="6">
-		<w:nsid w:val="FFFFFF81"/>
-		<w:multiLevelType w:val="singleLevel"/>
-		<w:tmpl w:val="977AAC7C"/>
-		<w:lvl w:ilvl="0">
-			<w:start w:val="1"/>
-			<w:numFmt w:val="bullet"/>
-			<w:lvlText w:val=""/>
-			<w:lvlJc w:val="left"/>
-			<w:pPr>
-				<w:tabs>
-					<w:tab w:val="num" w:pos="1209"/>
-				</w:tabs>
-				<w:ind w:left="1209" w:hanging="360"/>
-			</w:pPr>
-			<w:rPr>
-				<w:rFonts w:ascii="Symbol" w:hAnsi="Symbol" w:hint="default"/>
-			</w:rPr>
-		</w:lvl>
-	</w:abstractNum>
-	<w:abstractNum w:abstractNumId="7">
-		<w:nsid w:val="FFFFFF82"/>
-		<w:multiLevelType w:val="singleLevel"/>
-		<w:tmpl w:val="0D26C678"/>
-		<w:lvl w:ilvl="0">
-			<w:start w:val="1"/>
-			<w:numFmt w:val="bullet"/>
-			<w:lvlText w:val=""/>
-			<w:lvlJc w:val="left"/>
-			<w:pPr>
-				<w:tabs>
-					<w:tab w:val="num" w:pos="926"/>
-				</w:tabs>
-				<w:ind w:left="926" w:hanging="360"/>
-			</w:pPr>
-			<w:rPr>
-				<w:rFonts w:ascii="Symbol" w:hAnsi="Symbol" w:hint="default"/>
-			</w:rPr>
-		</w:lvl>
-	</w:abstractNum>
-	<w:abstractNum w:abstractNumId="8">
-		<w:nsid w:val="FFFFFF83"/>
-		<w:multiLevelType w:val="singleLevel"/>
-		<w:tmpl w:val="EE200B76"/>
-		<w:lvl w:ilvl="0">
-			<w:start w:val="1"/>
-			<w:numFmt w:val="bullet"/>
-			<w:lvlText w:val=""/>
-			<w:lvlJc w:val="left"/>
-			<w:pPr>
-				<w:tabs>
-					<w:tab w:val="num" w:pos="643"/>
-				</w:tabs>
-				<w:ind w:left="643" w:hanging="360"/>
-			</w:pPr>
-			<w:rPr>
-				<w:rFonts w:ascii="Symbol" w:hAnsi="Symbol" w:hint="default"/>
-			</w:rPr>
-		</w:lvl>
-	</w:abstractNum>
-	<w:abstractNum w:abstractNumId="9">
-		<w:nsid w:val="FFFFFF88"/>
-		<w:multiLevelType w:val="singleLevel"/>
-		<w:tmpl w:val="E7381406"/>
-		<w:lvl w:ilvl="0">
-			<w:start w:val="1"/>
-			<w:numFmt w:val="decimal"/>
-			<w:pStyle w:val="ListNumber"/>
-			<w:lvlText w:val="%1."/>
-			<w:lvlJc w:val="left"/>
-			<w:pPr>
-				<w:tabs>
-					<w:tab w:val="num" w:pos="360"/>
-				</w:tabs>
-				<w:ind w:left="360" w:hanging="360"/>
-			</w:pPr>
-		</w:lvl>
-	</w:abstractNum>
-	<w:abstractNum w:abstractNumId="10">
-		<w:nsid w:val="FFFFFF89"/>
-		<w:multiLevelType w:val="singleLevel"/>
-		<w:tmpl w:val="ECFC1548"/>
-		<w:lvl w:ilvl="0">
-			<w:start w:val="1"/>
-			<w:numFmt w:val="bullet"/>
-			<w:pStyle w:val="ListBullet"/>
-			<w:lvlText w:val=""/>
-			<w:lvlJc w:val="left"/>
-			<w:pPr>
-				<w:tabs>
-					<w:tab w:val="num" w:pos="360"/>
-				</w:tabs>
-				<w:ind w:left="360" w:hanging="360"/>
-			</w:pPr>
-			<w:rPr>
-				<w:rFonts w:ascii="Symbol" w:hAnsi="Symbol" w:hint="default"/>
-			</w:rPr>
-		</w:lvl>
-	</w:abstractNum>
-	<w:abstractNum w:abstractNumId="11">
-		<w:nsid w:val="30585973"/>
-		<w:multiLevelType w:val="multilevel"/>
-		<w:tmpl w:val="A47E15CE"/>
-		<w:lvl w:ilvl="0">
-			<w:start w:val="1"/>
-			<w:numFmt w:val="decimal"/>
-			<w:lvlText w:val="%1."/>
-			<w:lvlJc w:val="left"/>
-			<w:pPr>
-				<w:tabs>
-					<w:tab w:val="num" w:pos="720"/>
-				</w:tabs>
-				<w:ind w:left="720" w:hanging="720"/>
-			</w:pPr>
-		</w:lvl>
-		<w:lvl w:ilvl="1">
-			<w:start w:val="1"/>
-			<w:numFmt w:val="decimal"/>
-			<w:lvlText w:val="%2."/>
-			<w:lvlJc w:val="left"/>
-			<w:pPr>
-				<w:tabs>
-					<w:tab w:val="num" w:pos="1440"/>
-				</w:tabs>
-				<w:ind w:left="1440" w:hanging="720"/>
-			</w:pPr>
-		</w:lvl>
-		<w:lvl w:ilvl="2">
-			<w:start w:val="1"/>
-			<w:numFmt w:val="decimal"/>
-			<w:lvlText w:val="%3."/>
-			<w:lvlJc w:val="left"/>
-			<w:pPr>
-				<w:tabs>
-					<w:tab w:val="num" w:pos="2160"/>
-				</w:tabs>
-				<w:ind w:left="2160" w:hanging="720"/>
-			</w:pPr>
-		</w:lvl>
-		<w:lvl w:ilvl="3">
-			<w:start w:val="1"/>
-			<w:numFmt w:val="decimal"/>
-			<w:lvlText w:val="%4."/>
-			<w:lvlJc w:val="left"/>
-			<w:pPr>
-				<w:tabs>
-					<w:tab w:val="num" w:pos="2880"/>
-				</w:tabs>
-				<w:ind w:left="2880" w:hanging="720"/>
-			</w:pPr>
-		</w:lvl>
-		<w:lvl w:ilvl="4">
-			<w:start w:val="1"/>
-			<w:numFmt w:val="decimal"/>
-			<w:lvlText w:val="%5."/>
-			<w:lvlJc w:val="left"/>
-			<w:pPr>
-				<w:tabs>
-					<w:tab w:val="num" w:pos="3600"/>
-				</w:tabs>
-				<w:ind w:left="3600" w:hanging="720"/>
-			</w:pPr>
-		</w:lvl>
-		<w:lvl w:ilvl="5">
-			<w:start w:val="1"/>
-			<w:numFmt w:val="decimal"/>
-			<w:lvlText w:val="%6."/>
-			<w:lvlJc w:val="left"/>
-			<w:pPr>
-				<w:tabs>
-					<w:tab w:val="num" w:pos="4320"/>
-				</w:tabs>
-				<w:ind w:left="4320" w:hanging="720"/>
-			</w:pPr>
-		</w:lvl>
-		<w:lvl w:ilvl="6">
-			<w:start w:val="1"/>
-			<w:numFmt w:val="decimal"/>
-			<w:lvlText w:val="%7."/>
-			<w:lvlJc w:val="left"/>
-			<w:pPr>
-				<w:tabs>
-					<w:tab w:val="num" w:pos="5040"/>
-				</w:tabs>
-				<w:ind w:left="5040" w:hanging="720"/>
-			</w:pPr>
-		</w:lvl>
-		<w:lvl w:ilvl="7">
-			<w:start w:val="1"/>
-			<w:numFmt w:val="decimal"/>
-			<w:lvlText w:val="%8."/>
-			<w:lvlJc w:val="left"/>
-			<w:pPr>
-				<w:tabs>
-					<w:tab w:val="num" w:pos="5760"/>
-				</w:tabs>
-				<w:ind w:left="5760" w:hanging="720"/>
-			</w:pPr>
-		</w:lvl>
-		<w:lvl w:ilvl="8">
-			<w:start w:val="1"/>
-			<w:numFmt w:val="decimal"/>
-			<w:lvlText w:val="%9."/>
-			<w:lvlJc w:val="left"/>
-			<w:pPr>
-				<w:tabs>
-					<w:tab w:val="num" w:pos="6480"/>
-				</w:tabs>
-				<w:ind w:left="6480" w:hanging="720"/>
-			</w:pPr>
-		</w:lvl>
-	</w:abstractNum>
-	<w:num w:numId="1">
-		<w:abstractNumId w:val="11"/>
-	</w:num>
-	<w:num w:numId="2">
-		<w:abstractNumId w:val="11"/>
-		<w:lvlOverride w:ilvl="0">
-			<w:startOverride w:val="1"/>
-		</w:lvlOverride>
-		<w:lvlOverride w:ilvl="1">
-			<w:startOverride w:val="1"/>
-		</w:lvlOverride>
-		<w:lvlOverride w:ilvl="2">
-			<w:startOverride w:val="1"/>
-		</w:lvlOverride>
-		<w:lvlOverride w:ilvl="3">
-			<w:startOverride w:val="1"/>
-		</w:lvlOverride>
-		<w:lvlOverride w:ilvl="4">
-			<w:startOverride w:val="1"/>
-		</w:lvlOverride>
-		<w:lvlOverride w:ilvl="5">
-			<w:startOverride w:val="1"/>
-		</w:lvlOverride>
-		<w:lvlOverride w:ilvl="6">
-			<w:startOverride w:val="1"/>
-		</w:lvlOverride>
-		<w:lvlOverride w:ilvl="7">
-			<w:startOverride w:val="1"/>
-		</w:lvlOverride>
-		<w:lvlOverride w:ilvl="8">
-			<w:startOverride w:val="1"/>
-		</w:lvlOverride>
-	</w:num>
-	<w:num w:numId="3">
-		<w:abstractNumId w:val="4"/>
-	</w:num>
-	<w:num w:numId="4">
-		<w:abstractNumId w:val="3"/>
-	</w:num>
-	<w:num w:numId="5">
-		<w:abstractNumId w:val="2"/>
-	</w:num>
-	<w:num w:numId="6">
-		<w:abstractNumId w:val="1"/>
-	</w:num>
-	<w:num w:numId="7">
-		<w:abstractNumId w:val="0"/>
-	</w:num>
-	<w:num w:numId="8">
-		<w:abstractNumId w:val="10"/>
-	</w:num>
-	<w:num w:numId="9">
-		<w:abstractNumId w:val="8"/>
-	</w:num>
-	<w:num w:numId="10">
-		<w:abstractNumId w:val="7"/>
-	</w:num>
-	<w:num w:numId="11">
-		<w:abstractNumId w:val="6"/>
-	</w:num>
-	<w:num w:numId="12">
-		<w:abstractNumId w:val="5"/>
-	</w:num>
-	<w:num w:numId="13">
-		<w:abstractNumId w:val="9"/>
-	</w:num>
-</w:numbering>
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<w:numbering xmlns:mv="urn:schemas-microsoft-com:mac:vml" xmlns:mo="http://schemas.microsoft.com/office/mac/office/2008/main" xmlns:ve="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships" xmlns:m="http://schemas.openxmlformats.org/officeDocument/2006/math" xmlns:v="urn:schemas-microsoft-com:vml" xmlns:w10="urn:schemas-microsoft-com:office:word" xmlns:w="http://schemas.openxmlformats.org/wordprocessingml/2006/main" xmlns:wne="http://schemas.microsoft.com/office/word/2006/wordml" xmlns:wp="http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing">
+	<w:abstractNum w:abstractNumId="0">
+		<w:nsid w:val="FFFFFF1D"/>
+		<w:multiLevelType w:val="multilevel"/>
+		<w:tmpl w:val="D0409C7C"/>
+		<w:lvl w:ilvl="0">
+			<w:start w:val="1"/>
+			<w:numFmt w:val="bullet"/>
+			<w:lvlText w:val=""/>
+			<w:lvlJc w:val="left"/>
+			<w:pPr>
+				<w:tabs>
+					<w:tab w:val="num" w:pos="0"/>
+				</w:tabs>
+				<w:ind w:left="0" w:firstLine="0"/>
+			</w:pPr>
+			<w:rPr>
+				<w:rFonts w:ascii="Symbol" w:hAnsi="Symbol" w:hint="default"/>
+			</w:rPr>
+		</w:lvl>
+		<w:lvl w:ilvl="1">
+			<w:start w:val="1"/>
+			<w:numFmt w:val="bullet"/>
+			<w:lvlText w:val=""/>
+			<w:lvlJc w:val="left"/>
+			<w:pPr>
+				<w:tabs>
+					<w:tab w:val="num" w:pos="720"/>
+				</w:tabs>
+				<w:ind w:left="1080" w:hanging="360"/>
+			</w:pPr>
+			<w:rPr>
+				<w:rFonts w:ascii="Symbol" w:hAnsi="Symbol" w:hint="default"/>
+			</w:rPr>
+		</w:lvl>
+		<w:lvl w:ilvl="2">
+			<w:start w:val="1"/>
+			<w:numFmt w:val="bullet"/>
+			<w:lvlText w:val="o"/>
+			<w:lvlJc w:val="left"/>
+			<w:pPr>
+				<w:tabs>
+					<w:tab w:val="num" w:pos="1440"/>
+				</w:tabs>
+				<w:ind w:left="1800" w:hanging="360"/>
+			</w:pPr>
+			<w:rPr>
+				<w:rFonts w:ascii="Courier New" w:hAnsi="Courier New" w:hint="default"/>
+			</w:rPr>
+		</w:lvl>
+		<w:lvl w:ilvl="3">
+			<w:start w:val="1"/>
+			<w:numFmt w:val="bullet"/>
+			<w:lvlText w:val=""/>
+			<w:lvlJc w:val="left"/>
+			<w:pPr>
+				<w:tabs>
+					<w:tab w:val="num" w:pos="2160"/>
+				</w:tabs>
+				<w:ind w:left="2520" w:hanging="360"/>
+			</w:pPr>
+			<w:rPr>
+				<w:rFonts w:ascii="Wingdings" w:hAnsi="Wingdings" w:hint="default"/>
+			</w:rPr>
+		</w:lvl>
+		<w:lvl w:ilvl="4">
+			<w:start w:val="1"/>
+			<w:numFmt w:val="bullet"/>
+			<w:lvlText w:val=""/>
+			<w:lvlJc w:val="left"/>
+			<w:pPr>
+				<w:tabs>
+					<w:tab w:val="num" w:pos="2880"/>
+				</w:tabs>
+				<w:ind w:left="3240" w:hanging="360"/>
+			</w:pPr>
+			<w:rPr>
+				<w:rFonts w:ascii="Wingdings" w:hAnsi="Wingdings" w:hint="default"/>
+			</w:rPr>
+		</w:lvl>
+		<w:lvl w:ilvl="5">
+			<w:start w:val="1"/>
+			<w:numFmt w:val="bullet"/>
+			<w:lvlText w:val=""/>
+			<w:lvlJc w:val="left"/>
+			<w:pPr>
+				<w:tabs>
+					<w:tab w:val="num" w:pos="3600"/>
+				</w:tabs>
+				<w:ind w:left="3960" w:hanging="360"/>
+			</w:pPr>
+			<w:rPr>
+				<w:rFonts w:ascii="Symbol" w:hAnsi="Symbol" w:hint="default"/>
+			</w:rPr>
+		</w:lvl>
+		<w:lvl w:ilvl="6">
+			<w:start w:val="1"/>
+			<w:numFmt w:val="bullet"/>
+			<w:lvlText w:val="o"/>
+			<w:lvlJc w:val="left"/>
+			<w:pPr>
+				<w:tabs>
+					<w:tab w:val="num" w:pos="4320"/>
+				</w:tabs>
+				<w:ind w:left="4680" w:hanging="360"/>
+			</w:pPr>
+			<w:rPr>
+				<w:rFonts w:ascii="Courier New" w:hAnsi="Courier New" w:hint="default"/>
+			</w:rPr>
+		</w:lvl>
+		<w:lvl w:ilvl="7">
+			<w:start w:val="1"/>
+			<w:numFmt w:val="bullet"/>
+			<w:lvlText w:val=""/>
+			<w:lvlJc w:val="left"/>
+			<w:pPr>
+				<w:tabs>
+					<w:tab w:val="num" w:pos="5040"/>
+				</w:tabs>
+				<w:ind w:left="5400" w:hanging="360"/>
+			</w:pPr>
+			<w:rPr>
+				<w:rFonts w:ascii="Wingdings" w:hAnsi="Wingdings" w:hint="default"/>
+			</w:rPr>
+		</w:lvl>
+		<w:lvl w:ilvl="8">
+			<w:start w:val="1"/>
+			<w:numFmt w:val="bullet"/>
+			<w:lvlText w:val=""/>
+			<w:lvlJc w:val="left"/>
+			<w:pPr>
+				<w:tabs>
+					<w:tab w:val="num" w:pos="5760"/>
+				</w:tabs>
+				<w:ind w:left="6120" w:hanging="360"/>
+			</w:pPr>
+			<w:rPr>
+				<w:rFonts w:ascii="Wingdings" w:hAnsi="Wingdings" w:hint="default"/>
+			</w:rPr>
+		</w:lvl>
+	</w:abstractNum>
+	<w:abstractNum w:abstractNumId="1">
+		<w:nsid w:val="FFFFFF7C"/>
+		<w:multiLevelType w:val="singleLevel"/>
+		<w:tmpl w:val="9B522538"/>
+		<w:lvl w:ilvl="0">
+			<w:start w:val="1"/>
+			<w:numFmt w:val="decimal"/>
+			<w:lvlText w:val="%1."/>
+			<w:lvlJc w:val="left"/>
+			<w:pPr>
+				<w:tabs>
+					<w:tab w:val="num" w:pos="1492"/>
+				</w:tabs>
+				<w:ind w:left="1492" w:hanging="360"/>
+			</w:pPr>
+		</w:lvl>
+	</w:abstractNum>
+	<w:abstractNum w:abstractNumId="2">
+		<w:nsid w:val="FFFFFF7D"/>
+		<w:multiLevelType w:val="singleLevel"/>
+		<w:tmpl w:val="1BB4178C"/>
+		<w:lvl w:ilvl="0">
+			<w:start w:val="1"/>
+			<w:numFmt w:val="decimal"/>
+			<w:lvlText w:val="%1."/>
+			<w:lvlJc w:val="left"/>
+			<w:pPr>
+				<w:tabs>
+					<w:tab w:val="num" w:pos="1209"/>
+				</w:tabs>
+				<w:ind w:left="1209" w:hanging="360"/>
+			</w:pPr>
+		</w:lvl>
+	</w:abstractNum>
+	<w:abstractNum w:abstractNumId="3">
+		<w:nsid w:val="FFFFFF7E"/>
+		<w:multiLevelType w:val="singleLevel"/>
+		<w:tmpl w:val="4720F336"/>
+		<w:lvl w:ilvl="0">
+			<w:start w:val="1"/>
+			<w:numFmt w:val="decimal"/>
+			<w:lvlText w:val="%1."/>
+			<w:lvlJc w:val="left"/>
+			<w:pPr>
+				<w:tabs>
+					<w:tab w:val="num" w:pos="926"/>
+				</w:tabs>
+				<w:ind w:left="926" w:hanging="360"/>
+			</w:pPr>
+		</w:lvl>
+	</w:abstractNum>
+	<w:abstractNum w:abstractNumId="4">
+		<w:nsid w:val="FFFFFF7F"/>
+		<w:multiLevelType w:val="singleLevel"/>
+		<w:tmpl w:val="7DCEC040"/>
+		<w:lvl w:ilvl="0">
+			<w:start w:val="1"/>
+			<w:numFmt w:val="decimal"/>
+			<w:lvlText w:val="%1."/>
+			<w:lvlJc w:val="left"/>
+			<w:pPr>
+				<w:tabs>
+					<w:tab w:val="num" w:pos="643"/>
+				</w:tabs>
+				<w:ind w:left="643" w:hanging="360"/>
+			</w:pPr>
+		</w:lvl>
+	</w:abstractNum>
+	<w:abstractNum w:abstractNumId="5">
+		<w:nsid w:val="FFFFFF80"/>
+		<w:multiLevelType w:val="singleLevel"/>
+		<w:tmpl w:val="A01021FA"/>
+		<w:lvl w:ilvl="0">
+			<w:start w:val="1"/>
+			<w:numFmt w:val="bullet"/>
+			<w:lvlText w:val=""/>
+			<w:lvlJc w:val="left"/>
+			<w:pPr>
+				<w:tabs>
+					<w:tab w:val="num" w:pos="1492"/>
+				</w:tabs>
+				<w:ind w:left="1492" w:hanging="360"/>
+			</w:pPr>
+			<w:rPr>
+				<w:rFonts w:ascii="Symbol" w:hAnsi="Symbol" w:hint="default"/>
+			</w:rPr>
+		</w:lvl>
+	</w:abstractNum>
+	<w:abstractNum w:abstractNumId="6">
+		<w:nsid w:val="FFFFFF81"/>
+		<w:multiLevelType w:val="singleLevel"/>
+		<w:tmpl w:val="977AAC7C"/>
+		<w:lvl w:ilvl="0">
+			<w:start w:val="1"/>
+			<w:numFmt w:val="bullet"/>
+			<w:lvlText w:val=""/>
+			<w:lvlJc w:val="left"/>
+			<w:pPr>
+				<w:tabs>
+					<w:tab w:val="num" w:pos="1209"/>
+				</w:tabs>
+				<w:ind w:left="1209" w:hanging="360"/>
+			</w:pPr>
+			<w:rPr>
+				<w:rFonts w:ascii="Symbol" w:hAnsi="Symbol" w:hint="default"/>
+			</w:rPr>
+		</w:lvl>
+	</w:abstractNum>
+	<w:abstractNum w:abstractNumId="7">
+		<w:nsid w:val="FFFFFF82"/>
+		<w:multiLevelType w:val="singleLevel"/>
+		<w:tmpl w:val="0D26C678"/>
+		<w:lvl w:ilvl="0">
+			<w:start w:val="1"/>
+			<w:numFmt w:val="bullet"/>
+			<w:lvlText w:val=""/>
+			<w:lvlJc w:val="left"/>
+			<w:pPr>
+				<w:tabs>
+					<w:tab w:val="num" w:pos="926"/>
+				</w:tabs>
+				<w:ind w:left="926" w:hanging="360"/>
+			</w:pPr>
+			<w:rPr>
+				<w:rFonts w:ascii="Symbol" w:hAnsi="Symbol" w:hint="default"/>
+			</w:rPr>
+		</w:lvl>
+	</w:abstractNum>
+	<w:abstractNum w:abstractNumId="8">
+		<w:nsid w:val="FFFFFF83"/>
+		<w:multiLevelType w:val="singleLevel"/>
+		<w:tmpl w:val="EE200B76"/>
+		<w:lvl w:ilvl="0">
+			<w:start w:val="1"/>
+			<w:numFmt w:val="bullet"/>
+			<w:lvlText w:val=""/>
+			<w:lvlJc w:val="left"/>
+			<w:pPr>
+				<w:tabs>
+					<w:tab w:val="num" w:pos="643"/>
+				</w:tabs>
+				<w:ind w:left="643" w:hanging="360"/>
+			</w:pPr>
+			<w:rPr>
+				<w:rFonts w:ascii="Symbol" w:hAnsi="Symbol" w:hint="default"/>
+			</w:rPr>
+		</w:lvl>
+	</w:abstractNum>
+	<w:abstractNum w:abstractNumId="9">
+		<w:nsid w:val="FFFFFF88"/>
+		<w:multiLevelType w:val="singleLevel"/>
+		<w:tmpl w:val="E7381406"/>
+		<w:lvl w:ilvl="0">
+			<w:start w:val="1"/>
+			<w:numFmt w:val="decimal"/>
+			<w:pStyle w:val="ListNumber"/>
+			<w:lvlText w:val="%1."/>
+			<w:lvlJc w:val="left"/>
+			<w:pPr>
+				<w:tabs>
+					<w:tab w:val="num" w:pos="360"/>
+				</w:tabs>
+				<w:ind w:left="360" w:hanging="360"/>
+			</w:pPr>
+		</w:lvl>
+	</w:abstractNum>
+	<w:abstractNum w:abstractNumId="10">
+		<w:nsid w:val="FFFFFF89"/>
+		<w:multiLevelType w:val="singleLevel"/>
+		<w:tmpl w:val="ECFC1548"/>
+		<w:lvl w:ilvl="0">
+			<w:start w:val="1"/>
+			<w:numFmt w:val="bullet"/>
+			<w:pStyle w:val="ListBullet"/>
+			<w:lvlText w:val=""/>
+			<w:lvlJc w:val="left"/>
+			<w:pPr>
+				<w:tabs>
+					<w:tab w:val="num" w:pos="360"/>
+				</w:tabs>
+				<w:ind w:left="360" w:hanging="360"/>
+			</w:pPr>
+			<w:rPr>
+				<w:rFonts w:ascii="Symbol" w:hAnsi="Symbol" w:hint="default"/>
+			</w:rPr>
+		</w:lvl>
+	</w:abstractNum>
+	<w:abstractNum w:abstractNumId="11">
+		<w:nsid w:val="30585973"/>
+		<w:multiLevelType w:val="multilevel"/>
+		<w:tmpl w:val="A47E15CE"/>
+		<w:lvl w:ilvl="0">
+			<w:start w:val="1"/>
+			<w:numFmt w:val="decimal"/>
+			<w:lvlText w:val="%1."/>
+			<w:lvlJc w:val="left"/>
+			<w:pPr>
+				<w:tabs>
+					<w:tab w:val="num" w:pos="720"/>
+				</w:tabs>
+				<w:ind w:left="720" w:hanging="720"/>
+			</w:pPr>
+		</w:lvl>
+		<w:lvl w:ilvl="1">
+			<w:start w:val="1"/>
+			<w:numFmt w:val="decimal"/>
+			<w:lvlText w:val="%2."/>
+			<w:lvlJc w:val="left"/>
+			<w:pPr>
+				<w:tabs>
+					<w:tab w:val="num" w:pos="1440"/>
+				</w:tabs>
+				<w:ind w:left="1440" w:hanging="720"/>
+			</w:pPr>
+		</w:lvl>
+		<w:lvl w:ilvl="2">
+			<w:start w:val="1"/>
+			<w:numFmt w:val="decimal"/>
+			<w:lvlText w:val="%3."/>
+			<w:lvlJc w:val="left"/>
+			<w:pPr>
+				<w:tabs>
+					<w:tab w:val="num" w:pos="2160"/>
+				</w:tabs>
+				<w:ind w:left="2160" w:hanging="720"/>
+			</w:pPr>
+		</w:lvl>
+		<w:lvl w:ilvl="3">
+			<w:start w:val="1"/>
+			<w:numFmt w:val="decimal"/>
+			<w:lvlText w:val="%4."/>
+			<w:lvlJc w:val="left"/>
+			<w:pPr>
+				<w:tabs>
+					<w:tab w:val="num" w:pos="2880"/>
+				</w:tabs>
+				<w:ind w:left="2880" w:hanging="720"/>
+			</w:pPr>
+		</w:lvl>
+		<w:lvl w:ilvl="4">
+			<w:start w:val="1"/>
+			<w:numFmt w:val="decimal"/>
+			<w:lvlText w:val="%5."/>
+			<w:lvlJc w:val="left"/>
+			<w:pPr>
+				<w:tabs>
+					<w:tab w:val="num" w:pos="3600"/>
+				</w:tabs>
+				<w:ind w:left="3600" w:hanging="720"/>
+			</w:pPr>
+		</w:lvl>
+		<w:lvl w:ilvl="5">
+			<w:start w:val="1"/>
+			<w:numFmt w:val="decimal"/>
+			<w:lvlText w:val="%6."/>
+			<w:lvlJc w:val="left"/>
+			<w:pPr>
+				<w:tabs>
+					<w:tab w:val="num" w:pos="4320"/>
+				</w:tabs>
+				<w:ind w:left="4320" w:hanging="720"/>
+			</w:pPr>
+		</w:lvl>
+		<w:lvl w:ilvl="6">
+			<w:start w:val="1"/>
+			<w:numFmt w:val="decimal"/>
+			<w:lvlText w:val="%7."/>
+			<w:lvlJc w:val="left"/>
+			<w:pPr>
+				<w:tabs>
+					<w:tab w:val="num" w:pos="5040"/>
+				</w:tabs>
+				<w:ind w:left="5040" w:hanging="720"/>
+			</w:pPr>
+		</w:lvl>
+		<w:lvl w:ilvl="7">
+			<w:start w:val="1"/>
+			<w:numFmt w:val="decimal"/>
+			<w:lvlText w:val="%8."/>
+			<w:lvlJc w:val="left"/>
+			<w:pPr>
+				<w:tabs>
+					<w:tab w:val="num" w:pos="5760"/>
+				</w:tabs>
+				<w:ind w:left="5760" w:hanging="720"/>
+			</w:pPr>
+		</w:lvl>
+		<w:lvl w:ilvl="8">
+			<w:start w:val="1"/>
+			<w:numFmt w:val="decimal"/>
+			<w:lvlText w:val="%9."/>
+			<w:lvlJc w:val="left"/>
+			<w:pPr>
+				<w:tabs>
+					<w:tab w:val="num" w:pos="6480"/>
+				</w:tabs>
+				<w:ind w:left="6480" w:hanging="720"/>
+			</w:pPr>
+		</w:lvl>
+	</w:abstractNum>
+	<w:num w:numId="1">
+		<w:abstractNumId w:val="11"/>
+	</w:num>
+	<w:num w:numId="2">
+		<w:abstractNumId w:val="11"/>
+		<w:lvlOverride w:ilvl="0">
+			<w:startOverride w:val="1"/>
+		</w:lvlOverride>
+		<w:lvlOverride w:ilvl="1">
+			<w:startOverride w:val="1"/>
+		</w:lvlOverride>
+		<w:lvlOverride w:ilvl="2">
+			<w:startOverride w:val="1"/>
+		</w:lvlOverride>
+		<w:lvlOverride w:ilvl="3">
+			<w:startOverride w:val="1"/>
+		</w:lvlOverride>
+		<w:lvlOverride w:ilvl="4">
+			<w:startOverride w:val="1"/>
+		</w:lvlOverride>
+		<w:lvlOverride w:ilvl="5">
+			<w:startOverride w:val="1"/>
+		</w:lvlOverride>
+		<w:lvlOverride w:ilvl="6">
+			<w:startOverride w:val="1"/>
+		</w:lvlOverride>
+		<w:lvlOverride w:ilvl="7">
+			<w:startOverride w:val="1"/>
+		</w:lvlOverride>
+		<w:lvlOverride w:ilvl="8">
+			<w:startOverride w:val="1"/>
+		</w:lvlOverride>
+	</w:num>
+	<w:num w:numId="3">
+		<w:abstractNumId w:val="4"/>
+	</w:num>
+	<w:num w:numId="4">
+		<w:abstractNumId w:val="3"/>
+	</w:num>
+	<w:num w:numId="5">
+		<w:abstractNumId w:val="2"/>
+	</w:num>
+	<w:num w:numId="6">
+		<w:abstractNumId w:val="1"/>
+	</w:num>
+	<w:num w:numId="7">
+		<w:abstractNumId w:val="0"/>
+	</w:num>
+	<w:num w:numId="8">
+		<w:abstractNumId w:val="10"/>
+	</w:num>
+	<w:num w:numId="9">
+		<w:abstractNumId w:val="8"/>
+	</w:num>
+	<w:num w:numId="10">
+		<w:abstractNumId w:val="7"/>
+	</w:num>
+	<w:num w:numId="11">
+		<w:abstractNumId w:val="6"/>
+	</w:num>
+	<w:num w:numId="12">
+		<w:abstractNumId w:val="5"/>
+	</w:num>
+	<w:num w:numId="13">
+		<w:abstractNumId w:val="9"/>
+	</w:num>
+</w:numbering>
diff --git a/template/word/styles.xml b/template/word/styles.xml
index 7471355..26ebd73 100644
--- a/template/word/styles.xml
+++ b/template/word/styles.xml
@@ -1,2 +1,2 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <w:styles xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships" xmlns:w="http://schemas.openxmlformats.org/wordprocessingml/2006/main"><w:docDefaults><w:rPrDefault><w:rPr><w:rFonts w:asciiTheme="minorHAnsi" w:eastAsiaTheme="minorHAnsi" w:hAnsiTheme="minorHAnsi" w:cstheme="minorBidi"/><w:sz w:val="24"/><w:szCs w:val="24"/><w:lang w:val="en-US" w:eastAsia="en-US" w:bidi="ar-SA"/></w:rPr></w:rPrDefault><w:pPrDefault><w:pPr><w:spacing w:after="200"/></w:pPr></w:pPrDefault></w:docDefaults><w:latentStyles w:defLockedState="0" w:defUIPriority="0" w:defSemiHidden="0" w:defUnhideWhenUsed="0" w:defQFormat="0" w:count="276"/><w:style w:type="paragraph" w:default="1" w:styleId="Normal"><w:name w:val="Normal"/><w:qFormat/><w:rsid w:val="000D33D5"/></w:style><w:style w:type="paragraph" w:styleId="Heading1"><w:name w:val="heading 1"/><w:basedOn w:val="Normal"/><w:next w:val="Normal"/><w:link w:val="Heading1Char"/><w:uiPriority w:val="9"/><w:qFormat/><w:rsid w:val="00E315A3"/><w:pPr><w:keepNext/><w:keepLines/><w:spacing w:before="480" w:after="0"/><w:outlineLvl w:val="0"/></w:pPr><w:rPr><w:rFonts w:asciiTheme="majorHAnsi" w:eastAsiaTheme="majorEastAsia" w:hAnsiTheme="majorHAnsi" w:cstheme="majorBidi"/><w:b/><w:bCs/><w:color w:val="345A8A" w:themeColor="accent1" w:themeShade="B5"/><w:sz w:val="32"/><w:szCs w:val="32"/></w:rPr></w:style><w:style w:type="paragraph" w:styleId="Heading2"><w:name w:val="heading 2"/><w:basedOn w:val="Normal"/><w:next w:val="Normal"/><w:link w:val="Heading2Char"/><w:uiPriority w:val="9"/><w:unhideWhenUsed/><w:qFormat/><w:rsid w:val="00E315A3"/><w:pPr><w:keepNext/><w:keepLines/><w:spacing w:before="200" w:after="0"/><w:outlineLvl w:val="1"/></w:pPr><w:rPr><w:rFonts w:asciiTheme="majorHAnsi" w:eastAsiaTheme="majorEastAsia" w:hAnsiTheme="majorHAnsi" w:cstheme="majorBidi"/><w:b/><w:bCs/><w:color w:val="4F81BD" w:themeColor="accent1"/><w:sz w:val="26"/><w:szCs w:val="26"/></w:rPr></w:style><w:style w:type="character" w:default="1" w:styleId="DefaultParagraphFont"><w:name w:val="Default Paragraph Font"/><w:semiHidden/><w:unhideWhenUsed/></w:style><w:style w:type="table" w:default="1" w:styleId="TableNormal"><w:name w:val="Normal Table"/><w:semiHidden/><w:unhideWhenUsed/><w:qFormat/><w:tblPr><w:tblInd w:w="0" w:type="dxa"/><w:tblCellMar><w:top w:w="0" w:type="dxa"/><w:left w:w="108" w:type="dxa"/><w:bottom w:w="0" w:type="dxa"/><w:right w:w="108" w:type="dxa"/></w:tblCellMar></w:tblPr></w:style><w:style w:type="numbering" w:default="1" w:styleId="NoList"><w:name w:val="No List"/><w:semiHidden/><w:unhideWhenUsed/></w:style><w:style w:type="table" w:styleId="ColorfulGrid-Accent1"><w:name w:val="Colorful Grid Accent 1"/><w:basedOn w:val="TableNormal"/><w:uiPriority w:val="73"/><w:rsid w:val="008D6863"/><w:pPr><w:spacing w:after="0"/></w:pPr><w:rPr><w:color w:val="000000" w:themeColor="text1"/><w:sz w:val="22"/><w:szCs w:val="22"/></w:rPr><w:tblPr><w:tblStyleRowBandSize w:val="1"/><w:tblStyleColBandSize w:val="1"/><w:tblInd w:w="0" w:type="dxa"/><w:tblBorders><w:insideH w:val="single" w:sz="4" w:space="0" w:color="FFFFFF" w:themeColor="background1"/></w:tblBorders><w:tblCellMar><w:top w:w="0" w:type="dxa"/><w:left w:w="108" w:type="dxa"/><w:bottom w:w="0" w:type="dxa"/><w:right w:w="108" w:type="dxa"/></w:tblCellMar></w:tblPr><w:tcPr><w:shd w:val="clear" w:color="auto" w:fill="DBE5F1" w:themeFill="accent1" w:themeFillTint="33"/></w:tcPr><w:tblStylePr w:type="firstRow"><w:rPr><w:b/><w:bCs/></w:rPr><w:tblPr/><w:tcPr><w:shd w:val="clear" w:color="auto" w:fill="B8CCE4" w:themeFill="accent1" w:themeFillTint="66"/></w:tcPr></w:tblStylePr><w:tblStylePr w:type="lastRow"><w:rPr><w:b/><w:bCs/><w:color w:val="000000" w:themeColor="text1"/></w:rPr><w:tblPr/><w:tcPr><w:shd w:val="clear" w:color="auto" w:fill="B8CCE4" w:themeFill="accent1" w:themeFillTint="66"/></w:tcPr></w:tblStylePr><w:tblStylePr w:type="firstCol"><w:rPr><w:color w:val="FFFFFF" w:themeColor="background1"/></w:rPr><w:tblPr/><w:tcPr><w:shd w:val="clear" w:color="auto" w:fill="365F91" w:themeFill="accent1" w:themeFillShade="BF"/></w:tcPr></w:tblStylePr><w:tblStylePr w:type="lastCol"><w:rPr><w:color w:val="FFFFFF" w:themeColor="background1"/></w:rPr><w:tblPr/><w:tcPr><w:shd w:val="clear" w:color="auto" w:fill="365F91" w:themeFill="accent1" w:themeFillShade="BF"/></w:tcPr></w:tblStylePr><w:tblStylePr w:type="band1Vert"><w:tblPr/><w:tcPr><w:shd w:val="clear" w:color="auto" w:fill="A7BFDE" w:themeFill="accent1" w:themeFillTint="7F"/></w:tcPr></w:tblStylePr><w:tblStylePr w:type="band1Horz"><w:tblPr/><w:tcPr><w:shd w:val="clear" w:color="auto" w:fill="A7BFDE" w:themeFill="accent1" w:themeFillTint="7F"/></w:tcPr></w:tblStylePr></w:style><w:style w:type="character" w:customStyle="1" w:styleId="Heading1Char"><w:name w:val="Heading 1 Char"/><w:basedOn w:val="DefaultParagraphFont"/><w:link w:val="Heading1"/><w:uiPriority w:val="9"/><w:rsid w:val="00E315A3"/><w:rPr><w:rFonts w:asciiTheme="majorHAnsi" w:eastAsiaTheme="majorEastAsia" w:hAnsiTheme="majorHAnsi" w:cstheme="majorBidi"/><w:b/><w:bCs/><w:color w:val="345A8A" w:themeColor="accent1" w:themeShade="B5"/><w:sz w:val="32"/><w:szCs w:val="32"/></w:rPr></w:style><w:style w:type="character" w:customStyle="1" w:styleId="Heading2Char"><w:name w:val="Heading 2 Char"/><w:basedOn w:val="DefaultParagraphFont"/><w:link w:val="Heading2"/><w:uiPriority w:val="9"/><w:rsid w:val="00E315A3"/><w:rPr><w:rFonts w:asciiTheme="majorHAnsi" w:eastAsiaTheme="majorEastAsia" w:hAnsiTheme="majorHAnsi" w:cstheme="majorBidi"/><w:b/><w:bCs/><w:color w:val="4F81BD" w:themeColor="accent1"/><w:sz w:val="26"/><w:szCs w:val="26"/></w:rPr></w:style><w:style w:type="paragraph" w:styleId="ListBullet"><w:name w:val="List Bullet"/><w:basedOn w:val="Normal"/><w:rsid w:val="00784D58"/><w:pPr><w:numPr><w:numId w:val="8"/></w:numPr><w:contextualSpacing/></w:pPr></w:style><w:style w:type="paragraph" w:styleId="ListNumber"><w:name w:val="List Number"/><w:basedOn w:val="Normal"/><w:rsid w:val="00784D58"/><w:pPr><w:numPr><w:numId w:val="13"/></w:numPr><w:contextualSpacing/></w:pPr></w:style><w:style w:type="paragraph" w:styleId="BodyText"><w:name w:val="Body Text"/><w:basedOn w:val="Normal"/><w:link w:val="BodyTextChar"/><w:rsid w:val="00BC48D5"/><w:pPr><w:spacing w:after="120"/></w:pPr></w:style><w:style w:type="character" w:customStyle="1" w:styleId="BodyTextChar"><w:name w:val="Body Text Char"/><w:basedOn w:val="DefaultParagraphFont"/><w:link w:val="BodyText"/><w:rsid w:val="00BC48D5"/></w:style></w:styles>
\ No newline at end of file
diff --git a/template/word/theme/theme1.xml b/template/word/theme/theme1.xml
index fae0229..de62be9 100644
--- a/template/word/theme/theme1.xml
+++ b/template/word/theme/theme1.xml
@@ -1,2 +1,2 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <a:theme xmlns:a="http://schemas.openxmlformats.org/drawingml/2006/main" name="Office Theme"><a:themeElements><a:clrScheme name="Office"><a:dk1><a:sysClr val="windowText" lastClr="000000"/></a:dk1><a:lt1><a:sysClr val="window" lastClr="FFFFFF"/></a:lt1><a:dk2><a:srgbClr val="1F497D"/></a:dk2><a:lt2><a:srgbClr val="EEECE1"/></a:lt2><a:accent1><a:srgbClr val="4F81BD"/></a:accent1><a:accent2><a:srgbClr val="C0504D"/></a:accent2><a:accent3><a:srgbClr val="9BBB59"/></a:accent3><a:accent4><a:srgbClr val="8064A2"/></a:accent4><a:accent5><a:srgbClr val="4BACC6"/></a:accent5><a:accent6><a:srgbClr val="F79646"/></a:accent6><a:hlink><a:srgbClr val="0000FF"/></a:hlink><a:folHlink><a:srgbClr val="800080"/></a:folHlink></a:clrScheme><a:fontScheme name="Office"><a:majorFont><a:latin typeface="Calibri"/><a:ea typeface=""/><a:cs typeface=""/><a:font script="Jpan" typeface="ＭＳ ゴシック"/><a:font script="Hang" typeface="맑은 고딕"/><a:font script="Hans" typeface="宋体"/><a:font script="Hant" typeface="新細明體"/><a:font script="Arab" typeface="Times New Roman"/><a:font script="Hebr" typeface="Times New Roman"/><a:font script="Thai" typeface="Angsana New"/><a:font script="Ethi" typeface="Nyala"/><a:font script="Beng" typeface="Vrinda"/><a:font script="Gujr" typeface="Shruti"/><a:font script="Khmr" typeface="MoolBoran"/><a:font script="Knda" typeface="Tunga"/><a:font script="Guru" typeface="Raavi"/><a:font script="Cans" typeface="Euphemia"/><a:font script="Cher" typeface="Plantagenet Cherokee"/><a:font script="Yiii" typeface="Microsoft Yi Baiti"/><a:font script="Tibt" typeface="Microsoft Himalaya"/><a:font script="Thaa" typeface="MV Boli"/><a:font script="Deva" typeface="Mangal"/><a:font script="Telu" typeface="Gautami"/><a:font script="Taml" typeface="Latha"/><a:font script="Syrc" typeface="Estrangelo Edessa"/><a:font script="Orya" typeface="Kalinga"/><a:font script="Mlym" typeface="Kartika"/><a:font script="Laoo" typeface="DokChampa"/><a:font script="Sinh" typeface="Iskoola Pota"/><a:font script="Mong" typeface="Mongolian Baiti"/><a:font script="Viet" typeface="Times New Roman"/><a:font script="Uigh" typeface="Microsoft Uighur"/></a:majorFont><a:minorFont><a:latin typeface="Cambria"/><a:ea typeface=""/><a:cs typeface=""/><a:font script="Jpan" typeface="ＭＳ 明朝"/><a:font script="Hang" typeface="맑은 고딕"/><a:font script="Hans" typeface="宋体"/><a:font script="Hant" typeface="新細明體"/><a:font script="Arab" typeface="Arial"/><a:font script="Hebr" typeface="Arial"/><a:font script="Thai" typeface="Cordia New"/><a:font script="Ethi" typeface="Nyala"/><a:font script="Beng" typeface="Vrinda"/><a:font script="Gujr" typeface="Shruti"/><a:font script="Khmr" typeface="DaunPenh"/><a:font script="Knda" typeface="Tunga"/><a:font script="Guru" typeface="Raavi"/><a:font script="Cans" typeface="Euphemia"/><a:font script="Cher" typeface="Plantagenet Cherokee"/><a:font script="Yiii" typeface="Microsoft Yi Baiti"/><a:font script="Tibt" typeface="Microsoft Himalaya"/><a:font script="Thaa" typeface="MV Boli"/><a:font script="Deva" typeface="Mangal"/><a:font script="Telu" typeface="Gautami"/><a:font script="Taml" typeface="Latha"/><a:font script="Syrc" typeface="Estrangelo Edessa"/><a:font script="Orya" typeface="Kalinga"/><a:font script="Mlym" typeface="Kartika"/><a:font script="Laoo" typeface="DokChampa"/><a:font script="Sinh" typeface="Iskoola Pota"/><a:font script="Mong" typeface="Mongolian Baiti"/><a:font script="Viet" typeface="Arial"/><a:font script="Uigh" typeface="Microsoft Uighur"/></a:minorFont></a:fontScheme><a:fmtScheme name="Office"><a:fillStyleLst><a:solidFill><a:schemeClr val="phClr"/></a:solidFill><a:gradFill rotWithShape="1"><a:gsLst><a:gs pos="0"><a:schemeClr val="phClr"><a:tint val="50000"/><a:satMod val="300000"/></a:schemeClr></a:gs><a:gs pos="35000"><a:schemeClr val="phClr"><a:tint val="37000"/><a:satMod val="300000"/></a:schemeClr></a:gs><a:gs pos="100000"><a:schemeClr val="phClr"><a:tint val="15000"/><a:satMod val="350000"/></a:schemeClr></a:gs></a:gsLst><a:lin ang="16200000" scaled="1"/></a:gradFill><a:gradFill rotWithShape="1"><a:gsLst><a:gs pos="0"><a:schemeClr val="phClr"><a:tint val="100000"/><a:shade val="100000"/><a:satMod val="130000"/></a:schemeClr></a:gs><a:gs pos="100000"><a:schemeClr val="phClr"><a:tint val="50000"/><a:shade val="100000"/><a:satMod val="350000"/></a:schemeClr></a:gs></a:gsLst><a:lin ang="16200000" scaled="0"/></a:gradFill></a:fillStyleLst><a:lnStyleLst><a:ln w="9525" cap="flat" cmpd="sng" algn="ctr"><a:solidFill><a:schemeClr val="phClr"><a:shade val="95000"/><a:satMod val="105000"/></a:schemeClr></a:solidFill><a:prstDash val="solid"/></a:ln><a:ln w="25400" cap="flat" cmpd="sng" algn="ctr"><a:solidFill><a:schemeClr val="phClr"/></a:solidFill><a:prstDash val="solid"/></a:ln><a:ln w="38100" cap="flat" cmpd="sng" algn="ctr"><a:solidFill><a:schemeClr val="phClr"/></a:solidFill><a:prstDash val="solid"/></a:ln></a:lnStyleLst><a:effectStyleLst><a:effectStyle><a:effectLst><a:outerShdw blurRad="40000" dist="20000" dir="5400000" rotWithShape="0"><a:srgbClr val="000000"><a:alpha val="38000"/></a:srgbClr></a:outerShdw></a:effectLst></a:effectStyle><a:effectStyle><a:effectLst><a:outerShdw blurRad="40000" dist="23000" dir="5400000" rotWithShape="0"><a:srgbClr val="000000"><a:alpha val="35000"/></a:srgbClr></a:outerShdw></a:effectLst></a:effectStyle><a:effectStyle><a:effectLst><a:outerShdw blurRad="40000" dist="23000" dir="5400000" rotWithShape="0"><a:srgbClr val="000000"><a:alpha val="35000"/></a:srgbClr></a:outerShdw></a:effectLst><a:scene3d><a:camera prst="orthographicFront"><a:rot lat="0" lon="0" rev="0"/></a:camera><a:lightRig rig="threePt" dir="t"><a:rot lat="0" lon="0" rev="1200000"/></a:lightRig></a:scene3d><a:sp3d><a:bevelT w="63500" h="25400"/></a:sp3d></a:effectStyle></a:effectStyleLst><a:bgFillStyleLst><a:solidFill><a:schemeClr val="phClr"/></a:solidFill><a:gradFill rotWithShape="1"><a:gsLst><a:gs pos="0"><a:schemeClr val="phClr"><a:tint val="40000"/><a:satMod val="350000"/></a:schemeClr></a:gs><a:gs pos="40000"><a:schemeClr val="phClr"><a:tint val="45000"/><a:shade val="99000"/><a:satMod val="350000"/></a:schemeClr></a:gs><a:gs pos="100000"><a:schemeClr val="phClr"><a:shade val="20000"/><a:satMod val="255000"/></a:schemeClr></a:gs></a:gsLst><a:path path="circle"><a:fillToRect l="50000" t="-80000" r="50000" b="180000"/></a:path></a:gradFill><a:gradFill rotWithShape="1"><a:gsLst><a:gs pos="0"><a:schemeClr val="phClr"><a:tint val="80000"/><a:satMod val="300000"/></a:schemeClr></a:gs><a:gs pos="100000"><a:schemeClr val="phClr"><a:shade val="30000"/><a:satMod val="200000"/></a:schemeClr></a:gs></a:gsLst><a:path path="circle"><a:fillToRect l="50000" t="50000" r="50000" b="50000"/></a:path></a:gradFill></a:bgFillStyleLst></a:fmtScheme></a:themeElements><a:objectDefaults><a:spDef><a:spPr/><a:bodyPr/><a:lstStyle/><a:style><a:lnRef idx="1"><a:schemeClr val="accent1"/></a:lnRef><a:fillRef idx="3"><a:schemeClr val="accent1"/></a:fillRef><a:effectRef idx="2"><a:schemeClr val="accent1"/></a:effectRef><a:fontRef idx="minor"><a:schemeClr val="lt1"/></a:fontRef></a:style></a:spDef><a:lnDef><a:spPr/><a:bodyPr/><a:lstStyle/><a:style><a:lnRef idx="2"><a:schemeClr val="accent1"/></a:lnRef><a:fillRef idx="0"><a:schemeClr val="accent1"/></a:fillRef><a:effectRef idx="1"><a:schemeClr val="accent1"/></a:effectRef><a:fontRef idx="minor"><a:schemeClr val="tx1"/></a:fontRef></a:style></a:lnDef></a:objectDefaults><a:extraClrSchemeLst/></a:theme>
\ No newline at end of file

From a30c449ca1d7e0a23ac8c2f07b2bdbc0427a1973 Mon Sep 17 00:00:00 2001
From: Derek Hsu <derekhybrid@gmail.com>
Date: Wed, 3 Apr 2013 16:47:36 +0800
Subject: [PATCH 16/16] some modification to work on python 2.4

---
 docx.py | 45 ++++++++++++++++++++++++++++++++++-----------
 1 file changed, 34 insertions(+), 11 deletions(-)

diff --git a/docx.py b/docx.py
index f17b27d..6789cb3 100755
--- a/docx.py
+++ b/docx.py
@@ -7,20 +7,28 @@
 See LICENSE for licensing information.
 '''
 
-from copy import deepcopy
+
 import logging
-from lxml import etree
-try:
-    from PIL import Image
-except ImportError:
-    import Image
-import zipfile
+import sys
 import shutil
-from distutils import dir_util
 import re
 import time
 import os
+import zipfile
+from distutils import dir_util
 from os.path import join
+from copy import deepcopy
+from distutils import dir_util
+from lxml import etree
+try:
+    from PIL import Image
+except ImportError:
+    try:
+        import Image
+    except ImportError:
+        sys.stderr.write("Can't find module PIL or Image")
+
+
 
 log = logging.getLogger(__name__)
 
@@ -335,7 +343,10 @@ def table(contents, heading=True, colw=None, cwunit='dxa', tblw=0, twunit='auto'
         tableborders = makeelement('tblBorders')
         for b in ['top', 'left', 'bottom', 'right', 'insideH', 'insideV']:
             if b in borders.keys() or 'all' in borders.keys():
-                k = 'all' if 'all' in borders.keys() else b
+                if 'all' in borders.keys():
+                    k = 'all'
+                else:
+                    k = b
                 attrs = {}
                 for a in borders[k].keys():
                     attrs[a] = unicode(borders[k][a])
@@ -348,7 +359,10 @@ 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'}))
+        if colw:
+            tablegrid.append(makeelement('gridCol',attributes={'w':str(colw[i])}))
+        else:
+            tablegrid.append(makeelement('gridCol',attributes={'w':'2390'}))
     table.append(tablegrid)
     # Heading Row
     row = makeelement('tr')
@@ -383,7 +397,10 @@ def table(contents, heading=True, colw=None, cwunit='dxa', tblw=0, twunit='auto'
             i += 1
         table.append(row)
     # Contents Rows
-    for contentrow in contents[1 if heading else 0:]:
+    starting_row = 0
+    if heading:
+        starting_row = 1
+    for contentrow in contents[starting_row:]:
         row = makeelement('tr')
         if rowstyle:
             rowprops = makeelement('trPr')
@@ -444,6 +461,12 @@ def picture(relationshiplist, picname, picdescription, pixelwidth=None,
     # 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
+    try:
+        Image
+    except Exception:
+        log.error('Cannot find module: Image')
+        raise ImportError
+
     if not template_dir:
         template_dir = TEMP_TEMPLATE_DIR
     media_dir = join(template_dir, 'word', 'media')